changes

android-app-core/res/layout/cpp_simple_app_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/appButton"
+        a:id="@id/cpp_button_app"
         a:src="@drawable/kb_logo"
         style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="App"/>

android-app-core/res/layout/cpp_simple_clear_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/clearButton"
+        a:id="@id/cpp_button_clear"
         a:text="@string/c_clear"
         a:textStyle="bold"
         style="@style/cpp_simple_metro_control_button_style"/>

android-app-core/res/layout/cpp_simple_copy_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/copyButton"
+        a:id="@id/cpp_button_copy"
         a:src="@drawable/kb_copy"
         style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Copy"/>

android-app-core/res/layout/cpp_simple_division_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/divisionButton"
+        a:id="@id/cpp_button_division"
         a:text="/"
         style="@style/cpp_simple_metro_blue_operation_button_style"/>

android-app-core/res/layout/cpp_simple_dot_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/periodButton"
+        a:id="@id/cpp_button_period"
         a:text="."
         style="@style/metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_eight_digit_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/eightDigitButton"
+        a:id="@id/cpp_button_8"
         a:text="8"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_equals_button.xml

@@ -7,6 +7,6 @@
   -->
 <Button
         xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/equalsButton"
+        a:id="@id/cpp_button_equals"
         a:text="="
         style="@style/cpp_simple_metro_control_button_style"/>

android-app-core/res/layout/cpp_simple_erase_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/eraseButton"
+        a:id="@id/cpp_button_erase"
         a:src="@drawable/kb_delete"
         style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Erase"/>

android-app-core/res/layout/cpp_simple_five_digit_button.xml

@@ -6,6 +6,6 @@
   ~ or visit http://se.solovyev.org
   -->
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/fiveDigitButton"
+        a:id="@id/cpp_button_5"
         a:text="5"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_four_digit_button.xml

@@ -6,6 +6,6 @@
   ~ or visit http://se.solovyev.org
   -->
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/fourDigitButton"
+        a:id="@id/cpp_button_4"
         a:text="4"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_functions_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/functions_button"
+        a:id="@id/cpp_button_functions"
         a:text="ƒ(x)"
         a:textStyle="italic"
         style="@style/cpp_simple_metro_control_button_style"/>

android-app-core/res/layout/cpp_simple_history_button.xml

@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/historyButton"
+        a:id="@id/cpp_button_history"
         a:text="@string/c_history_button"
         style="@style/cpp_simple_metro_control_button_style"
         a:textStyle="bold"/>

android-app-core/res/layout/cpp_simple_left_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/leftButton"
+        a:id="@id/cpp_button_left"
         a:text="◀"
         style="@style/cpp_simple_metro_control_button_style"/>

android-app-core/res/layout/cpp_simple_like_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/likeButton"
+        a:id="@id/cpp_button_like"
         a:src="@drawable/kb_facebook"
         style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Like"/>

android-app-core/res/layout/cpp_simple_multiplication_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/multiplicationButton"
+        a:id="@id/cpp_button_multiplication"
         a:text="×"
         style="@style/cpp_simple_metro_blue_operation_button_style"/>

android-app-core/res/layout/cpp_simple_nine_digit_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/nineDigitButton"
+        a:id="@id/cpp_button_9"
         a:text="9"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_one_digit_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/oneDigitButton"
+        a:id="@id/cpp_button_1"
         a:text="1"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_paste_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/pasteButton"
+        a:id="@id/cpp_button_paste"
         a:src="@drawable/kb_paste"
         style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Paste"/>

android-app-core/res/layout/cpp_simple_percent_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/percentButton"
+        a:id="@id/cpp_button_percent"
         a:text="%"
         style="@style/cpp_simple_metro_blue_operation_button_style"/>

android-app-core/res/layout/cpp_simple_plus_button.xml

@@ -6,6 +6,6 @@
   ~ or visit http://se.solovyev.org
   -->
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/plusButton"
+        a:id="@id/cpp_button_plus"
         a:text="+"
         style="@style/cpp_simple_metro_blue_operation_button_style"/>

android-app-core/res/layout/cpp_simple_power_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/powerButton"
+        a:id="@id/cpp_button_power"
         a:text="^"
         style="@style/cpp_simple_metro_blue_operation_button_style"/>

android-app-core/res/layout/cpp_simple_right_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/rightButton"
+        a:id="@id/cpp_button_right"
         a:text="▶"
         style="@style/cpp_simple_metro_control_button_style"/>

android-app-core/res/layout/cpp_simple_round_brackets_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/roundBracketsButton"
+        a:id="@id/cpp_button_round_brackets"
         a:text="()"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_settings_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/settingsButton"
+        a:id="@id/cpp_button_settings"
         a:src="@drawable/kb_settings"
         style="@style/cpp_simple_metro_control_image_button_style"
         a:contentDescription="Settings"/>

android-app-core/res/layout/cpp_simple_seven_digit_button.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/sevenDigitButton"
+        a:id="@id/cpp_button_7"
         a:text="7"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_six_digit_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/sixDigitButton"
+        a:id="@id/cpp_button_6"
         a:text="6"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_subtraction_button.xml

@@ -6,6 +6,6 @@
   ~ or visit http://se.solovyev.org
   -->
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/subtractionButton"
+        a:id="@id/cpp_button_subtraction"
         a:text="-"
         style="@style/cpp_simple_metro_blue_operation_button_style"/>

android-app-core/res/layout/cpp_simple_three_digit_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/threeDigitButton"
+        a:id="@id/cpp_button_3"
         a:text="3"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_two_digit_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/twoDigitButton"
+        a:id="@id/cpp_button_2"
         a:text="2"
         style="@style/cpp_simple_metro_digit_button_style"/>

android-app-core/res/layout/cpp_simple_vars_button.xml

@@ -7,7 +7,7 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/vars_button"
+        a:id="@id/cpp_button_vars"
         a:text="π,…"
         a:textStyle="italic"
         style="@style/cpp_simple_metro_control_button_style"/>

android-app-core/res/layout/cpp_simple_zero_digit_button.xml

@@ -7,6 +7,6 @@
   -->
 
 <Button xmlns:a="http://schemas.android.com/apk/res/android"
-        a:id="@+id/zeroDigitButton"
+        a:id="@id/cpp_button_0"
         a:text="0"
         style="@style/cpp_simple_metro_digit_button_style"/>