TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Sergey Solovyev 2012-01-15 02:35:06 +04:00
parent 07dfdab9af
commit 7101258662
51 changed files with 75 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout-land/main_calculator.xml
View File

@ -24,7 +24,7 @@
<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp"> <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/leftButton" a:id="@+id/leftButton"
c:textUp="◀◀" c:textUp="◀◀"
@ -37,7 +37,7 @@
a:layout_weight="1"/> a:layout_weight="1"/>
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/eraseButton" a:id="@+id/eraseButton"
a:drawableTop="@drawable/sym_keyboard_delete" a:drawableTop="@drawable/sym_keyboard_delete"
@ -67,7 +67,7 @@
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:layout_weight="1"/> a:layout_weight="1"/>
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/rightButton" a:id="@+id/rightButton"
c:textUp="▶▶" c:textUp="▶▶"

6
res/layout-land/main_cellphone.xml
View File

@ -18,7 +18,7 @@
<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp"> <LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/leftButton" a:id="@+id/leftButton"
c:textUp="◀◀" c:textUp="◀◀"
@ -31,7 +31,7 @@
a:layout_weight="1"/> a:layout_weight="1"/>
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/eraseButton" a:id="@+id/eraseButton"
a:drawableTop="@drawable/sym_keyboard_delete" a:drawableTop="@drawable/sym_keyboard_delete"
@ -61,7 +61,7 @@
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:layout_weight="1"/> a:layout_weight="1"/>
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/rightButton" a:id="@+id/rightButton"
c:textUp="▶▶" c:textUp="▶▶"

2
res/layout/calc_copy_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/pasteButton" a:id="@+id/pasteButton"
a:drawableTop="@drawable/copy" a:drawableTop="@drawable/copy"

2
res/layout/calc_division_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/divisionButton" a:id="@+id/divisionButton"
c:textUp="%" c:textUp="%"

2
res/layout/calc_donate_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/pasteButton" a:id="@+id/pasteButton"
a:drawableTop="@drawable/heart" a:drawableTop="@drawable/heart"

2
res/layout/calc_dot_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/squareBracketsButton" a:id="@+id/squareBracketsButton"
a:text="." a:text="."

2
res/layout/calc_eight_digit_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/eightDigitButton" a:text="8" a:id="@+id/eightDigitButton" a:text="8"
c:textUp="ln" c:textUp="ln"

2
res/layout/calc_empty_button.xml
View File

@ -5,6 +5,6 @@
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
style="?controlButtonStyle"/> style="?controlButtonStyle"/>

2
res/layout/calc_equals_button.xml
View File

@ -5,7 +5,7 @@
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton <org.solovyev.android.view.DirectionDragButton
xmlns:a="http://schemas.android.com/apk/res/android" xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/equalsButton" a:id="@+id/equalsButton"

2
res/layout/calc_erase_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/eraseButton" a:id="@+id/eraseButton"
a:drawableTop="@drawable/sym_keyboard_delete" a:drawableTop="@drawable/sym_keyboard_delete"

2
res/layout/calc_five_digit_button.xml
View File

@ -5,7 +5,7 @@
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/fiveDigitButton" a:id="@+id/fiveDigitButton"
a:text="5" a:text="5"

2
res/layout/calc_four_digit_button.xml
View File

@ -5,7 +5,7 @@
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/fourDigitButton" a:id="@+id/fourDigitButton"
a:text="4" a:text="4"

2
res/layout/calc_functions_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/functionsButton" a:id="@+id/functionsButton"
a:text="ƒ(x)" a:text="ƒ(x)"

2
res/layout/calc_history_button.xml
View File

@ -5,7 +5,7 @@
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/historyButton" a:id="@+id/historyButton"
a:text="@string/c_history_button" a:text="@string/c_history_button"

2
res/layout/calc_left_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/leftButton" a:id="@+id/leftButton"
c:textUp="◀◀" c:textUp="◀◀"

2
res/layout/calc_multiplication_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/multiplicationButton" a:id="@+id/multiplicationButton"
a:text="×" a:text="×"

2
res/layout/calc_nine_digit_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/nineDigitButton" a:text="9" a:id="@+id/nineDigitButton" a:text="9"
c:textDown="e" c:textDown="e"

2
res/layout/calc_one_digit_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/oneDigitButton" a:id="@+id/oneDigitButton"
a:text="1" a:text="1"

2
res/layout/calc_operators_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/functionsButton" a:id="@+id/functionsButton"
a:text="∂,…" a:text="∂,…"
a:onClick="operatorsButtonClickHandler" a:onClick="operatorsButtonClickHandler"

2
res/layout/calc_paste_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/pasteButton" a:id="@+id/pasteButton"
a:drawableTop="@drawable/paste" a:drawableTop="@drawable/paste"

2
res/layout/calc_plus_button.xml
View File

@ -5,7 +5,7 @@
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/plusButton" a:id="@+id/plusButton"
c:directionTextScale="0.5" c:directionTextScale="0.5"

2
res/layout/calc_right_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/rightButton" a:id="@+id/rightButton"
c:textUp="▶▶" c:textUp="▶▶"

2
res/layout/calc_round_brackets_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/roundBracketsButton" a:id="@+id/roundBracketsButton"
c:textUp="(" c:textUp="("

2
res/layout/calc_seven_digit_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/sevenDigitButton" a:text="7" a:id="@+id/sevenDigitButton" a:text="7"
c:textUp="i" c:textUp="i"

2
res/layout/calc_subtraction_button.xml
View File

@ -5,7 +5,7 @@
~ For more information, please, contact se.solovyev@gmail.com ~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/subtractionButton" a:id="@+id/subtractionButton"
c:textDown="∂,…" c:textDown="∂,…"

2
res/layout/calc_three_digit_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/threeDigitButton" a:id="@+id/threeDigitButton"
a:text="3" a:text="3"

2
res/layout/calc_two_digit_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/twoDigitButton" a:id="@+id/twoDigitButton"
a:text="2" a:text="2"

2
res/layout/calc_vars_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/varsButton" a:id="@+id/varsButton"
c:directionTextScale="0.5" c:directionTextScale="0.5"

2
res/layout/calc_zero_digit_button.xml
View File

@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org ~ or visit http://se.solovyev.org
--> -->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.view.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/zeroDigitButton" a:id="@+id/zeroDigitButton"
c:textUp="00" c:textUp="00"

4
res/layout/drag_button_calibration.xml
View File

@ -21,7 +21,7 @@
a:layout_width="80dp" a:layout_width="80dp"
a:layout_height="80dp"/> a:layout_height="80dp"/>
<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonLeft" <org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonLeft"
a:text="" a:text=""
c:textUp="@string/c_up" c:textUp="@string/c_up"
c:textDown="@string/c_down" c:textDown="@string/c_down"
@ -29,7 +29,7 @@
a:layout_height="80dp" a:layout_height="80dp"
style="?digitButtonStyle"/> style="?digitButtonStyle"/>
<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonRight" <org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonRight"
a:text="" a:text=""
c:textUp="@string/c_up" c:textUp="@string/c_up"
c:textDown="@string/c_down" c:textDown="@string/c_down"

4
res/layout/number_picker.xml
View File

@ -8,7 +8,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"> <merge xmlns:android="http://schemas.android.com/apk/res/android">
<org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/increment" <org.solovyev.android.view.NumberPickerButton android:id="@+id/increment"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/timepicker_up_btn" /> android:background="@drawable/timepicker_up_btn" />
@ -23,7 +23,7 @@
android:textSize="30sp" android:textSize="30sp"
android:background="@drawable/timepicker_input" /> android:background="@drawable/timepicker_input" />
<org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/decrement" <org.solovyev.android.view.NumberPickerButton android:id="@+id/decrement"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/timepicker_down_btn" /> android:background="@drawable/timepicker_down_btn" />

7
src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@ -31,6 +31,7 @@ import net.robotmedia.billing.IBillingObserver;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.FontSizeAdjuster;
import org.solovyev.android.ResourceCache; import org.solovyev.android.ResourceCache;
import org.solovyev.android.calculator.about.CalculatorReleaseNotesActivity; import org.solovyev.android.calculator.about.CalculatorReleaseNotesActivity;
import org.solovyev.android.calculator.history.CalculatorHistory; import org.solovyev.android.calculator.history.CalculatorHistory;
@ -39,11 +40,9 @@ import org.solovyev.android.calculator.math.MathType;
import org.solovyev.android.calculator.model.CalculatorEngine; import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.view.AngleUnitsButton; import org.solovyev.android.calculator.view.AngleUnitsButton;
import org.solovyev.android.calculator.view.NumeralBasesButton; import org.solovyev.android.calculator.view.NumeralBasesButton;
import org.solovyev.android.view.FontSizeAdjuster;
import org.solovyev.android.prefs.IntegerPreference; import org.solovyev.android.prefs.IntegerPreference;
import org.solovyev.android.prefs.Preference; import org.solovyev.android.prefs.Preference;
import org.solovyev.android.view.widgets.*; import org.solovyev.android.view.*;
import org.solovyev.android.view.widgets.DragEvent;
import org.solovyev.common.utils.Announcer; import org.solovyev.common.utils.Announcer;
import org.solovyev.common.utils.Point2d; import org.solovyev.common.utils.Point2d;
import org.solovyev.common.utils.StringUtils; import org.solovyev.common.utils.StringUtils;
@ -344,7 +343,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
} }
@Override @Override
public boolean onDrag(@NotNull DragButton dragButton, @NotNull DragEvent event) { public boolean onDrag(@NotNull DragButton dragButton, @NotNull org.solovyev.android.view.DragEvent event) {
boolean result = super.onDrag(dragButton, event); boolean result = super.onDrag(dragButton, event);
if (result) { if (result) {

2
src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
View File

@ -20,7 +20,7 @@ import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.CalculatorParseException; import org.solovyev.android.calculator.model.CalculatorParseException;
import org.solovyev.android.calculator.model.TextProcessor; import org.solovyev.android.calculator.model.TextProcessor;
import org.solovyev.android.calculator.view.TextHighlighter; import org.solovyev.android.calculator.view.TextHighlighter;
import org.solovyev.android.view.AMenuItem; import org.solovyev.android.menu.AMenuItem;
import org.solovyev.android.view.AutoResizeTextView; import org.solovyev.android.view.AutoResizeTextView;
import java.util.HashSet; import java.util.HashSet;

5
src/main/java/org/solovyev/android/calculator/CalculatorModel.java
View File

@ -22,6 +22,8 @@ import jscl.math.function.Constant;
import jscl.math.function.IConstant; import jscl.math.function.IConstant;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.CursorControl;
import org.solovyev.android.HistoryControl;
import org.solovyev.android.calculator.history.CalculatorHistory; import org.solovyev.android.calculator.history.CalculatorHistory;
import org.solovyev.android.calculator.history.CalculatorHistoryState; import org.solovyev.android.calculator.history.CalculatorHistoryState;
import org.solovyev.android.calculator.history.TextViewEditorAdapter; import org.solovyev.android.calculator.history.TextViewEditorAdapter;
@ -30,7 +32,8 @@ import org.solovyev.android.calculator.math.MathType;
import org.solovyev.android.calculator.model.CalculatorEngine; import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.CalculatorEvalException; import org.solovyev.android.calculator.model.CalculatorEvalException;
import org.solovyev.android.calculator.model.CalculatorParseException; import org.solovyev.android.calculator.model.CalculatorParseException;
import org.solovyev.android.view.*; import org.solovyev.android.menu.AMenuBuilder;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.msg.Message; import org.solovyev.common.msg.Message;
import org.solovyev.common.utils.CollectionsUtils; import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.utils.MutableObject; import org.solovyev.common.utils.MutableObject;

2
src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
View File

@ -20,7 +20,7 @@ import net.robotmedia.billing.model.Transaction;
import org.solovyev.android.AndroidUtils; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.ads.AdsController; import org.solovyev.android.ads.AdsController;
import org.solovyev.android.calculator.model.CalculatorEngine; import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.widgets.VibratorContainer; import org.solovyev.android.view.VibratorContainer;
/** /**
* User: serso * User: serso

10
src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
View File

@ -7,11 +7,11 @@ package org.solovyev.android.calculator;
import android.view.MotionEvent; import android.view.MotionEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.*; import org.solovyev.android.CursorControl;
import org.solovyev.android.view.widgets.DirectionDragButton; import org.solovyev.android.view.DirectionDragButton;
import org.solovyev.android.view.widgets.DragButton; import org.solovyev.android.view.DragButton;
import org.solovyev.android.view.widgets.DragDirection; import org.solovyev.android.view.DragDirection;
import org.solovyev.android.view.widgets.SimpleOnDragListener; import org.solovyev.android.view.SimpleOnDragListener;
import org.solovyev.common.utils.Point2d; import org.solovyev.common.utils.Point2d;
/** /**

8
src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
View File

@ -7,10 +7,10 @@ package org.solovyev.android.calculator;
import android.view.MotionEvent; import android.view.MotionEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.widgets.DirectionDragButton; import org.solovyev.android.view.DirectionDragButton;
import org.solovyev.android.view.widgets.DragButton; import org.solovyev.android.view.DragDirection;
import org.solovyev.android.view.widgets.DragDirection; import org.solovyev.android.view.DragButton;
import org.solovyev.android.view.widgets.SimpleOnDragListener; import org.solovyev.android.view.SimpleOnDragListener;
import org.solovyev.common.utils.Point2d; import org.solovyev.common.utils.Point2d;
/** /**

8
src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
View File

@ -8,10 +8,10 @@ package org.solovyev.android.calculator;
import android.view.MotionEvent; import android.view.MotionEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.widgets.DirectionDragButton; import org.solovyev.android.view.DirectionDragButton;
import org.solovyev.android.view.widgets.DragButton; import org.solovyev.android.view.DragButton;
import org.solovyev.android.view.widgets.DragDirection; import org.solovyev.android.view.DragDirection;
import org.solovyev.android.view.widgets.SimpleOnDragListener; import org.solovyev.android.view.SimpleOnDragListener;
import org.solovyev.common.utils.Point2d; import org.solovyev.common.utils.Point2d;
/** /**

2
src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java
View File

@ -10,8 +10,8 @@ import android.os.Bundle;
import android.widget.TabHost; import android.widget.TabHost;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.view.LastTabSaver;
/** /**
* User: serso * User: serso

2
src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java
View File

@ -14,8 +14,8 @@ import android.widget.TabHost;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.view.LastTabSaver;
/** /**
* User: serso * User: serso

4
src/main/java/org/solovyev/android/calculator/history/AbstractHistoryActivity.java
View File

@ -23,8 +23,8 @@ import org.solovyev.android.ads.AdsController;
import org.solovyev.android.calculator.CalculatorModel; import org.solovyev.android.calculator.CalculatorModel;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.jscl.JsclOperation; import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.android.view.AMenuBuilder; import org.solovyev.android.menu.AMenuBuilder;
import org.solovyev.android.view.MenuImpl; import org.solovyev.android.menu.MenuImpl;
import org.solovyev.common.utils.*; import org.solovyev.common.utils.*;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java
View File

@ -11,8 +11,8 @@ import android.os.Bundle;
import android.widget.TabHost; import android.widget.TabHost;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.view.LastTabSaver;
/** /**
* User: serso * User: serso

2
src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
View File

@ -19,7 +19,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.view.AMenuItem; import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.utils.StringUtils; import org.solovyev.common.utils.StringUtils;
/** /**

6
src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
View File

@ -22,9 +22,9 @@ import org.solovyev.android.ads.AdsController;
import org.solovyev.android.calculator.CalculatorModel; import org.solovyev.android.calculator.CalculatorModel;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.AndroidMathRegistry; import org.solovyev.android.calculator.model.AndroidMathRegistry;
import org.solovyev.android.view.AMenuBuilder; import org.solovyev.android.menu.AMenuBuilder;
import org.solovyev.android.view.AMenuItem; import org.solovyev.android.menu.AMenuItem;
import org.solovyev.android.view.MenuImpl; import org.solovyev.android.menu.MenuImpl;
import org.solovyev.common.math.MathEntity; import org.solovyev.common.math.MathEntity;
import org.solovyev.common.utils.EqualsTool; import org.solovyev.common.utils.EqualsTool;
import org.solovyev.common.utils.Filter; import org.solovyev.common.utils.Filter;

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
View File

@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.CalculatorModel; import org.solovyev.android.calculator.CalculatorModel;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.CalculatorEngine; import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.AMenuItem; import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.utils.StringUtils; import org.solovyev.common.utils.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java
View File

@ -11,9 +11,9 @@ import android.os.Bundle;
import android.widget.TabHost; import android.widget.TabHost;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.AndroidFunctionsMathRegistry; import org.solovyev.android.calculator.model.AndroidFunctionsMathRegistry;
import org.solovyev.android.view.LastTabSaver;
/** /**
* User: serso * User: serso

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
View File

@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.CalculatorModel; import org.solovyev.android.calculator.CalculatorModel;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.CalculatorEngine; import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.AMenuItem; import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.utils.StringUtils; import org.solovyev.common.utils.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
View File

@ -26,7 +26,7 @@ import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.math.MathType; import org.solovyev.android.calculator.math.MathType;
import org.solovyev.android.calculator.model.CalculatorEngine; import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.Var; import org.solovyev.android.calculator.model.Var;
import org.solovyev.android.view.AMenuItem; import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.utils.CollectionsUtils; import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.utils.Finder; import org.solovyev.common.utils.Finder;
import org.solovyev.common.utils.StringUtils; import org.solovyev.common.utils.StringUtils;

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java
View File

@ -11,9 +11,9 @@ import android.os.Bundle;
import android.widget.TabHost; import android.widget.TabHost;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils; import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.VarCategory; import org.solovyev.android.calculator.model.VarCategory;
import org.solovyev.android.view.LastTabSaver;
/** /**
* User: serso * User: serso

2
src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
View File

@ -14,7 +14,7 @@ import android.util.AttributeSet;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.CalculatorEngine; import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.widgets.DirectionDragButton; import org.solovyev.android.view.DirectionDragButton;
/** /**
* User: serso * User: serso

2
src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
View File

@ -14,7 +14,7 @@ import android.util.AttributeSet;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.CalculatorEngine; import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.widgets.DirectionDragButton; import org.solovyev.android.view.DirectionDragButton;
/** /**
* User: serso * User: serso