diff --git a/android-app-core/AndroidManifest.xml b/android-app-core/AndroidManifest.xml
index a86dbd76..a755358f 100644
--- a/android-app-core/AndroidManifest.xml
+++ b/android-app-core/AndroidManifest.xml
@@ -1,11 +1,11 @@
+ package="org.solovyev.android.calculator.core"
+ android:versionCode="1"
+ android:versionName="1.0">
+ android:minSdkVersion="4"
+ android:targetSdkVersion="17"/>
\ No newline at end of file
diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml
index e1f82e7e..0b843f0a 100644
--- a/android-app-core/pom.xml
+++ b/android-app-core/pom.xml
@@ -1,5 +1,6 @@
-
+
4.0.0
diff --git a/android-app-core/res/drawable/blue_button.xml b/android-app-core/res/drawable/blue_button.xml
index 3f190da7..2908509f 100644
--- a/android-app-core/res/drawable/blue_button.xml
+++ b/android-app-core/res/drawable/blue_button.xml
@@ -1,9 +1,31 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/blue_button_dark.xml b/android-app-core/res/drawable/blue_button_dark.xml
index 38247e80..9301f26d 100644
--- a/android-app-core/res/drawable/blue_button_dark.xml
+++ b/android-app-core/res/drawable/blue_button_dark.xml
@@ -1,9 +1,31 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/blue_button_dark_shape.xml b/android-app-core/res/drawable/blue_button_dark_shape.xml
index 153639d6..77ffecfd 100644
--- a/android-app-core/res/drawable/blue_button_dark_shape.xml
+++ b/android-app-core/res/drawable/blue_button_dark_shape.xml
@@ -1,15 +1,31 @@
-
+ a:startColor="#000d1f"
+ a:endColor="#002255"
+ a:angle="90"/>
+
diff --git a/android-app-core/res/drawable/blue_button_shape.xml b/android-app-core/res/drawable/blue_button_shape.xml
index fd8acd78..2f27a937 100644
--- a/android-app-core/res/drawable/blue_button_shape.xml
+++ b/android-app-core/res/drawable/blue_button_shape.xml
@@ -1,9 +1,31 @@
+
+
-
+ a:startColor="#001c45"
+ a:endColor="#003481"
+ a:angle="90"/>
+
diff --git a/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml b/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml
index c029d95c..c4410967 100644
--- a/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml
+++ b/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml
@@ -1,20 +1,28 @@
-
+
-
-
-
+
+
+
diff --git a/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml b/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml
index eb72d05b..0998eb96 100644
--- a/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml
+++ b/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml
@@ -1,25 +1,36 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml b/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
index c9f87b73..44f03a67 100644
--- a/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
+++ b/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
@@ -1,19 +1,26 @@
-
+
-
-
+
+
diff --git a/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml b/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml
index 619ff9d3..dd385175 100644
--- a/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml
+++ b/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml
@@ -1,26 +1,37 @@
-
+
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml b/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml
index 4cda1e26..6c43f18a 100644
--- a/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml
+++ b/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml
@@ -1,21 +1,29 @@
-
+
-
-
-
-
+
+
+
+
diff --git a/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml
index e538a5f4..f9a720b6 100644
--- a/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml
+++ b/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml
@@ -1,33 +1,48 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/android-app-core/res/drawable/gray_button.xml b/android-app-core/res/drawable/gray_button.xml
index 967fbfc0..9ceef380 100644
--- a/android-app-core/res/drawable/gray_button.xml
+++ b/android-app-core/res/drawable/gray_button.xml
@@ -1,9 +1,31 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/gray_button_dark.xml b/android-app-core/res/drawable/gray_button_dark.xml
index 4c45b348..35f16cb9 100644
--- a/android-app-core/res/drawable/gray_button_dark.xml
+++ b/android-app-core/res/drawable/gray_button_dark.xml
@@ -1,9 +1,31 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/gray_button_dark_shape.xml b/android-app-core/res/drawable/gray_button_dark_shape.xml
index 6545aa5a..09c8dab8 100644
--- a/android-app-core/res/drawable/gray_button_dark_shape.xml
+++ b/android-app-core/res/drawable/gray_button_dark_shape.xml
@@ -1,9 +1,31 @@
+
+
-
+ a:startColor="#000000"
+ a:endColor="#333333"
+ a:angle="90"/>
+
diff --git a/android-app-core/res/drawable/gray_button_shape.xml b/android-app-core/res/drawable/gray_button_shape.xml
index 1710094b..0ebdbe72 100644
--- a/android-app-core/res/drawable/gray_button_shape.xml
+++ b/android-app-core/res/drawable/gray_button_shape.xml
@@ -1,9 +1,31 @@
+
+
-
+ a:startColor="#071622"
+ a:endColor="#253541"
+ a:angle="90"/>
+
diff --git a/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
index 75077a99..71ae4541 100644
--- a/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
+++ b/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
@@ -1,33 +1,48 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/android-app-core/res/drawable/metro_blue_button.xml b/android-app-core/res/drawable/metro_blue_button.xml
index a638c635..0101d679 100644
--- a/android-app-core/res/drawable/metro_blue_button.xml
+++ b/android-app-core/res/drawable/metro_blue_button.xml
@@ -1,9 +1,31 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_blue_button_shape.xml b/android-app-core/res/drawable/metro_blue_button_shape.xml
index e6fc3fc1..d888ae92 100644
--- a/android-app-core/res/drawable/metro_blue_button_shape.xml
+++ b/android-app-core/res/drawable/metro_blue_button_shape.xml
@@ -1,19 +1,26 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_blue_list_item.xml b/android-app-core/res/drawable/metro_blue_list_item.xml
index 21559be3..cbc7a037 100644
--- a/android-app-core/res/drawable/metro_blue_list_item.xml
+++ b/android-app-core/res/drawable/metro_blue_list_item.xml
@@ -1,21 +1,51 @@
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/android-app-core/res/drawable/metro_button_dark.xml b/android-app-core/res/drawable/metro_button_dark.xml
index 01eecc9c..cbaae7b8 100644
--- a/android-app-core/res/drawable/metro_button_dark.xml
+++ b/android-app-core/res/drawable/metro_button_dark.xml
@@ -1,8 +1,30 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_button_dark_shape.xml b/android-app-core/res/drawable/metro_button_dark_shape.xml
index 3f06ca5b..2165b29a 100644
--- a/android-app-core/res/drawable/metro_button_dark_shape.xml
+++ b/android-app-core/res/drawable/metro_button_dark_shape.xml
@@ -1,19 +1,26 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_button_green.xml b/android-app-core/res/drawable/metro_button_green.xml
index 4fa1e269..78abe5d1 100644
--- a/android-app-core/res/drawable/metro_button_green.xml
+++ b/android-app-core/res/drawable/metro_button_green.xml
@@ -1,9 +1,31 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_button_green_shape.xml b/android-app-core/res/drawable/metro_button_green_shape.xml
index 01833fac..2887709b 100644
--- a/android-app-core/res/drawable/metro_button_green_shape.xml
+++ b/android-app-core/res/drawable/metro_button_green_shape.xml
@@ -1,19 +1,26 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_button_light.xml b/android-app-core/res/drawable/metro_button_light.xml
index 1498b5aa..a4c0a22c 100644
--- a/android-app-core/res/drawable/metro_button_light.xml
+++ b/android-app-core/res/drawable/metro_button_light.xml
@@ -1,8 +1,30 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_button_light_shape.xml b/android-app-core/res/drawable/metro_button_light_shape.xml
index 32bbaf5c..78e13a77 100644
--- a/android-app-core/res/drawable/metro_button_light_shape.xml
+++ b/android-app-core/res/drawable/metro_button_light_shape.xml
@@ -1,19 +1,26 @@
-
+
-
-
+
+
diff --git a/android-app-core/res/drawable/metro_button_pressed.xml b/android-app-core/res/drawable/metro_button_pressed.xml
index 386a4bad..72931a8f 100644
--- a/android-app-core/res/drawable/metro_button_pressed.xml
+++ b/android-app-core/res/drawable/metro_button_pressed.xml
@@ -1,19 +1,26 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_button_purple.xml b/android-app-core/res/drawable/metro_button_purple.xml
index d5c51b1e..dbae4798 100644
--- a/android-app-core/res/drawable/metro_button_purple.xml
+++ b/android-app-core/res/drawable/metro_button_purple.xml
@@ -1,9 +1,31 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_button_purple_shape.xml b/android-app-core/res/drawable/metro_button_purple_shape.xml
index e50eab0f..a994ce3b 100644
--- a/android-app-core/res/drawable/metro_button_purple_shape.xml
+++ b/android-app-core/res/drawable/metro_button_purple_shape.xml
@@ -1,19 +1,26 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/metro_green_list_item.xml b/android-app-core/res/drawable/metro_green_list_item.xml
index e7292aa6..0ba94d5a 100644
--- a/android-app-core/res/drawable/metro_green_list_item.xml
+++ b/android-app-core/res/drawable/metro_green_list_item.xml
@@ -1,22 +1,52 @@
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/android-app-core/res/drawable/metro_purple_list_item.xml b/android-app-core/res/drawable/metro_purple_list_item.xml
index 34bbe728..0c54af47 100644
--- a/android-app-core/res/drawable/metro_purple_list_item.xml
+++ b/android-app-core/res/drawable/metro_purple_list_item.xml
@@ -1,21 +1,51 @@
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/android-app-core/res/drawable/pane_background.xml b/android-app-core/res/drawable/pane_background.xml
index 4058c468..23efe1bb 100644
--- a/android-app-core/res/drawable/pane_background.xml
+++ b/android-app-core/res/drawable/pane_background.xml
@@ -1,19 +1,26 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/violet_button.xml b/android-app-core/res/drawable/violet_button.xml
index 2f72752a..2113beb7 100644
--- a/android-app-core/res/drawable/violet_button.xml
+++ b/android-app-core/res/drawable/violet_button.xml
@@ -1,9 +1,31 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/violet_button_dark.xml b/android-app-core/res/drawable/violet_button_dark.xml
index 2d1232c8..2d979c5e 100644
--- a/android-app-core/res/drawable/violet_button_dark.xml
+++ b/android-app-core/res/drawable/violet_button_dark.xml
@@ -1,9 +1,31 @@
+
+
-
+
-
+
\ No newline at end of file
diff --git a/android-app-core/res/drawable/violet_button_dark_shape.xml b/android-app-core/res/drawable/violet_button_dark_shape.xml
index 7409fe9c..5caaca03 100644
--- a/android-app-core/res/drawable/violet_button_dark_shape.xml
+++ b/android-app-core/res/drawable/violet_button_dark_shape.xml
@@ -1,15 +1,31 @@
-
+ a:startColor="#2b0325"
+ a:endColor="#4f1c47"
+ a:angle="90"/>
+
diff --git a/android-app-core/res/drawable/violet_button_shape.xml b/android-app-core/res/drawable/violet_button_shape.xml
index 4ef0e931..771c2f9b 100644
--- a/android-app-core/res/drawable/violet_button_shape.xml
+++ b/android-app-core/res/drawable/violet_button_shape.xml
@@ -1,15 +1,31 @@
-
+ a:startColor="#520546"
+ a:endColor="#8a307c"
+ a:angle="90"/>
+
diff --git a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml
index 333c2c04..77f3f036 100644
--- a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml
+++ b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml
@@ -1,31 +1,53 @@
+
+
+ style="?cpp_dialog_style">
+ a:id="@+id/cpp_fixable_messages_container"
+ a:layout_width="match_parent"
+ a:layout_height="wrap_content"
+ a:orientation="vertical"/>
+ a:id="@+id/cpp_do_not_show_fixable_messages_checkbox"
+ a:text="@string/do_not_show_messages_in_session"
+ a:layout_width="match_parent"
+ a:layout_height="wrap_content"/>
+ a:layout_width="match_parent"
+ a:layout_height="wrap_content"
+ a:orientation="horizontal"
+ a:gravity="center">
+ a:id="@+id/close_button"
+ a:layout_width="wrap_content"
+ a:layout_height="wrap_content"
+ a:text="@string/close"/>
diff --git a/android-app-core/res/layout/cpp_fixable_messages_dialog_message.xml b/android-app-core/res/layout/cpp_fixable_messages_dialog_message.xml
index 243c6956..cc9b60e6 100644
--- a/android-app-core/res/layout/cpp_fixable_messages_dialog_message.xml
+++ b/android-app-core/res/layout/cpp_fixable_messages_dialog_message.xml
@@ -1,24 +1,46 @@
+
+
+ a:layout_width="match_parent"
+ a:layout_height="wrap_content"
+ a:orientation="horizontal"
+ a:padding="6dp">
+ a:id="@+id/cpp_fixable_messages_text_view"
+ a:layout_width="0dp"
+ a:layout_height="wrap_content"
+ a:layout_weight="5"
+ a:layout_gravity="fill"
+ a:text="@+id/cpp_fixable_messages_text_view"/>
+ a:id="@+id/cpp_fix_button"
+ a:layout_width="0dp"
+ a:layout_height="wrap_content"
+ a:layout_weight="2"
+ a:text="@string/fix"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_0.xml b/android-app-core/res/layout/cpp_simple_button_0.xml
index 5c9fb014..d035e05b 100644
--- a/android-app-core/res/layout/cpp_simple_button_0.xml
+++ b/android-app-core/res/layout/cpp_simple_button_0.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_0"
+ a:text="0"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_1.xml b/android-app-core/res/layout/cpp_simple_button_1.xml
index f4324e2d..f67ba33c 100644
--- a/android-app-core/res/layout/cpp_simple_button_1.xml
+++ b/android-app-core/res/layout/cpp_simple_button_1.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_1"
+ a:text="1"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_2.xml b/android-app-core/res/layout/cpp_simple_button_2.xml
index e8ca564a..574c3219 100644
--- a/android-app-core/res/layout/cpp_simple_button_2.xml
+++ b/android-app-core/res/layout/cpp_simple_button_2.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_2"
+ a:text="2"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_3.xml b/android-app-core/res/layout/cpp_simple_button_3.xml
index b6e3142f..478d8499 100644
--- a/android-app-core/res/layout/cpp_simple_button_3.xml
+++ b/android-app-core/res/layout/cpp_simple_button_3.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_3"
+ a:text="3"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_4.xml b/android-app-core/res/layout/cpp_simple_button_4.xml
index d1a1f820..01ea63a7 100644
--- a/android-app-core/res/layout/cpp_simple_button_4.xml
+++ b/android-app-core/res/layout/cpp_simple_button_4.xml
@@ -1,11 +1,27 @@
\ No newline at end of file
+ a:id="@id/cpp_button_4"
+ a:text="4"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_5.xml b/android-app-core/res/layout/cpp_simple_button_5.xml
index 43cdfd79..d3b13012 100644
--- a/android-app-core/res/layout/cpp_simple_button_5.xml
+++ b/android-app-core/res/layout/cpp_simple_button_5.xml
@@ -1,11 +1,27 @@
\ No newline at end of file
+ a:id="@id/cpp_button_5"
+ a:text="5"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_6.xml b/android-app-core/res/layout/cpp_simple_button_6.xml
index a5d843ee..b1855117 100644
--- a/android-app-core/res/layout/cpp_simple_button_6.xml
+++ b/android-app-core/res/layout/cpp_simple_button_6.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_6"
+ a:text="6"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_7.xml b/android-app-core/res/layout/cpp_simple_button_7.xml
index 4a9d3f08..aea343b8 100644
--- a/android-app-core/res/layout/cpp_simple_button_7.xml
+++ b/android-app-core/res/layout/cpp_simple_button_7.xml
@@ -1,6 +1,28 @@
+
+
\ No newline at end of file
+ a:id="@id/cpp_button_7"
+ a:text="7"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_8.xml b/android-app-core/res/layout/cpp_simple_button_8.xml
index 05ad8463..635bbe36 100644
--- a/android-app-core/res/layout/cpp_simple_button_8.xml
+++ b/android-app-core/res/layout/cpp_simple_button_8.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_8"
+ a:text="8"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_9.xml b/android-app-core/res/layout/cpp_simple_button_9.xml
index a57aedb2..e0ae8c34 100644
--- a/android-app-core/res/layout/cpp_simple_button_9.xml
+++ b/android-app-core/res/layout/cpp_simple_button_9.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_9"
+ a:text="9"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_app.xml b/android-app-core/res/layout/cpp_simple_button_app.xml
index e56cd43d..66f58039 100644
--- a/android-app-core/res/layout/cpp_simple_button_app.xml
+++ b/android-app-core/res/layout/cpp_simple_button_app.xml
@@ -1,13 +1,29 @@
\ No newline at end of file
+ a:id="@id/cpp_button_app"
+ a:src="@drawable/kb_logo"
+ style="@style/cpp_simple_metro_control_image_button_style"
+ a:contentDescription="App"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_clear.xml b/android-app-core/res/layout/cpp_simple_button_clear.xml
index 470854c2..92b1a42c 100644
--- a/android-app-core/res/layout/cpp_simple_button_clear.xml
+++ b/android-app-core/res/layout/cpp_simple_button_clear.xml
@@ -1,13 +1,29 @@
\ No newline at end of file
+ a:id="@id/cpp_button_clear"
+ a:text="@string/c_clear"
+ a:textStyle="bold"
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_copy.xml b/android-app-core/res/layout/cpp_simple_button_copy.xml
index 810fb148..f8b02a21 100644
--- a/android-app-core/res/layout/cpp_simple_button_copy.xml
+++ b/android-app-core/res/layout/cpp_simple_button_copy.xml
@@ -1,13 +1,29 @@
\ No newline at end of file
+ a:id="@id/cpp_button_copy"
+ a:src="@drawable/kb_copy"
+ style="@style/cpp_simple_metro_control_image_button_style"
+ a:contentDescription="Copy"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_division.xml b/android-app-core/res/layout/cpp_simple_button_division.xml
index ad36211b..bb48911f 100644
--- a/android-app-core/res/layout/cpp_simple_button_division.xml
+++ b/android-app-core/res/layout/cpp_simple_button_division.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_division"
+ a:text="/"
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_dot.xml b/android-app-core/res/layout/cpp_simple_button_dot.xml
index 5e53ab00..e933cd52 100644
--- a/android-app-core/res/layout/cpp_simple_button_dot.xml
+++ b/android-app-core/res/layout/cpp_simple_button_dot.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_period"
+ a:text="."
+ style="@style/metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_equals.xml b/android-app-core/res/layout/cpp_simple_button_equals.xml
index bcf0396f..fd84179c 100644
--- a/android-app-core/res/layout/cpp_simple_button_equals.xml
+++ b/android-app-core/res/layout/cpp_simple_button_equals.xml
@@ -1,11 +1,27 @@
\ No newline at end of file
+ a:id="@id/cpp_button_equals"
+ a:text="="
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_erase.xml b/android-app-core/res/layout/cpp_simple_button_erase.xml
index b31d5ce1..9cccce0b 100644
--- a/android-app-core/res/layout/cpp_simple_button_erase.xml
+++ b/android-app-core/res/layout/cpp_simple_button_erase.xml
@@ -1,13 +1,29 @@
\ No newline at end of file
+ a:id="@id/cpp_button_erase"
+ a:src="@drawable/kb_erase"
+ style="@style/cpp_simple_metro_control_image_button_style"
+ a:contentDescription="Erase"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_functions.xml b/android-app-core/res/layout/cpp_simple_button_functions.xml
index a18de38c..bc9ed462 100644
--- a/android-app-core/res/layout/cpp_simple_button_functions.xml
+++ b/android-app-core/res/layout/cpp_simple_button_functions.xml
@@ -1,13 +1,29 @@
\ No newline at end of file
+ a:id="@id/cpp_button_functions"
+ a:text="ƒ(x)"
+ a:textStyle="italic"
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_history.xml b/android-app-core/res/layout/cpp_simple_button_history.xml
index e16e00b7..ab407d13 100644
--- a/android-app-core/res/layout/cpp_simple_button_history.xml
+++ b/android-app-core/res/layout/cpp_simple_button_history.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_history"
+ a:text="@string/c_history_button"
+ style="@style/cpp_simple_metro_control_button_style"
+ a:textStyle="bold"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_left.xml b/android-app-core/res/layout/cpp_simple_button_left.xml
index d0648c62..f043845f 100644
--- a/android-app-core/res/layout/cpp_simple_button_left.xml
+++ b/android-app-core/res/layout/cpp_simple_button_left.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_left"
+ a:text="◀"
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_like.xml b/android-app-core/res/layout/cpp_simple_button_like.xml
index bc55854f..235bad53 100644
--- a/android-app-core/res/layout/cpp_simple_button_like.xml
+++ b/android-app-core/res/layout/cpp_simple_button_like.xml
@@ -1,13 +1,29 @@
\ No newline at end of file
+ a:id="@id/cpp_button_like"
+ a:src="@drawable/kb_facebook"
+ style="@style/cpp_simple_metro_control_image_button_style"
+ a:contentDescription="Like"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_multiplication.xml b/android-app-core/res/layout/cpp_simple_button_multiplication.xml
index 809fd2b1..57fb7e39 100644
--- a/android-app-core/res/layout/cpp_simple_button_multiplication.xml
+++ b/android-app-core/res/layout/cpp_simple_button_multiplication.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_multiplication"
+ a:text="×"
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_paste.xml b/android-app-core/res/layout/cpp_simple_button_paste.xml
index 8fac963f..84ce21fa 100644
--- a/android-app-core/res/layout/cpp_simple_button_paste.xml
+++ b/android-app-core/res/layout/cpp_simple_button_paste.xml
@@ -1,13 +1,29 @@
\ No newline at end of file
+ a:id="@id/cpp_button_paste"
+ a:src="@drawable/kb_paste"
+ style="@style/cpp_simple_metro_control_image_button_style"
+ a:contentDescription="Paste"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_percent.xml b/android-app-core/res/layout/cpp_simple_button_percent.xml
index c6938813..0c7e99cd 100644
--- a/android-app-core/res/layout/cpp_simple_button_percent.xml
+++ b/android-app-core/res/layout/cpp_simple_button_percent.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_percent"
+ a:text="%"
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_plus.xml b/android-app-core/res/layout/cpp_simple_button_plus.xml
index cb9c3b20..e66a20ce 100644
--- a/android-app-core/res/layout/cpp_simple_button_plus.xml
+++ b/android-app-core/res/layout/cpp_simple_button_plus.xml
@@ -1,11 +1,27 @@
\ No newline at end of file
+ a:id="@id/cpp_button_plus"
+ a:text="+"
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_power.xml b/android-app-core/res/layout/cpp_simple_button_power.xml
index 6d0ba7af..257a2dee 100644
--- a/android-app-core/res/layout/cpp_simple_button_power.xml
+++ b/android-app-core/res/layout/cpp_simple_button_power.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_power"
+ a:text="^"
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_right.xml b/android-app-core/res/layout/cpp_simple_button_right.xml
index afdaff28..174adcae 100644
--- a/android-app-core/res/layout/cpp_simple_button_right.xml
+++ b/android-app-core/res/layout/cpp_simple_button_right.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_right"
+ a:text="▶"
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_round_brackets.xml b/android-app-core/res/layout/cpp_simple_button_round_brackets.xml
index ed2222b8..395369c0 100644
--- a/android-app-core/res/layout/cpp_simple_button_round_brackets.xml
+++ b/android-app-core/res/layout/cpp_simple_button_round_brackets.xml
@@ -1,12 +1,28 @@
\ No newline at end of file
+ a:id="@id/cpp_button_round_brackets"
+ a:text="( )"
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_settings.xml b/android-app-core/res/layout/cpp_simple_button_settings.xml
index 14ca0b27..748647fc 100644
--- a/android-app-core/res/layout/cpp_simple_button_settings.xml
+++ b/android-app-core/res/layout/cpp_simple_button_settings.xml
@@ -1,13 +1,29 @@
\ No newline at end of file
+ a:id="@id/cpp_button_settings"
+ a:src="@drawable/kb_settings"
+ style="@style/cpp_simple_metro_control_image_button_style"
+ a:contentDescription="Settings"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_subtraction.xml b/android-app-core/res/layout/cpp_simple_button_subtraction.xml
index c15221c3..7f7fa9b5 100644
--- a/android-app-core/res/layout/cpp_simple_button_subtraction.xml
+++ b/android-app-core/res/layout/cpp_simple_button_subtraction.xml
@@ -1,11 +1,27 @@
\ No newline at end of file
+ a:id="@id/cpp_button_subtraction"
+ a:text="-"
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_vars.xml b/android-app-core/res/layout/cpp_simple_button_vars.xml
index e76af1a7..314db7fe 100644
--- a/android-app-core/res/layout/cpp_simple_button_vars.xml
+++ b/android-app-core/res/layout/cpp_simple_button_vars.xml
@@ -1,13 +1,29 @@
\ No newline at end of file
+ a:id="@id/cpp_button_vars"
+ a:text="π,…"
+ a:textStyle="italic"
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_keyboard.xml b/android-app-core/res/layout/cpp_simple_keyboard.xml
index 97c60876..f8d83c21 100644
--- a/android-app-core/res/layout/cpp_simple_keyboard.xml
+++ b/android-app-core/res/layout/cpp_simple_keyboard.xml
@@ -1,103 +1,125 @@
+
+
+ a:layout_width="match_parent"
+ a:layout_height="match_parent"
+ a:orientation="vertical">
+ a:layout_weight="1"
+ a:layout_width="match_parent"
+ a:layout_height="0dp">
-
+
-
+
-
+
-
+
-
+
-
+
+ a:layout_weight="1"
+ a:layout_width="match_parent"
+ a:layout_height="0dp">
-
+
-
+
-
+
-
+
-
+
-
+
+ a:layout_weight="1"
+ a:layout_width="match_parent"
+ a:layout_height="0dp">
-
+
-
+
-
+
-
+
-
+
-
+
+ a:layout_weight="1"
+ a:layout_width="match_parent"
+ a:layout_height="0dp">
-
+
-
+
-
+
-
+
-
+
-
+
+ a:layout_weight="1"
+ a:layout_width="match_parent"
+ a:layout_height="0dp">
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/android-app-core/res/layout/cpp_unit_converter.xml b/android-app-core/res/layout/cpp_unit_converter.xml
index 8bdc86ee..5733b43d 100644
--- a/android-app-core/res/layout/cpp_unit_converter.xml
+++ b/android-app-core/res/layout/cpp_unit_converter.xml
@@ -1,87 +1,109 @@
+
+
+ a:layout_width="fill_parent"
+ a:layout_height="fill_parent"
+ a:paddingLeft="10dp"
+ a:paddingRight="10dp"
+ a:orientation="vertical">
+ a:layout_width="fill_parent"
+ a:layout_height="fill_parent"
+ a:paddingBottom="10dp"
+ a:orientation="horizontal">
+ a:id="@+id/unit_types_from"
+ a:layout_width="wrap_content"
+ a:layout_height="fill_parent"/>
+ a:id="@+id/units_from"
+ a:inputType="text"
+ a:singleLine="true"
+ a:layout_width="fill_parent"
+ a:layout_height="fill_parent"/>
+ a:layout_width="fill_parent"
+ a:paddingBottom="10dp"
+ a:layout_height="fill_parent"
+ a:orientation="horizontal">
+ a:id="@+id/unit_types_to"
+ a:layout_width="wrap_content"
+ a:layout_height="fill_parent"/>
+ a:id="@+id/units_to"
+ a:editable="false"
+ a:inputType="none"
+ a:singleLine="true"
+ a:layout_width="fill_parent"
+ a:layout_height="fill_parent"/>
+ a:layout_width="fill_parent"
+ a:paddingBottom="10dp"
+ a:layout_height="fill_parent"
+ a:gravity="center"
+ a:orientation="horizontal">
+ a:id="@+id/unit_converter_ok_button"
+ a:text="@android:string/ok"
+ a:paddingLeft="15dp"
+ a:paddingRight="15dp"
+ a:singleLine="true"
+ a:layout_width="wrap_content"
+ a:layout_height="wrap_content"/>
+ a:id="@+id/unit_converter_copy_button"
+ a:text="@android:string/copy"
+ a:paddingLeft="15dp"
+ a:paddingRight="15dp"
+ a:singleLine="true"
+ a:layout_width="wrap_content"
+ a:layout_height="wrap_content"/>
+ a:id="@+id/unit_converter_custom_button"
+ a:paddingLeft="15dp"
+ a:paddingRight="15dp"
+ a:ellipsize="end"
+ a:singleLine="true"
+ a:layout_width="wrap_content"
+ a:layout_height="wrap_content"/>
diff --git a/android-app-core/res/layout/main_calculator.xml b/android-app-core/res/layout/main_calculator.xml
index 212851f9..6f0c7c34 100644
--- a/android-app-core/res/layout/main_calculator.xml
+++ b/android-app-core/res/layout/main_calculator.xml
@@ -1,8 +1,30 @@
+
+
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
\ No newline at end of file
diff --git a/android-app-core/res/layout/main_calculator_mobile.xml b/android-app-core/res/layout/main_calculator_mobile.xml
index 212851f9..6f0c7c34 100644
--- a/android-app-core/res/layout/main_calculator_mobile.xml
+++ b/android-app-core/res/layout/main_calculator_mobile.xml
@@ -1,8 +1,30 @@
+
+
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
\ No newline at end of file
diff --git a/android-app-core/res/values-es/text_about.xml b/android-app-core/res/values-es/text_about.xml
index 2e65c351..08a9f96d 100644
--- a/android-app-core/res/values-es/text_about.xml
+++ b/android-app-core/res/values-es/text_about.xml
@@ -1,14 +1,31 @@
Acerca de
- Copyright (c) 2009-2011\n\nCreado por serso aka se.solovyev
+ Copyright (c) 2009-2011\n\n
+ Creado por serso aka se.solovyev
\n\n
Este programa es Open Source:\nTodo el código fuente puede encontrarse en\n
http://github.com\n\n
diff --git a/android-app-core/res/values-es/text_functions.xml b/android-app-core/res/values-es/text_functions.xml
index e905ba7a..bc2112b4 100644
--- a/android-app-core/res/values-es/text_functions.xml
+++ b/android-app-core/res/values-es/text_functions.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-es/text_help.xml b/android-app-core/res/values-es/text_help.xml
index 776284c6..1ac3eb35 100644
--- a/android-app-core/res/values-es/text_help.xml
+++ b/android-app-core/res/values-es/text_help.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-es/text_operators.xml b/android-app-core/res/values-es/text_operators.xml
index adbf9630..1e861f83 100644
--- a/android-app-core/res/values-es/text_operators.xml
+++ b/android-app-core/res/values-es/text_operators.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-es/text_strings.xml b/android-app-core/res/values-es/text_strings.xml
index 537a88f0..952d6e37 100644
--- a/android-app-core/res/values-es/text_strings.xml
+++ b/android-app-core/res/values-es/text_strings.xml
@@ -1,9 +1,25 @@
diff --git a/android-app-core/res/values-es/text_vars.xml b/android-app-core/res/values-es/text_vars.xml
index dcc9fd21..1200a1a9 100644
--- a/android-app-core/res/values-es/text_vars.xml
+++ b/android-app-core/res/values-es/text_vars.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-it/text_about.xml b/android-app-core/res/values-it/text_about.xml
index d3999b8a..75b2259c 100644
--- a/android-app-core/res/values-it/text_about.xml
+++ b/android-app-core/res/values-it/text_about.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-it/text_functions.xml b/android-app-core/res/values-it/text_functions.xml
index 7f59d9d8..d4f523e1 100644
--- a/android-app-core/res/values-it/text_functions.xml
+++ b/android-app-core/res/values-it/text_functions.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-it/text_help.xml b/android-app-core/res/values-it/text_help.xml
index f4d3f29f..bf24ce9b 100644
--- a/android-app-core/res/values-it/text_help.xml
+++ b/android-app-core/res/values-it/text_help.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-it/text_operators.xml b/android-app-core/res/values-it/text_operators.xml
index e5f5c8de..18c74204 100644
--- a/android-app-core/res/values-it/text_operators.xml
+++ b/android-app-core/res/values-it/text_operators.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-it/text_strings.xml b/android-app-core/res/values-it/text_strings.xml
index ab84e898..31159e9c 100644
--- a/android-app-core/res/values-it/text_strings.xml
+++ b/android-app-core/res/values-it/text_strings.xml
@@ -1,9 +1,25 @@
diff --git a/android-app-core/res/values-it/text_vars.xml b/android-app-core/res/values-it/text_vars.xml
index a28135b6..6bc5f197 100644
--- a/android-app-core/res/values-it/text_vars.xml
+++ b/android-app-core/res/values-it/text_vars.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-ru/text_about.xml b/android-app-core/res/values-ru/text_about.xml
index 98bee277..bf97e72c 100644
--- a/android-app-core/res/values-ru/text_about.xml
+++ b/android-app-core/res/values-ru/text_about.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-ru/text_functions.xml b/android-app-core/res/values-ru/text_functions.xml
index 8a2d5f55..4ae91114 100644
--- a/android-app-core/res/values-ru/text_functions.xml
+++ b/android-app-core/res/values-ru/text_functions.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-ru/text_help.xml b/android-app-core/res/values-ru/text_help.xml
index 98b9165a..8395c324 100644
--- a/android-app-core/res/values-ru/text_help.xml
+++ b/android-app-core/res/values-ru/text_help.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-ru/text_operators.xml b/android-app-core/res/values-ru/text_operators.xml
index b251a4e4..cf7fb303 100644
--- a/android-app-core/res/values-ru/text_operators.xml
+++ b/android-app-core/res/values-ru/text_operators.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-ru/text_preferences.xml b/android-app-core/res/values-ru/text_preferences.xml
index c86a4986..3558142b 100644
--- a/android-app-core/res/values-ru/text_preferences.xml
+++ b/android-app-core/res/values-ru/text_preferences.xml
@@ -1,3 +1,25 @@
+
+
Переключатель автоматического поворота экрана
Если включено, то калькулятор будет автоматически менять ориентацию
diff --git a/android-app-core/res/values-ru/text_strings.xml b/android-app-core/res/values-ru/text_strings.xml
index 7f2b1e3e..4c84dfb5 100644
--- a/android-app-core/res/values-ru/text_strings.xml
+++ b/android-app-core/res/values-ru/text_strings.xml
@@ -1,9 +1,25 @@
diff --git a/android-app-core/res/values-ru/text_vars.xml b/android-app-core/res/values-ru/text_vars.xml
index 31219fc1..d4ca27ff 100644
--- a/android-app-core/res/values-ru/text_vars.xml
+++ b/android-app-core/res/values-ru/text_vars.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-uk/text_about.xml b/android-app-core/res/values-uk/text_about.xml
index 4739f53a..57ee9570 100644
--- a/android-app-core/res/values-uk/text_about.xml
+++ b/android-app-core/res/values-uk/text_about.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-uk/text_functions.xml b/android-app-core/res/values-uk/text_functions.xml
index 75aa867b..5165bf24 100644
--- a/android-app-core/res/values-uk/text_functions.xml
+++ b/android-app-core/res/values-uk/text_functions.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-uk/text_help.xml b/android-app-core/res/values-uk/text_help.xml
index 51b02729..1a7eb379 100644
--- a/android-app-core/res/values-uk/text_help.xml
+++ b/android-app-core/res/values-uk/text_help.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-uk/text_operators.xml b/android-app-core/res/values-uk/text_operators.xml
index 6972035d..8f94ebb4 100644
--- a/android-app-core/res/values-uk/text_operators.xml
+++ b/android-app-core/res/values-uk/text_operators.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-uk/text_preferences.xml b/android-app-core/res/values-uk/text_preferences.xml
index f6f2a905..4e58e57c 100644
--- a/android-app-core/res/values-uk/text_preferences.xml
+++ b/android-app-core/res/values-uk/text_preferences.xml
@@ -1,3 +1,25 @@
+
+
Перемикач автоматичного повороту екрану
Якщо включено, то калькулятор будет автоматично міняти орієнтацію екрану
diff --git a/android-app-core/res/values-uk/text_strings.xml b/android-app-core/res/values-uk/text_strings.xml
index ca9da921..7d0325c9 100644
--- a/android-app-core/res/values-uk/text_strings.xml
+++ b/android-app-core/res/values-uk/text_strings.xml
@@ -1,9 +1,25 @@
diff --git a/android-app-core/res/values-uk/text_vars.xml b/android-app-core/res/values-uk/text_vars.xml
index 11793cf5..c8df59e5 100644
--- a/android-app-core/res/values-uk/text_vars.xml
+++ b/android-app-core/res/values-uk/text_vars.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-zh-rtw/text_about.xml b/android-app-core/res/values-zh-rtw/text_about.xml
index 3a2e4a4e..6d995bb5 100644
--- a/android-app-core/res/values-zh-rtw/text_about.xml
+++ b/android-app-core/res/values-zh-rtw/text_about.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-zh-rtw/text_functions.xml b/android-app-core/res/values-zh-rtw/text_functions.xml
index 44a3a8cc..484c35e7 100644
--- a/android-app-core/res/values-zh-rtw/text_functions.xml
+++ b/android-app-core/res/values-zh-rtw/text_functions.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-zh-rtw/text_help.xml b/android-app-core/res/values-zh-rtw/text_help.xml
index 21423df9..2099b0d6 100644
--- a/android-app-core/res/values-zh-rtw/text_help.xml
+++ b/android-app-core/res/values-zh-rtw/text_help.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-zh-rtw/text_operators.xml b/android-app-core/res/values-zh-rtw/text_operators.xml
index 270fb9f5..660cb402 100644
--- a/android-app-core/res/values-zh-rtw/text_operators.xml
+++ b/android-app-core/res/values-zh-rtw/text_operators.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values-zh-rtw/text_preferences.xml b/android-app-core/res/values-zh-rtw/text_preferences.xml
index ce9e0bcb..9465d273 100644
--- a/android-app-core/res/values-zh-rtw/text_preferences.xml
+++ b/android-app-core/res/values-zh-rtw/text_preferences.xml
@@ -1,3 +1,25 @@
+
+
自動切換螢幕方向
是否自動切換螢幕顯示的方向
diff --git a/android-app-core/res/values-zh-rtw/text_strings.xml b/android-app-core/res/values-zh-rtw/text_strings.xml
index 9bfb51f8..eb1956cc 100644
--- a/android-app-core/res/values-zh-rtw/text_strings.xml
+++ b/android-app-core/res/values-zh-rtw/text_strings.xml
@@ -1,9 +1,25 @@
diff --git a/android-app-core/res/values-zh-rtw/text_vars.xml b/android-app-core/res/values-zh-rtw/text_vars.xml
index 18de2b5e..11d09bc7 100644
--- a/android-app-core/res/values-zh-rtw/text_vars.xml
+++ b/android-app-core/res/values-zh-rtw/text_vars.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values/arrays.xml b/android-app-core/res/values/arrays.xml
index f2fe1ba6..6fc1d59c 100644
--- a/android-app-core/res/values/arrays.xml
+++ b/android-app-core/res/values/arrays.xml
@@ -1,4 +1,26 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android-app-core/res/values/colors.xml b/android-app-core/res/values/colors.xml
index 8c584dfb..e7fed57d 100644
--- a/android-app-core/res/values/colors.xml
+++ b/android-app-core/res/values/colors.xml
@@ -1,4 +1,26 @@
+
+
#ff2e2e2e
#ffffffff
diff --git a/android-app-core/res/values/dimens.xml b/android-app-core/res/values/dimens.xml
index 42ef792d..96f59461 100644
--- a/android-app-core/res/values/dimens.xml
+++ b/android-app-core/res/values/dimens.xml
@@ -1,3 +1,25 @@
+
+
20sp
0.5dp
diff --git a/android-app-core/res/values/ids.xml b/android-app-core/res/values/ids.xml
index a6cfdbd7..f8c84de6 100644
--- a/android-app-core/res/values/ids.xml
+++ b/android-app-core/res/values/ids.xml
@@ -1,37 +1,59 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app-core/res/values/preferences.xml b/android-app-core/res/values/preferences.xml
index 8e3be996..fbfec9ae 100644
--- a/android-app-core/res/values/preferences.xml
+++ b/android-app-core/res/values/preferences.xml
@@ -1,4 +1,26 @@
+
+
org.solovyev.android.calculator.CalculatorModel_functions
org.solovyev.android.calculator.CalculatorModel_vars
diff --git a/android-app-core/res/values/styles.xml b/android-app-core/res/values/styles.xml
index f2b125d8..cc5ab903 100644
--- a/android-app-core/res/values/styles.xml
+++ b/android-app-core/res/values/styles.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values/text_about.xml b/android-app-core/res/values/text_about.xml
index 52705a92..efa09c6c 100644
--- a/android-app-core/res/values/text_about.xml
+++ b/android-app-core/res/values/text_about.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values/text_functions.xml b/android-app-core/res/values/text_functions.xml
index f863c54b..0f36328a 100644
--- a/android-app-core/res/values/text_functions.xml
+++ b/android-app-core/res/values/text_functions.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values/text_help.xml b/android-app-core/res/values/text_help.xml
index e14b5631..dfb65304 100644
--- a/android-app-core/res/values/text_help.xml
+++ b/android-app-core/res/values/text_help.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values/text_operators.xml b/android-app-core/res/values/text_operators.xml
index 2938c6dd..a3c6d968 100644
--- a/android-app-core/res/values/text_operators.xml
+++ b/android-app-core/res/values/text_operators.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values/text_preferences.xml b/android-app-core/res/values/text_preferences.xml
index 1f6fb1e7..ce5c34da 100644
--- a/android-app-core/res/values/text_preferences.xml
+++ b/android-app-core/res/values/text_preferences.xml
@@ -1,3 +1,25 @@
+
+
Toggle screen orientation change
If turned on calculator will change screen orientation automatically
@@ -22,5 +44,6 @@
Prevent screen from fading
- If turned on screen will not fade while using the app
+ If turned on screen will not fade while using the app
+
\ No newline at end of file
diff --git a/android-app-core/res/values/text_strings.xml b/android-app-core/res/values/text_strings.xml
index 7e0655aa..8e2be8f6 100644
--- a/android-app-core/res/values/text_strings.xml
+++ b/android-app-core/res/values/text_strings.xml
@@ -1,9 +1,25 @@
diff --git a/android-app-core/res/values/text_vars.xml b/android-app-core/res/values/text_vars.xml
index 5dd84d6b..fb3c8278 100644
--- a/android-app-core/res/values/text_vars.xml
+++ b/android-app-core/res/values/text_vars.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values/text_wizard.xml b/android-app-core/res/values/text_wizard.xml
index 2debb5dd..e2f3e486 100644
--- a/android-app-core/res/values/text_wizard.xml
+++ b/android-app-core/res/values/text_wizard.xml
@@ -1,20 +1,40 @@
Optimized
Big buttons
Simple
- In simple mode only basic functionality will be available from the main screen.
- Result is rounded up to 5 digits.
+ In simple mode only basic functionality will be available from the
+ main screen.
+ Result is rounded up to 5 digits.
+
Engineer
- In engineer mode special functions will be used on the main screen.
- Result is is not rounded and is presented in engineer notation.
+ In engineer mode special functions will be used on the main
+ screen.
+ Result is is not rounded and is presented in engineer notation.
+
Start wizard
Excellent! Tap button one more time to try again
diff --git a/android-app-core/res/values/theme_gray.xml b/android-app-core/res/values/theme_gray.xml
index 55bdb2ee..a203bf86 100644
--- a/android-app-core/res/values/theme_gray.xml
+++ b/android-app-core/res/values/theme_gray.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values/theme_light_blue.xml b/android-app-core/res/values/theme_light_blue.xml
index 118fb58c..60f3dedb 100644
--- a/android-app-core/res/values/theme_light_blue.xml
+++ b/android-app-core/res/values/theme_light_blue.xml
@@ -1,7 +1,23 @@
diff --git a/android-app-core/res/values/theme_metro_blue.xml b/android-app-core/res/values/theme_metro_blue.xml
index bf471644..2e446477 100644
--- a/android-app-core/res/values/theme_metro_blue.xml
+++ b/android-app-core/res/values/theme_metro_blue.xml
@@ -1,3 +1,25 @@
+
+