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

deg/rad button added

Browse Source
This commit is contained in:
serso
2011-11-22 15:11:16 +04:00
parent 7344d3a252
commit 59ffa7a6d8
10 changed files with 148 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,16 +52,18 @@
a:layout_height="fill_parent"
a:layout_weight="4"/>
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/clearButton"
a:text="@string/c_clear"
a:textStyle="bold"
style="?controlImageButtonStyle"
a:onClick="clearButtonClickHandler"
a:layout_width="0dp"
a:layout_height="fill_parent"
a:layout_weight="1"/>
<org.solovyev.android.view.widgets.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/clearButton"
calc:textUp="deg"
a:text="@string/c_clear"
calc:textDown="rad"
a:textStyle="bold"
style="?controlButtonStyle"
a:onClick="clearButtonClickHandler"
a:layout_width="0dp"
a:layout_height="fill_parent"
a:layout_weight="1"/>
<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"

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

@@ -46,16 +46,18 @@
a:layout_height="fill_parent"
a:layout_weight="4"/>
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/clearButton"
a:text="@string/c_clear"
a:textStyle="bold"
style="?controlImageButtonStyle"
a:onClick="clearButtonClickHandler"
a:layout_width="0dp"
a:layout_height="fill_parent"
a:layout_weight="1"/>
<org.solovyev.android.view.widgets.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/clearButton"
calc:textUp="deg"
a:text="@string/c_clear"
calc:textDown="rad"
a:textStyle="bold"
style="?controlButtonStyle"
a:onClick="clearButtonClickHandler"
a:layout_width="0dp"
a:layout_height="fill_parent"
a:layout_weight="1"/>
<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"

6
res/layout/calc_clear_button.xml
View File

@@ -6,10 +6,12 @@
~ 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.widgets.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/clearButton"
calc:textUp="deg"
a:text="@string/c_clear"
calc:textDown="rad"
a:textStyle="bold"
style="?controlImageButtonStyle"
style="?controlButtonStyle"
a:onClick="clearButtonClickHandler"/>

2
res/values-ru/strings.xml
View File

@@ -90,6 +90,8 @@
<string name="c_calc_angle_units">Единицы измерения углов</string>
<string name="p_deg">Градусы</string>
<string name="p_rad">Радианы</string>
<string name="p_grad">Грады</string>
<string name="p_turns">Обороты</string>
<string name="c_angle_units_summary">Определяет единицы измерения углов.</string>
<string name="c_calc_theme">Тема оформления</string>

4
res/values/arrays.xml
View File

@@ -50,10 +50,14 @@
<string-array name="p_angle_units_names">
<item>@string/p_deg</item>
<item>@string/p_rad</item>
<item>@string/p_grad</item>
<item>@string/p_turns</item>
</string-array>
<string-array name="p_angle_units">
<item>deg</item>
<item>rad</item>
<item>grad</item>
<item>turns</item>
</string-array>
</resources>

1
res/values/colors.xml
View File

@@ -10,5 +10,6 @@
<color name="button_operator_text_color">#ffffff99</color>
<color name="button_ce_text_color">#ffffffff</color>
<color name="default_text_color">#ffffffff</color>
<color name="selected_angle_unit_text_color">#ffffff99</color>
<color name="default_background">#ff000000</color>
</resources>

2
res/values/strings.xml
View File

@@ -91,6 +91,8 @@
<string name="c_calc_angle_units">Angle Units</string>
<string name="p_deg">Degrees</string>
<string name="p_rad">Radians</string>
<string name="p_grad">Gradians</string>
<string name="p_turns">Turns</string>
<string name="c_angle_units_summary">Defines the default units for angles.</string>
<string name="c_calc_theme">Theme</string>