new interface implementation
This commit is contained in:
serso
@@ -2,29 +2,46 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||
|
||||
a:orientation="vertical"
|
||||
a:padding="6dp"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent">
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:background="#ff000000">
|
||||
|
||||
<LinearLayout a:orientation="horizontal"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="wrap_content">
|
||||
<LinearLayout
|
||||
a:id="@+id/simplePad"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:orientation="vertical"
|
||||
a:layout_gravity="center">
|
||||
|
||||
<ImageView a:id="@+id/calibrationArrow"
|
||||
a:layout_gravity="left"
|
||||
a:layout_width="80dp"
|
||||
a:layout_height="80dp"/>
|
||||
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButton"
|
||||
a:text=""
|
||||
calc:textUp="@string/c_up"
|
||||
calc:textDown="@string/c_down"
|
||||
style="@style/digitButtonStyle"
|
||||
a:layout_width="80dp"
|
||||
a:layout_height="80dp"
|
||||
a:layout_gravity="center_horizontal"/>
|
||||
<ImageView a:id="@+id/calibrationArrowLeft"
|
||||
a:layout_gravity="left"
|
||||
a:layout_width="80dp"
|
||||
a:layout_height="80dp"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonLeft"
|
||||
a:text=""
|
||||
calc:textUp="@string/c_up"
|
||||
calc:textDown="@string/c_down"
|
||||
a:layout_width="80dp"
|
||||
a:layout_height="80dp"
|
||||
style="@style/digitButtonStyle"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonRight"
|
||||
a:text=""
|
||||
calc:textUp="@string/c_up"
|
||||
calc:textDown="@string/c_down"
|
||||
a:layout_width="80dp"
|
||||
a:layout_height="80dp"
|
||||
style="@style/digitButtonStyle"/>
|
||||
|
||||
<ImageView a:id="@+id/calibrationArrowRight"
|
||||
a:layout_gravity="right"
|
||||
a:layout_width="80dp"
|
||||
a:layout_height="80dp"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<Button a:id="@+id/calibrationStart"
|
||||
|
||||
@@ -1,65 +1,166 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||
|
||||
a:orientation="vertical"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent">
|
||||
|
||||
<EditText
|
||||
a:id="@+id/editText"
|
||||
style="@style/editTextInputStyle"
|
||||
a:maxLines="5"
|
||||
a:minLines="5"
|
||||
a:gravity="top|left"
|
||||
a:textAppearance="?android:attr/textAppearanceMedium"
|
||||
a:typeface="monospace"
|
||||
a:singleLine="false" />
|
||||
|
||||
<EditText
|
||||
a:id="@+id/resultEditText"
|
||||
style="@style/editTextInputStyle"
|
||||
a:gravity="top|left"
|
||||
a:textAppearance="?android:attr/textAppearanceMedium"
|
||||
a:typeface="monospace"
|
||||
a:editable="false"
|
||||
a:focusable="false"/>
|
||||
|
||||
<TableLayout
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent">
|
||||
<TableRow>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/oneDigitButton" a:text="1" calc:textUp="sin" calc:textDown="asin" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos" calc:textDown="acos" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tg" calc:textDown="atg" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/muliplicationButton" a:text="*" calc:textUp="^" calc:textDown="^2" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/plusButton" a:text="+" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()" calc:textUp="(" calc:textDown=")" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/fourDigitButton" a:text="4" calc:textUp="exp" calc:textDown="mod" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/fiveDigitButton" a:text="5" calc:textUp="log" calc:textDown="ln" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6" calc:textUp="!" calc:textDown="" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/subtractionButton" a:text="/" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/minusButton" a:text="-" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]" calc:textUp="[" calc:textDown="]" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/sevenDigitButton" a:text="7" calc:textUp="" calc:textDown="" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/eigthDigitButton" a:text="8" calc:textUp="" calc:textDown="" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9" calc:textUp="" calc:textDown="" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/equalsButton" a:text="=" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/sqrtButton" a:text="sqrt" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/curlyBracketsButton" a:text="{}" calc:textUp="{" calc:textDown="}" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/pointDigitButton" a:text="." calc:textDown="," style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/numericButton" a:text="numeric" style="@style/digitButtonStyle" a:onClick="numericButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/simplifyButton" a:text="simplify" style="@style/digitButtonStyle" a:onClick="simplifyButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/historyButton" calc:textUp="undo" calc:textDown="redo" style="@style/digitButtonStyle"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/piButton" a:text="pi" calc:textUp="e" style="@style/digitButtonStyle" a:onClick="digitButtonClickHandler"/>
|
||||
</TableRow>
|
||||
</TableLayout>
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||
a:orientation="vertical"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:background="#ff000000">
|
||||
|
||||
<LinearLayout
|
||||
a:orientation="vertical"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="100dp"
|
||||
a:layout_weight="2">
|
||||
|
||||
<EditText
|
||||
a:id="@+id/editText"
|
||||
style="@style/editTextInputStyle"
|
||||
a:maxLines="5"
|
||||
a:minLines="5"
|
||||
a:gravity="top|left"
|
||||
a:textAppearance="?android:attr/textAppearanceMedium"
|
||||
a:typeface="monospace"
|
||||
a:singleLine="false"/>
|
||||
|
||||
<EditText
|
||||
a:id="@+id/resultEditText"
|
||||
style="@style/editTextInputStyle"
|
||||
a:gravity="top|left"
|
||||
a:textAppearance="?android:attr/textAppearanceMedium"
|
||||
a:minLines="1"
|
||||
a:height="10dp"
|
||||
a:typeface="monospace"
|
||||
a:editable="false"
|
||||
a:focusable="false"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<org.solovyev.android.view.PanelSwitcher
|
||||
a:id="@+id/panelswitch"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp"
|
||||
a:layout_weight="5">
|
||||
|
||||
<LinearLayout
|
||||
a:id="@+id/simplePad"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:orientation="vertical"
|
||||
a:layout_gravity="center">
|
||||
|
||||
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/oneDigitButton" a:text="1" calc:textUp="sin"
|
||||
calc:textDown="asin" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos"
|
||||
calc:textDown="acos" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tg"
|
||||
calc:textDown="atg" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/muliplicationButton" a:text="*"
|
||||
calc:textUp="^"
|
||||
calc:textDown="^2" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/plusButton" a:text="+"
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/fourDigitButton" a:text="4" calc:textUp="exp"
|
||||
calc:textDown="mod" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/fiveDigitButton" a:text="5" calc:textUp="log"
|
||||
calc:textDown="ln" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6" calc:textUp="!"
|
||||
calc:textDown="" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/divisionButton" a:text="/"
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/subtractionButton" a:text="-"
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/sevenDigitButton" a:text="7" calc:textUp=""
|
||||
calc:textDown="" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/eigthDigitButton" a:text="8" calc:textUp=""
|
||||
calc:textDown="" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9" calc:textUp=""
|
||||
calc:textDown="" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/equalsButton" a:text="="
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/sqrtButton" a:text="sqrt"
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0"
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()"
|
||||
calc:textUp="("
|
||||
calc:textDown=")" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]"
|
||||
calc:textUp="["
|
||||
calc:textDown="]" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/curlyBracketsButton" a:text="{}"
|
||||
calc:textUp="{"
|
||||
calc:textDown="}" style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/piButton" a:text="pi" calc:textUp="e"
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/pointDigitButton" a:text="." calc:textDown=","
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="digitButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/numericButton" a:text="numeric"
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="numericButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/simplifyButton" a:text="simplify"
|
||||
style="@style/digitButtonStyle"
|
||||
a:onClick="simplifyButtonClickHandler"/>
|
||||
|
||||
<org.solovyev.android.view.DirectionDragButton a:id="@+id/historyButton" calc:textUp="undo"
|
||||
calc:textDown="redo" style="@style/digitButtonStyle"/>
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</org.solovyev.android.view.PanelSwitcher>
|
||||
</LinearLayout>
|
||||
|
||||
Reference in New Issue
Block a user