changes: themes support, scale for direction text

This commit is contained in:
serso
2011-10-15 21:11:11 +04:00
parent 2d55a3f718
commit da87a9a98e
28 changed files with 276 additions and 103 deletions

View File

@@ -10,5 +10,6 @@
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/divisionButton" a:text="/"
calc:textUp="√"
style="@style/digit_button_style"
calc:directionTextScale="0.5"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,5 +11,7 @@
a:id="@+id/eightDigitButton" a:text="8"
calc:textUp="ln"
calc:textDown=""
style="@style/digit_button_style"
calc:directionTextScale="0.5"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,5 +11,5 @@
a:text="5"
calc:textUp="cosh"
calc:textDown="acosh"
style="@style/digit_button_style"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,5 +11,5 @@
a:text="4"
calc:textUp="sinh"
calc:textDown="asinh"
style="@style/digit_button_style"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -12,5 +12,7 @@
a:text="×"
calc:textUp="^"
calc:textDown="^2"
style="@style/digit_button_style"
style="?digitButtonStyle"
calc:directionTextScale="0.5"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,5 +11,7 @@
a:id="@+id/nineDigitButton" a:text="9"
calc:textDown="e"
calc:textUp="π"
style="@style/digit_button_style"
calc:directionTextScale="0.5"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -12,5 +12,5 @@
a:text="1"
calc:textUp="sin"
calc:textDown="asin"
style="@style/digit_button_style"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -7,6 +7,9 @@
-->
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/plusButton" a:text="+"
style="@style/digit_button_style"
a:id="@+id/plusButton"
calc:directionTextScale="0.5"
a:text="+"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,5 +11,7 @@
a:id="@+id/roundBracketsButton" a:text="()"
calc:textUp="("
calc:textDown=")"
style="@style/digit_button_style"
calc:directionTextScale="0.5"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,5 +11,7 @@
a:id="@+id/sevenDigitButton" a:text="7"
calc:textUp="i"
calc:textDown=""
style="@style/digit_button_style"
calc:directionTextScale="0.5"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,5 +11,5 @@
a:id="@+id/sixDigitButton" a:text="6"
calc:textUp="tanh"
calc:textDown="atanh"
style="@style/digit_button_style"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,5 +11,7 @@
a:id="@+id/squareBracketsButton" a:text="[]"
calc:textUp="["
calc:textDown="]"
style="@style/digit_button_style"
calc:directionTextScale="0.5"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -10,5 +10,7 @@
a:id="@+id/subtractionButton" a:text="-"
calc:textUp="{"
calc:textDown="}"
style="@style/digit_button_style"
calc:directionTextScale="0.5"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -12,5 +12,5 @@
a:text="3"
calc:textUp="tan"
calc:textDown="atan"
style="@style/digit_button_style"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -12,5 +12,5 @@
a:text="2"
calc:textUp="cos"
calc:textDown="acos"
style="@style/digit_button_style"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -11,5 +11,7 @@
a:id="@+id/zeroDigitButton" a:text="0"
calc:textUp="."
calc:textDown=","
style="@style/digit_button_style"
calc:directionTextScale="0.5"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

View File

@@ -27,7 +27,7 @@
calc:textDown="@string/c_down"
a:layout_width="80dp"
a:layout_height="80dp"
style="@style/digit_button_style"/>
style="?digitButtonStyle"/>
<org.solovyev.android.view.widgets.DirectionDragButton a:id="@+id/calibrationButtonRight"
a:text=""
@@ -35,7 +35,7 @@
calc:textDown="@string/c_down"
a:layout_width="80dp"
a:layout_height="80dp"
style="@style/digit_button_style"/>
style="?digitButtonStyle"/>
<ImageView a:id="@+id/calibrationArrowRight"
a:layout_gravity="right"