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

package paths changed

Browse Source
This commit is contained in:
serso 2011-09-19 12:36:12 +04:00
parent 862824537a
commit fe2436161e
23 changed files with 136 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout-land/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.DirectionDragButton a:id="@+id/calibrationButtonLeft" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonLeft"
a:text="" a:text=""
calc:textUp="@string/c_up" calc:textUp="@string/c_up"
calc:textDown="@string/c_down" calc:textDown="@string/c_down"
@ -29,7 +29,7 @@
a:layout_height="80dp" a:layout_height="80dp"
style="@style/digit_button_style"/> style="@style/digit_button_style"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonRight" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonRight"
a:text="" a:text=""
calc:textUp="@string/c_up" calc:textUp="@string/c_up"
calc:textDown="@string/c_down" calc:textDown="@string/c_down"

50
res/layout-land/main.xml
View File

@ -25,14 +25,14 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
<org.solovyev.android.view.DirectionDragButton a:id="@+id/leftButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/leftButton"
calc:textUp="↞" calc:textUp="↞"
a:text="←" a:text="←"
a:layout_weight="1.5" a:layout_weight="1.5"
style="@style/control_button_style" style="@style/control_button_style"
a:onClick="moveLeftButtonClickHandler"/> a:onClick="moveLeftButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/eraseButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/eraseButton"
a:text="↚" a:text="↚"
a:layout_weight="1.5" a:layout_weight="1.5"
style="@style/control_button_style" style="@style/control_button_style"
@ -49,13 +49,13 @@
a:scrollHorizontally="true" a:scrollHorizontally="true"
a:scrollbars="none"/> a:scrollbars="none"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/clearButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/clearButton"
a:text="clear" a:text="clear"
a:layout_weight="1.5" a:layout_weight="1.5"
style="@style/control_button_style" style="@style/control_button_style"
a:onClick="clearButtonClickHandler"/> a:onClick="clearButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/rightButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/rightButton"
calc:textUp="↠" calc:textUp="↠"
a:text="→" a:text="→"
a:layout_weight="1.5" a:layout_weight="1.5"
@ -67,35 +67,35 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <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" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/oneDigitButton" a:text="1" calc:textUp="sin"
calc:textDown="asin" style="@style/digit_button_style" calc:textDown="asin" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos"
calc:textDown="acos" style="@style/digit_button_style" calc:textDown="acos" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tan" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tan"
calc:textDown="atan" style="@style/digit_button_style" calc:textDown="atan" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/multiplicationButton" a:text="×" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/multiplicationButton" a:text="×"
calc:textUp="^" calc:textUp="^"
calc:textDown="^2" style="@style/digit_button_style" calc:textDown="^2" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/divisionButton" a:text="/" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/divisionButton" a:text="/"
calc:textUp="√" calc:textUp="√"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/equalsButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/equalsButton"
a:text="=" a:text="="
a:layout_width="fill_parent" a:layout_width="fill_parent"
style="@style/control_button_style" style="@style/control_button_style"
a:onClick="numericButtonClickHandler"/> a:onClick="numericButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/pasteButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/pasteButton"
a:text="paste" a:text="paste"
style="@style/control_button_style" style="@style/control_button_style"
a:onClick="pasteButtonClickHandler"/> a:onClick="pasteButtonClickHandler"/>
@ -104,42 +104,42 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
<org.solovyev.android.view.DirectionDragButton a:id="@+id/fourDigitButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/fourDigitButton"
a:text="4" a:text="4"
calc:textUp="sinh" calc:textUp="sinh"
calc:textDown="asinh" calc:textDown="asinh"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/fiveDigitButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/fiveDigitButton"
a:text="5" a:text="5"
calc:textUp="cosh" calc:textUp="cosh"
calc:textDown="acosh" calc:textDown="acosh"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6"
calc:textUp="tanh" calc:textUp="tanh"
calc:textDown="atanh" calc:textDown="atanh"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/plusButton" a:text="+" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/plusButton" a:text="+"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/minusButton" a:text="-" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/minusButton" a:text="-"
calc:textUp="{" calc:textUp="{"
calc:textDown="}" calc:textDown="}"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]"
calc:textUp="[" calc:textUp="["
calc:textDown="]" style="@style/digit_button_style" calc:textDown="]" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/historyButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/historyButton"
a:text="" a:text=""
calc:textUp="undo" calc:textUp="undo"
calc:textDown="redo" calc:textDown="redo"
@ -149,38 +149,38 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <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" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/sevenDigitButton" a:text="7"
calc:textUp="i" calc:textUp="i"
calc:textDown="" calc:textDown=""
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/eightDigitButton" a:text="8" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/eightDigitButton" a:text="8"
calc:textUp="ln" calc:textUp="ln"
calc:textDown="" calc:textDown=""
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9"
calc:textDown="e" calc:textDown="e"
calc:textUp="π" calc:textUp="π"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0"
calc:textUp="." calc:textUp="."
calc:textDown="," calc:textDown=","
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()"
calc:textUp="(" calc:textUp="("
calc:textDown=")" style="@style/digit_button_style" calc:textDown=")" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/> <org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/> <org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
</LinearLayout> </LinearLayout>

4
res/layout-port/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.DirectionDragButton a:id="@+id/calibrationButtonLeft" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonLeft"
a:text="" a:text=""
calc:textUp="@string/c_up" calc:textUp="@string/c_up"
calc:textDown="@string/c_down" calc:textDown="@string/c_down"
@ -29,7 +29,7 @@
a:layout_height="80dp" a:layout_height="80dp"
style="@style/digit_button_style"/> style="@style/digit_button_style"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/calibrationButtonRight" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonRight"
a:text="" a:text=""
calc:textUp="@string/c_up" calc:textUp="@string/c_up"
calc:textDown="@string/c_down" calc:textDown="@string/c_down"

56
res/layout-port/main.xml
View File

@ -26,7 +26,7 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
<org.solovyev.android.view.DirectionDragButton a:id="@+id/equalsButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/equalsButton"
a:text="=" a:text="="
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_weight="4" a:layout_weight="4"
@ -48,24 +48,24 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <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" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/oneDigitButton" a:text="1" calc:textUp="sin"
calc:textDown="asin" style="@style/digit_button_style" calc:textDown="asin" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/twoDigitButton" a:text="2" calc:textUp="cos"
calc:textDown="acos" style="@style/digit_button_style" calc:textDown="acos" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tan" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/threeDigitButton" a:text="3" calc:textUp="tan"
calc:textDown="atan" style="@style/digit_button_style" calc:textDown="atan" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/multiplicationButton" a:text="×" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/multiplicationButton" a:text="×"
calc:textUp="^" calc:textUp="^"
calc:textDown="^2" style="@style/digit_button_style" calc:textDown="^2" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/clearButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/clearButton"
a:text="clear" a:text="clear"
style="@style/control_button_style" style="@style/control_button_style"
a:onClick="clearButtonClickHandler"/> a:onClick="clearButtonClickHandler"/>
@ -74,32 +74,32 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
<org.solovyev.android.view.DirectionDragButton a:id="@+id/fourDigitButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/fourDigitButton"
a:text="4" a:text="4"
calc:textUp="sinh" calc:textUp="sinh"
calc:textDown="asinh" calc:textDown="asinh"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/fiveDigitButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/fiveDigitButton"
a:text="5" a:text="5"
calc:textUp="cosh" calc:textUp="cosh"
calc:textDown="acosh" calc:textDown="acosh"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/sixDigitButton" a:text="6"
calc:textUp="tanh" calc:textUp="tanh"
calc:textDown="atanh" calc:textDown="atanh"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/divisionButton" a:text="/" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/divisionButton" a:text="/"
calc:textUp="√" calc:textUp="√"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/eraseButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/eraseButton"
a:text="↚" a:text="↚"
style="@style/control_button_style" style="@style/control_button_style"
a:onClick="eraseButtonClickHandler"/> a:onClick="eraseButtonClickHandler"/>
@ -108,29 +108,29 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <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" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/sevenDigitButton" a:text="7"
calc:textUp="i" calc:textUp="i"
calc:textDown="" calc:textDown=""
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/eightDigitButton" a:text="8" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/eightDigitButton" a:text="8"
calc:textUp="ln" calc:textUp="ln"
calc:textDown="" calc:textDown=""
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/nineDigitButton" a:text="9"
calc:textDown="e" calc:textDown="e"
calc:textUp="π" calc:textUp="π"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/plusButton" a:text="+" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/plusButton" a:text="+"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/pasteButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/pasteButton"
a:text="paste" a:text="paste"
style="@style/control_button_style" style="@style/control_button_style"
a:onClick="pasteButtonClickHandler"/> a:onClick="pasteButtonClickHandler"/>
@ -140,30 +140,30 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
<org.solovyev.android.view.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/roundBracketsButton" a:text="()"
calc:textUp="(" calc:textUp="("
calc:textDown=")" style="@style/digit_button_style" calc:textDown=")" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/zeroDigitButton" a:text="0"
calc:textUp="." calc:textUp="."
calc:textDown="," calc:textDown=","
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/squareBracketsButton" a:text="[]"
calc:textUp="[" calc:textUp="["
calc:textDown="]" style="@style/digit_button_style" calc:textDown="]" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/subtractionButton" a:text="-" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/subtractionButton" a:text="-"
calc:textUp="{" calc:textUp="{"
calc:textDown="}" calc:textDown="}"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="digitButtonClickHandler"/> a:onClick="digitButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/historyButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/historyButton"
a:text="" a:text=""
calc:textUp="undo" calc:textUp="undo"
calc:textDown="redo" calc:textDown="redo"
@ -175,31 +175,31 @@
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp"> <LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
<!-- <org.solovyev.android.view.DirectionDragButton a:id="@+id/numericButton" a:text="numeric" <!-- <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/numericButton" a:text="numeric"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="numericButtonClickHandler"/> a:onClick="numericButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/simplifyButton" a:text="simplify" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/simplifyButton" a:text="simplify"
style="@style/digit_button_style" style="@style/digit_button_style"
a:onClick="simplifyButtonClickHandler"/>--> a:onClick="simplifyButtonClickHandler"/>-->
<org.solovyev.android.view.DirectionDragButton a:id="@+id/leftButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/leftButton"
calc:textUp="↞" calc:textUp="↞"
a:text="←" a:text="←"
style="@style/control_button_style" style="@style/control_button_style"
a:onClick="moveLeftButtonClickHandler"/> a:onClick="moveLeftButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:id="@+id/rightButton" <org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/rightButton"
calc:textUp="↠" calc:textUp="↠"
a:text="→" a:text="→"
style="@style/control_button_style" style="@style/control_button_style"
a:onClick="moveRightButtonClickHandler"/> a:onClick="moveRightButtonClickHandler"/>
<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/> <org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/> <org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
<org.solovyev.android.view.DirectionDragButton a:text="" style="@style/control_button_style"/> <org.solovyev.android.view.widgets.DirectionDragButton a:text="" style="@style/control_button_style"/>
</LinearLayout> </LinearLayout>

4
res/layout-port/number_picker.xml
View File

@ -26,7 +26,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.NumberPickerButton android:id="@+id/increment" <org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/increment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/timepicker_up_btn" /> android:background="@drawable/timepicker_up_btn" />
@ -41,7 +41,7 @@
android:textSize="30sp" android:textSize="30sp"
android:background="@drawable/timepicker_input" /> android:background="@drawable/timepicker_input" />
<org.solovyev.android.view.NumberPickerButton android:id="@+id/decrement" <org.solovyev.android.view.widgets.NumberPickerButton android:id="@+id/decrement"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/timepicker_down_btn" /> android:background="@drawable/timepicker_down_btn" />

2
res/xml/preferences.xml
View File

@ -3,7 +3,7 @@
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
<PreferenceCategory a:title="@string/c_prefs_drag_button_category"> <PreferenceCategory a:title="@string/c_prefs_drag_button_category">
<!-- <org.solovyev.android.view.SeekBarPreference a:key="duration" <!-- <org.solovyev.android.view.prefs.SeekBarPreference a:key="duration"
a:title="Duration of something" a:title="Duration of something"
a:summary="How long something will last" a:summary="How long something will last"
a:dialogMessage="Something duration" a:dialogMessage="Something duration"

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

@ -21,6 +21,7 @@ import bsh.EvalError;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.view.*; import org.solovyev.android.view.*;
import org.solovyev.android.view.widgets.*;
import org.solovyev.common.utils.Announcer; import org.solovyev.common.utils.Announcer;
import org.solovyev.common.utils.history.HistoryAction; import org.solovyev.common.utils.history.HistoryAction;

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

@ -8,6 +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.*; import org.solovyev.android.view.*;
import org.solovyev.android.view.widgets.DirectionDragButton;
import org.solovyev.android.view.widgets.DragButton;
import org.solovyev.android.view.widgets.DragDirection;
import org.solovyev.android.view.widgets.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.DirectionDragButton; import org.solovyev.android.view.widgets.DirectionDragButton;
import org.solovyev.android.view.DragButton; 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.SimpleOnDragListener; import org.solovyev.android.view.widgets.SimpleOnDragListener;
import org.solovyev.common.utils.Point2d; import org.solovyev.common.utils.Point2d;
/** /**

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

@ -17,7 +17,7 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.*; import org.solovyev.android.view.widgets.*;
import org.solovyev.common.collections.ManyValuedHashMap; import org.solovyev.common.collections.ManyValuedHashMap;
import org.solovyev.common.collections.ManyValuedMap; import org.solovyev.common.collections.ManyValuedMap;
import org.solovyev.common.utils.Interval; import org.solovyev.common.utils.Interval;

48
src/main/java/org/solovyev/android/view/prefs/IntervalPreference.java Normal file
View File

@ -0,0 +1,48 @@
package org.solovyev.android.view.prefs;
import android.content.Context;
import android.preference.DialogPreference;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.SeekBar;
import android.widget.TextView;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.widgets.NumberPicker;
/**
* User: serso
* Date: 9/19/11
* Time: 12:27 PM
*/
public class IntervalPreference extends DialogPreference implements NumberPicker.OnChangedListener {
@NotNull
private final Context context;
public IntervalPreference(@NotNull Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
this.context = context;
}
public IntervalPreference(@NotNull Context context, AttributeSet attrs) {
super(context, attrs);
this.context = context;
}
@Override
public void onChanged(NumberPicker picker, int oldVal, int newVal) {
//To change body of implemented methods use File | Settings | File Templates.
}
@Override
protected View onCreateDialogView() {
LinearLayout.LayoutParams params;
LinearLayout layout = new LinearLayout(context);
layout.setOrientation(LinearLayout.VERTICAL);
layout.setPadding(6, 6, 6, 6);
return layout;
}
}

2
src/main/java/org/solovyev/android/view/SeekBarPreference.java → src/main/java/org/solovyev/android/view/prefs/SeekBarPreference.java
View File

@ -4,7 +4,7 @@
* or visit http://se.solovyev.org * or visit http://se.solovyev.org
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.prefs;
import android.preference.DialogPreference; import android.preference.DialogPreference;
import android.content.Context; import android.content.Context;

3
src/main/java/org/solovyev/android/view/ColorButton.java → src/main/java/org/solovyev/android/view/widgets/ColorButton.java
View File

@ -19,7 +19,7 @@
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
@ -30,6 +30,7 @@ import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.widget.Button; import android.widget.Button;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.FontSizeAdjuster;
import org.solovyev.common.utils.Point2d; import org.solovyev.common.utils.Point2d;
/** /**

4
src/main/java/org/solovyev/android/view/DirectionDragButton.java → src/main/java/org/solovyev/android/view/widgets/DirectionDragButton.java
View File

@ -3,7 +3,7 @@
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
@ -13,6 +13,8 @@ import android.text.TextPaint;
import android.util.AttributeSet; import android.util.AttributeSet;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.view.widgets.DragButton;
import org.solovyev.android.view.widgets.DragDirection;
import org.solovyev.common.utils.Point2d; import org.solovyev.common.utils.Point2d;
import org.solovyev.common.utils.StringUtils; import org.solovyev.common.utils.StringUtils;

2
src/main/java/org/solovyev/android/view/DragButton.java → src/main/java/org/solovyev/android/view/widgets/DragButton.java
View File

@ -3,7 +3,7 @@
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;

2
src/main/java/org/solovyev/android/view/DragDirection.java → src/main/java/org/solovyev/android/view/widgets/DragDirection.java
View File

@ -3,7 +3,7 @@
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
public enum DragDirection { public enum DragDirection {

2
src/main/java/org/solovyev/android/view/DragEvent.java → src/main/java/org/solovyev/android/view/widgets/DragEvent.java
View File

@ -3,7 +3,7 @@
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
import android.view.MotionEvent; import android.view.MotionEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
src/main/java/org/solovyev/android/view/DragPreferencesChangeListener.java → src/main/java/org/solovyev/android/view/widgets/DragPreferencesChangeListener.java
View File

@ -3,7 +3,7 @@
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.DragButtonCalibrationActivity; import org.solovyev.android.calculator.DragButtonCalibrationActivity;

4
src/main/java/org/solovyev/android/view/HistoryDragProcessor.java → src/main/java/org/solovyev/android/view/widgets/HistoryDragProcessor.java
View File

@ -3,12 +3,12 @@
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
import android.util.Log; import android.util.Log;
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.view.HistoryControl;
import org.solovyev.common.utils.Point2d; import org.solovyev.common.utils.Point2d;
import org.solovyev.common.utils.StringUtils; import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.utils.history.HistoryAction; import org.solovyev.common.utils.history.HistoryAction;

2
src/main/java/org/solovyev/android/view/NumberPicker.java → src/main/java/org/solovyev/android/view/widgets/NumberPicker.java
View File

@ -4,7 +4,7 @@
* or visit http://se.solovyev.org * or visit http://se.solovyev.org
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
/** /**
* User: serso * User: serso

2
src/main/java/org/solovyev/android/view/NumberPickerButton.java → src/main/java/org/solovyev/android/view/widgets/NumberPickerButton.java
View File

@ -4,7 +4,7 @@
* or visit http://se.solovyev.org * or visit http://se.solovyev.org
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
/** /**
* User: serso * User: serso

4
src/main/java/org/solovyev/android/view/OnDragListener.java → src/main/java/org/solovyev/android/view/widgets/OnDragListener.java
View File

@ -3,9 +3,11 @@
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.widgets.DragButton;
import org.solovyev.android.view.widgets.DragEvent;
import java.util.EventListener; import java.util.EventListener;

2
src/main/java/org/solovyev/android/view/SimpleOnDragListener.java → src/main/java/org/solovyev/android/view/widgets/SimpleOnDragListener.java
View File

@ -3,7 +3,7 @@
* For more information, please, contact se.solovyev@gmail.com * For more information, please, contact se.solovyev@gmail.com
*/ */
package org.solovyev.android.view; package org.solovyev.android.view.widgets;
import android.util.Log; import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;