changes

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

@@ -9,12 +9,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_seven_digit_button"/>
-        <include layout="@layout/cpp_simple_eight_digit_button"/>
-        <include layout="@layout/cpp_simple_nine_digit_button"/>
-        <include layout="@layout/cpp_simple_multiplication_button"/>
-        <include layout="@layout/cpp_simple_percent_button"/>
-        <include layout="@layout/cpp_simple_clear_button"/>
+        <include layout="@layout/cpp_simple_button_7"/>
+        <include layout="@layout/cpp_simple_button_8"/>
+        <include layout="@layout/cpp_simple_button_9"/>
+        <include layout="@layout/cpp_simple_button_multiplication"/>
+        <include layout="@layout/cpp_simple_button_percent"/>
+        <include layout="@layout/cpp_simple_button_clear"/>
 
     </LinearLayout>
 
@@ -22,12 +22,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_four_digit_button"/>
-        <include layout="@layout/cpp_simple_five_digit_button"/>
-        <include layout="@layout/cpp_simple_six_digit_button"/>
-        <include layout="@layout/cpp_simple_division_button"/>
-        <include layout="@layout/cpp_simple_power_button"/>
-        <include layout="@layout/cpp_simple_erase_button"/>
+        <include layout="@layout/cpp_simple_button_4"/>
+        <include layout="@layout/cpp_simple_button_5"/>
+        <include layout="@layout/cpp_simple_button_6"/>
+        <include layout="@layout/cpp_simple_button_division"/>
+        <include layout="@layout/cpp_simple_button_power"/>
+        <include layout="@layout/cpp_simple_button_erase"/>
 
     </LinearLayout>
 
@@ -35,12 +35,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_one_digit_button"/>
-        <include layout="@layout/cpp_simple_two_digit_button"/>
-        <include layout="@layout/cpp_simple_three_digit_button"/>
-        <include layout="@layout/cpp_simple_plus_button"/>
-        <include layout="@layout/cpp_simple_like_button"/>
-        <include layout="@layout/cpp_simple_copy_button"/>
+        <include layout="@layout/cpp_simple_button_1"/>
+        <include layout="@layout/cpp_simple_button_2"/>
+        <include layout="@layout/cpp_simple_button_3"/>
+        <include layout="@layout/cpp_simple_button_plus"/>
+        <include layout="@layout/cpp_simple_button_like"/>
+        <include layout="@layout/cpp_simple_button_copy"/>
 
     </LinearLayout>
 
@@ -48,12 +48,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_round_brackets_button"/>
-        <include layout="@layout/cpp_simple_zero_digit_button"/>
-        <include layout="@layout/cpp_simple_dot_button"/>
-        <include layout="@layout/cpp_simple_subtraction_button"/>
-        <include layout="@layout/cpp_simple_settings_button"/>
-        <include layout="@layout/cpp_simple_paste_button"/>
+        <include layout="@layout/cpp_simple_button_round_brackets"/>
+        <include layout="@layout/cpp_simple_button_0"/>
+        <include layout="@layout/cpp_simple_button_dot"/>
+        <include layout="@layout/cpp_simple_button_subtraction"/>
+        <include layout="@layout/cpp_simple_button_settings"/>
+        <include layout="@layout/cpp_simple_button_paste"/>
 
     </LinearLayout>
 
@@ -62,12 +62,12 @@
                   a:layout_width="match_parent"
                   a:layout_height="0dp">
 
-        <include layout="@layout/cpp_simple_left_button"/>
-        <include layout="@layout/cpp_simple_right_button"/>
-        <include layout="@layout/cpp_simple_vars_button"/>
-        <include layout="@layout/cpp_simple_functions_button"/>
-        <include layout="@layout/cpp_simple_app_button"/>
-        <include layout="@layout/cpp_simple_history_button"/>
+        <include layout="@layout/cpp_simple_button_left"/>
+        <include layout="@layout/cpp_simple_button_right"/>
+        <include layout="@layout/cpp_simple_button_vars"/>
+        <include layout="@layout/cpp_simple_button_functions"/>
+        <include layout="@layout/cpp_simple_button_app"/>
+        <include layout="@layout/cpp_simple_button_history"/>
 
     </LinearLayout>