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

Choose theme wizard step

Browse Source
This commit is contained in:
serso
2015-02-07 17:31:56 +01:00
parent 2540ec0b37
commit 323011391c
64 changed files with 813 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
android-app/src/main/res/layout-land/cpp_app_keyboard.xml
View File

@@ -34,21 +34,21 @@
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_drag_button_vars" />
<include layout="@layout/cpp_app_button_vars" />
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_drag_button_7" />
<include layout="@layout/cpp_app_button_7" />
<include layout="@layout/cpp_drag_button_8" />
<include layout="@layout/cpp_app_button_8" />
<include layout="@layout/cpp_drag_button_9" />
<include layout="@layout/cpp_app_button_9" />
<include layout="@layout/cpp_drag_button_multiplication" />
<include layout="@layout/cpp_app_button_multiplication" />
<include layout="@layout/cpp_drag_button_division" />
<include layout="@layout/cpp_app_button_division" />
<include layout="@layout/cpp_drag_button_equals" />
<include layout="@layout/cpp_app_button_equals" />
</LinearLayout>
@@ -59,21 +59,21 @@
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_app_button_functions" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_drag_button_4" />
<include layout="@layout/cpp_app_button_4" />
<include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_app_button_5" />
<include layout="@layout/cpp_drag_button_6" />
<include layout="@layout/cpp_app_button_6" />
<include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_app_button_plus" />
<include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_app_button_minus" />
<include layout="@layout/cpp_drag_button_round_brackets" />
<include layout="@layout/cpp_app_button_round_brackets" />
</LinearLayout>
@@ -84,21 +84,21 @@
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_drag_button_operators" />
<include layout="@layout/cpp_app_button_operators" />
<include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_app_button_1" />
<include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_app_button_2" />
<include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_app_button_3" />
<include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_app_button_0" />
<include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_app_button_dot" />
<include layout="@layout/cpp_drag_button_history" />
<include layout="@layout/cpp_app_button_history" />
</LinearLayout>

42
android-app/src/main/res/layout-land/cpp_app_keyboard_mobile.xml
View File

@@ -32,21 +32,21 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_app_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_app_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_app_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_app_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_app_button_equals"/>
</LinearLayout>
@@ -55,21 +55,21 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_app_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_app_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_app_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_minus"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_app_button_round_brackets"/>
</LinearLayout>
@@ -78,21 +78,21 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_app_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_app_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_app_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_app_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_app_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_app_button_history"/>
</LinearLayout>

6
android-app/src/main/res/layout-land/main_first_pane.xml
View File

@@ -42,7 +42,7 @@
a:orientation="horizontal">
<include
layout="@layout/cpp_drag_button_left"
layout="@layout/cpp_app_button_left"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
@@ -61,13 +61,13 @@
a:orientation="horizontal" />
<include
layout="@layout/cpp_drag_button_clear"
layout="@layout/cpp_app_button_clear"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_drag_button_right"
layout="@layout/cpp_app_button_right"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>

6
android-app/src/main/res/layout-land/main_first_pane_mobile.xml
View File

@@ -39,7 +39,7 @@
a:layout_height="0dp">
<include
layout="@layout/cpp_drag_button_left"
layout="@layout/cpp_app_button_left"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
@@ -57,13 +57,13 @@
a:layout_weight="4"/>
<include
layout="@layout/cpp_drag_button_clear"
layout="@layout/cpp_app_button_clear"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_drag_button_right"
layout="@layout/cpp_app_button_right"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>

52
android-app/src/main/res/layout-large-land/cpp_app_keyboard.xml
View File

@@ -32,25 +32,25 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_left"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_app_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_app_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_app_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_app_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_division"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_app_button_clear"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_app_button_right"/>
</LinearLayout>
@@ -59,25 +59,25 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_vars"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_functions"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_app_button_empty"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_app_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_app_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_app_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_minus"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_app_button_equals"/>
</LinearLayout>
@@ -86,25 +86,25 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_app_button_empty"/>
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_operators"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_app_button_dot"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_app_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_app_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_app_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_app_button_0"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_app_button_round_brackets"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_app_button_history"/>
</LinearLayout>

48
android-app/src/main/res/layout-large/cpp_app_keyboard.xml
View File

@@ -32,19 +32,19 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_left"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_app_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_app_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_app_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_app_button_multiplication"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_app_button_right"/>
</LinearLayout>
@@ -53,17 +53,17 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_vars"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_app_button_clear"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_app_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_app_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_app_button_6"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_division"/>
<include layout="@layout/cpp_app_button_copy"/>
@@ -74,17 +74,17 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_functions"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_app_button_equals"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_app_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_app_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_app_button_3"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_plus"/>
<include layout="@layout/cpp_app_button_paste"/>
@@ -95,19 +95,19 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_app_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_app_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_app_button_dot"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_minus"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_app_button_history"/>
</LinearLayout>

48
android-app/src/main/res/layout-xlarge-land/cpp_app_keyboard.xml
View File

@@ -32,33 +32,33 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_left"/>
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_app_button_6"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_app_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_app_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_app_button_9"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_app_button_0"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_app_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_app_button_equals"/>
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_app_button_right"/>
</LinearLayout>
@@ -69,31 +69,31 @@
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_app_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_app_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_app_button_3"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_app_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_app_button_5"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_minus"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_app_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_app_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_app_button_history"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_app_button_clear"/>
</LinearLayout>

56
android-app/src/main/res/layout-xlarge/cpp_app_keyboard.xml
View File

@@ -32,21 +32,21 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_left"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_app_button_empty"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_app_button_empty"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_app_button_empty"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_app_button_empty"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_app_button_clear"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_app_button_right"/>
</LinearLayout>
@@ -55,21 +55,21 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_app_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_app_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_app_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_app_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_app_button_equals"/>
</LinearLayout>
@@ -78,21 +78,21 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_app_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_app_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_app_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_minus"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_app_button_round_brackets"/>
</LinearLayout>
@@ -101,21 +101,21 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_app_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_app_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_app_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_app_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_app_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_app_button_history"/>
</LinearLayout>

3
android-app/src/main/res/layout/cpp_drag_button_0.xml → android-app/src/main/res/layout/cpp_app_button_0.xml
View File

@@ -29,5 +29,4 @@
a:text="0"
c:textDown="000"
c:directionTextScale="0.5"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_1.xml → android-app/src/main/res/layout/cpp_app_button_1.xml
View File

@@ -29,5 +29,4 @@
c:textUp="sin"
c:textLeft="A"
c:textDown="asin"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_2.xml → android-app/src/main/res/layout/cpp_app_button_2.xml
View File

@@ -29,5 +29,4 @@
c:textUp="cos"
c:textLeft="B"
c:textDown="acos"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_3.xml → android-app/src/main/res/layout/cpp_app_button_3.xml
View File

@@ -29,5 +29,4 @@
c:textUp="tan"
c:textLeft="C"
c:textDown="atan"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_4.xml → android-app/src/main/res/layout/cpp_app_button_4.xml
View File

@@ -28,5 +28,4 @@
c:textUp="x"
c:textLeft="D"
c:textDown="y"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_5.xml → android-app/src/main/res/layout/cpp_app_button_5.xml
View File

@@ -28,5 +28,4 @@
c:textUp="t"
c:textLeft="E"
c:textDown="j"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_6.xml → android-app/src/main/res/layout/cpp_app_button_6.xml
View File

@@ -30,5 +30,4 @@
c:textLeft="F"
c:textDown="rad"
c:directionTextScale="0.33;0.30;0.33;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_7.xml → android-app/src/main/res/layout/cpp_app_button_7.xml
View File

@@ -30,5 +30,4 @@
c:textLeft="0b:"
c:textDown="!"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_8.xml → android-app/src/main/res/layout/cpp_app_button_8.xml
View File

@@ -30,5 +30,4 @@
c:textLeft="0d:"
c:textDown="lg"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_9.xml → android-app/src/main/res/layout/cpp_app_button_9.xml
View File

@@ -30,5 +30,4 @@
c:textLeft="0x:"
c:textUp="π"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_clear.xml → android-app/src/main/res/layout/cpp_app_button_clear.xml
View File

@@ -30,5 +30,4 @@
c:textDown="bin"
c:textLeft="hex"
a:textStyle="bold"
style="?cpp_control_image_button_style"
a:onClick="clearButtonClickHandler"/>
style="?cpp_control_image_button_style"/>

3
android-app/src/main/res/layout/cpp_app_button_copy.xml
View File

@@ -25,5 +25,4 @@
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_copy"
a:src="@drawable/kb_copy"
style="?cpp_control_image_button_style"
a:onClick="copyButtonClickHandler"/>
style="?cpp_control_image_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_division.xml → android-app/src/main/res/layout/cpp_app_button_division.xml
View File

@@ -29,5 +29,4 @@
a:text="/"
c:textDown="√"
c:directionTextScale="0.5"
style="?cpp_operation_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_operation_button_style"/>

3
android-app/src/main/res/layout/cpp_app_button_donate.xml
View File

@@ -25,5 +25,4 @@
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_like"
a:src="@drawable/kb_share"
style="?cpp_control_image_button_style"
a:onClick="likeButtonClickHandler"/>
style="?cpp_control_image_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_dot.xml → android-app/src/main/res/layout/cpp_app_button_dot.xml
View File

@@ -28,5 +28,4 @@
a:text="."
c:textUp=","
c:directionTextScale="0.5"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

0
android-app/src/main/res/layout/cpp_drag_button_empty.xml → android-app/src/main/res/layout/cpp_app_button_empty.xml
View File

3
android-app/src/main/res/layout/cpp_drag_button_equals.xml → android-app/src/main/res/layout/cpp_app_button_equals.xml
View File

@@ -28,5 +28,4 @@
a:text="="
c:textDown="@string/cpp_plot_button_text"
c:directionTextScale="0.5;0.5;0.33;0.5"
style="?cpp_control_button_style"
a:onClick="equalsButtonClickHandler"/>
style="?cpp_control_button_style"/>

3
android-app/src/main/res/layout/cpp_app_button_erase.xml
View File

@@ -25,5 +25,4 @@
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_erase"
a:src="@drawable/kb_erase"
style="?cpp_control_image_button_style"
a:onClick="eraseButtonClickHandler"/>
style="?cpp_control_image_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_functions.xml → android-app/src/main/res/layout/cpp_app_button_functions.xml
View File

@@ -25,9 +25,8 @@
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_functions"
c:directionTextScale="0.5"
c:directionTextScale="0.4"
c:textUp="+ƒ"
a:text="ƒ(x)"
a:textStyle="italic"
a:onClick="functionsButtonClickHandler"
style="?cpp_control_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_history.xml → android-app/src/main/res/layout/cpp_app_button_history.xml
View File

@@ -29,5 +29,4 @@
c:textDown="@string/c_redo"
c:directionTextScale="0.27"
style="?cpp_control_button_style"
a:textStyle="bold"
a:onClick="historyButtonClickHandler"/>
a:textStyle="bold"/>

3
android-app/src/main/res/layout/cpp_drag_button_left.xml → android-app/src/main/res/layout/cpp_app_button_left.xml
View File

@@ -28,5 +28,4 @@
c:textUp="◁◁"
a:text="◁"
c:directionTextScale="0.5"
style="?cpp_control_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_control_button_style"/>

5
android-app/src/main/res/layout/cpp_drag_button_subtraction.xml → android-app/src/main/res/layout/cpp_app_button_minus.xml
View File

@@ -26,6 +26,5 @@
a:id="@id/cpp_button_subtraction"
c:textDown="∂,…"
a:text="-"
c:directionTextScale="0.5"
style="?cpp_operation_button_style"
a:onClick="digitButtonClickHandler"/>
c:directionTextScale="0.4"
style="?cpp_operation_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_multiplication.xml → android-app/src/main/res/layout/cpp_app_button_multiplication.xml
View File

@@ -30,5 +30,4 @@
c:textDown="^2"
c:textLeft="Π"
style="?cpp_operation_button_style"
c:directionTextScale="0.5"
a:onClick="digitButtonClickHandler"/>
c:directionTextScale="0.5"/>

1
android-app/src/main/res/layout/cpp_drag_button_operators.xml → android-app/src/main/res/layout/cpp_app_button_operators.xml
View File

@@ -25,5 +25,4 @@
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_operators"
a:text="∂,…"
a:onClick="operatorsButtonClickHandler"
style="?cpp_control_button_style"/>

3
android-app/src/main/res/layout/cpp_app_button_paste.xml
View File

@@ -25,5 +25,4 @@
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_paste"
a:src="@drawable/kb_paste"
style="?cpp_control_image_button_style"
a:onClick="pasteButtonClickHandler"/>
style="?cpp_control_image_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_plus.xml → android-app/src/main/res/layout/cpp_app_button_plus.xml
View File

@@ -28,5 +28,4 @@
c:textUp="°"
c:textDown="E"
a:text="+"
style="?cpp_operation_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_operation_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_right.xml → android-app/src/main/res/layout/cpp_app_button_right.xml
View File

@@ -28,5 +28,4 @@
c:textUp="▷▷"
a:text="▷"
c:directionTextScale="0.5"
style="?cpp_control_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_control_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_round_brackets.xml → android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
View File

@@ -30,5 +30,4 @@
c:textDown=")"
c:textLeft="(…)"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
style="?cpp_digit_button_style"/>

3
android-app/src/main/res/layout/cpp_drag_button_vars.xml → android-app/src/main/res/layout/cpp_app_button_vars.xml
View File

@@ -25,9 +25,8 @@
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_vars"
c:directionTextScale="0.5"
c:directionTextScale="0.4"
c:textUp="+π"
a:text="π,…"
a:textStyle="italic"
a:onClick="varsButtonClickHandler"
style="?cpp_control_button_style"/>

44
android-app/src/main/res/layout/cpp_app_keyboard.xml
View File

@@ -32,15 +32,15 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_app_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_app_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_app_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_app_button_multiplication"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_app_button_clear"/>
</LinearLayout>
@@ -49,13 +49,13 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_app_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_app_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_app_button_6"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_division"/>
<include layout="@layout/cpp_app_button_erase"/>
@@ -66,13 +66,13 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_app_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_app_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_app_button_3"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_plus"/>
<include layout="@layout/cpp_app_button_copy"/>
@@ -83,13 +83,13 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_app_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_app_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_app_button_dot"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_minus"/>
<include layout="@layout/cpp_app_button_paste"/>
@@ -101,15 +101,15 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_left"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_app_button_right"/>
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_vars"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_functions"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_app_button_history"/>
</LinearLayout>

44
android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml
View File

@@ -32,15 +32,15 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_app_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_app_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_app_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_app_button_multiplication"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_app_button_clear"/>
</LinearLayout>
@@ -49,13 +49,13 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_app_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_app_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_app_button_6"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_division"/>
<include layout="@layout/cpp_app_button_erase"/>
@@ -66,13 +66,13 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_app_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_app_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_app_button_3"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_plus"/>
<include layout="@layout/cpp_app_button_copy"/>
@@ -83,13 +83,13 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_app_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_app_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_app_button_dot"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_minus"/>
<include layout="@layout/cpp_app_button_paste"/>
@@ -101,15 +101,15 @@
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_left"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_app_button_right"/>
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_vars"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_functions"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_app_button_history"/>
</LinearLayout>

52
android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml Normal file
View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical"
a:gravity="center">
<TextView
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:textAppearance="@android:style/TextAppearance.Large"
style="@style/WizardLabel"
a:text="@string/cpp_wizard_theme_title" />
<Spinner
a:id="@+id/wizard_theme_spinner"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
style="@style/WizardLabel" />
<FrameLayout
a:id="@+id/wizard_theme_preview"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
style="@style/WizardLabel.Last"
a:orientation="vertical"
/>
</LinearLayout>

57
android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml Normal file
View File

@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:orientation="vertical"
a:padding="3dp"
a:background="?attr/cpp_main_bg">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_0" />
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_app_button_plus" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_1" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_minus" />
</LinearLayout>
</LinearLayout>

82
android-app/src/main/res/layout/drag_button_calibration.xml
View File

@@ -1,82 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="#ff000000">
<LinearLayout
a:id="@+id/simplePad"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout
a:layout_weight="1"
a:layout_width="fill_parent"
a:layout_height="0dp">
<ImageView
a:id="@+id/calibrationArrowLeft"
a:layout_gravity="left"
a:layout_width="80dp"
a:layout_height="80dp"/>
<org.solovyev.android.calculator.drag.DirectionDragButton
a:id="@+id/calibrationButtonLeft"
a:text=""
c:textUp="@string/c_up"
c:textDown="@string/c_down"
a:layout_width="80dp"
a:layout_height="80dp"
style="?cpp_digit_button_style"/>
<org.solovyev.android.calculator.drag.DirectionDragButton
a:id="@+id/calibrationButtonRight"
a:text=""
c:textUp="@string/c_up"
c:textDown="@string/c_down"
a:layout_width="80dp"
a:layout_height="80dp"
style="?cpp_digit_button_style"/>
<ImageView
a:id="@+id/calibrationArrowRight"
a:layout_gravity="right"
a:layout_width="80dp"
a:layout_height="80dp"/>
</LinearLayout>
</LinearLayout>
<Button
a:id="@+id/calibrationStart"
a:text="@string/c_restart"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_gravity="bottom"/>
</LinearLayout>

2
android-app/src/main/res/layout/main_calculator.xml
View File

@@ -43,7 +43,7 @@
a:baselineAligned="false">
<include
layout="@layout/cpp_drag_button_equals"
layout="@layout/cpp_app_button_equals"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />

2
android-app/src/main/res/layout/main_calculator_mobile.xml
View File

@@ -42,7 +42,7 @@
a:layout_height="0dp">
<include
layout="@layout/cpp_drag_button_equals"
layout="@layout/cpp_app_button_equals"
a:layout_weight="1"
a:layout_width="0dp"
a:layout_height="match_parent"/>

1
android-app/src/main/res/values/attributes.xml
View File

@@ -34,5 +34,6 @@
<attr name="cpp_pane_style_transparent" format="reference"/>
<attr name="cpp_main_layout_style" format="reference"/>
<attr name="cpp_main_multi_pane_layout_style" format="reference"/>
<attr name="cpp_main_bg" format="reference"/>
</resources>

1
android-app/src/main/res/values/text_wizard.xml
View File

@@ -27,6 +27,7 @@
<string name="cpp_wizard_welcome_title">Welcome</string>
<string name="cpp_wizard_layout_title">Choose layout</string>
<string name="cpp_wizard_mode_title">Choose mode</string>
<string name="cpp_wizard_theme_title">Choose theme</string>
<string name="cpp_wizard_onscreen_calculator_title">Calculator in a separate window</string>
<string name="cpp_wizard_dragbutton_title">Drag button basics</string>
<string name="cpp_wizard_final_done">The app is set up and ready to use.</string>

2
android-app/src/main/res/values/theme_gray.xml
View File

@@ -145,6 +145,7 @@
<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
</style>
<style name="cpp_gray_dialog_theme" parent="Theme.Dialog">
@@ -166,6 +167,7 @@
<item name="cpp_pane_style">@style/cpp_default_pane_style</item>
<item name="cpp_pane_style_transparent">@style/cpp_default_pane_style_transparent</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
</style>
</resources>