Move zero back in the middle + E to 6

app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java

@@ -95,7 +95,7 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
         addButton(row, 0, "1");
         addButton(row, 0, "2");
         addButton(row, 0, "3");
-        addButton(row, 0, "0").setText(up, "00").setText(down, "000");
+        addButton(row, 0, "0").setText(up, "000").setText(down, "00");
         addButton(row, 0, ".").setText(up, ",");
         addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
     }
@@ -133,9 +133,9 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
         addImageButton(row, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_white_24dp);
 
         row = makeRow();
-        addButton(row, 0, "0").setText(up, "00").setText(down, "000");
-        addButton(row, 0, ".").setText(up, ",");
         addButton(row, R.id.cpp_kb_button_brackets, "( )").setText(up, "(").setText(down, ")");
+        addButton(row, 0, "0").setText(up, "000").setText(down, "00");
+        addButton(row, 0, ".").setText(up, ",");
         addOperationButton(row, R.id.cpp_kb_button_plus, "+");
         addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
     }

app/src/main/java/org/solovyev/android/calculator/keyboard/KeyboardUi.java

@@ -161,13 +161,12 @@ public class KeyboardUi extends BaseKeyboardUi {
             hideText(button3, down);
             hideText(button4, down);
             hideText(button5, down);
+            hideText(button6, up);
             hideText(button7, left, up, down);
             hideText(button8, left, up, down);
             hideText(button9, left);
             hideText(multiplicationButton, left);
-            hideText(plusButton, up, down);
+            hideText(plusButton, up);
-            hideText(copyButton, left, up, down);
-            hideText(pasteButton, left, up, down);
             hideText(functionsButton, up, down);
         }
         multiplicationButton.setText(engine.getMultiplicationSign());

app/src/main/res/layout/cpp_app_button_0.xml

@@ -29,6 +29,6 @@
     a:id="@id/cpp_button_0"
     style="?attr/cpp_button_style_digit"
     a:text="0"
-    c:directionTextDown="000"
+    c:directionTextDown="00"
-    c:directionTextUp="00"
+    c:directionTextUp="000"
     tools:ignore="HardcodedText" />

app/src/main/res/layout/cpp_app_button_6.xml

@@ -29,5 +29,6 @@
     a:id="@id/cpp_button_6"
     style="?attr/cpp_button_style_digit"
     a:text="6"
+    c:directionTextUp="E"
     c:directionTextLeft="F"
     tools:ignore="HardcodedText" />

app/src/main/res/layout/cpp_app_button_plus.xml

@@ -28,6 +28,5 @@
     a:id="@id/cpp_button_plus"
     style="?attr/cpp_button_style_operation"
     a:text="+"
-    c:directionTextDown="E"
     c:directionTextUp="°"
     tools:ignore="HardcodedText" />

app/src/main/res/layout/cpp_app_keyboard.xml

@@ -102,12 +102,12 @@
         a:layout_height="0dp"
         a:layout_weight="1">
 
+        <include layout="@layout/cpp_app_button_round_brackets" />
+
         <include layout="@layout/cpp_app_button_0" />
 
         <include layout="@layout/cpp_app_button_dot" />
 
-        <include layout="@layout/cpp_app_button_round_brackets" />
-
         <include layout="@layout/cpp_app_button_plus" />
 
         <include layout="@layout/cpp_app_button_history" />

app/src/main/res/layout/onscreen_layout.xml

@@ -42,7 +42,7 @@
         </LinearLayout>
 
         <include
-            layout="@layout/widget_keyboard"
+            layout="@layout/simple_keyboard"
             a:layout_width="match_parent"
             a:layout_height="0dp"
             a:layout_weight="5" />

app/src/main/res/layout/onscreen_layout_material.xml

@@ -43,7 +43,7 @@
         </LinearLayout>
 
         <include
-            layout="@layout/widget_keyboard_material"
+            layout="@layout/simple_keyboard_material"
             a:layout_width="match_parent"
             a:layout_height="0dp"
             a:layout_weight="5" />

app/src/main/res/layout/onscreen_layout_material_light.xml

@@ -42,7 +42,7 @@
         </LinearLayout>
 
         <include
-            layout="@layout/widget_keyboard_material_light"
+            layout="@layout/simple_keyboard_material_light"
             a:layout_width="match_parent"
             a:layout_height="0dp"
             a:layout_weight="5" />

app/src/main/res/layout/simple_keyboard.xml

@@ -110,12 +110,12 @@
 
         <include layout="@layout/cpp_simple_button_power" />
 
+        <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_round_brackets" />
-
         <include layout="@layout/cpp_simple_button_plus" />
 
         <include layout="@layout/cpp_simple_button_history" />

app/src/main/res/layout/simple_keyboard_material.xml

@@ -111,12 +111,12 @@ e for the specific language governing permissions and
 
         <include layout="@layout/cpp_simple_button_power_material" />
 
+        <include layout="@layout/cpp_simple_button_round_brackets_material" />
+
         <include layout="@layout/cpp_simple_button_0_material" />
 
         <include layout="@layout/cpp_simple_button_dot_material" />
 
-        <include layout="@layout/cpp_simple_button_round_brackets_material" />
-
         <include layout="@layout/cpp_simple_button_plus_material" />
 
         <include layout="@layout/cpp_simple_button_history_material" />

app/src/main/res/layout/simple_keyboard_material_light.xml

@@ -111,12 +111,12 @@ e for the specific language governing permissions and
 
         <include layout="@layout/cpp_simple_button_power_material_light" />
 
+        <include layout="@layout/cpp_simple_button_round_brackets_material_light" />
+
         <include layout="@layout/cpp_simple_button_0_material_light" />
 
         <include layout="@layout/cpp_simple_button_dot_material_light" />
 
-        <include layout="@layout/cpp_simple_button_round_brackets_material_light" />
-
         <include layout="@layout/cpp_simple_button_plus_material_light" />
 
         <include layout="@layout/cpp_simple_button_history_material_light" />

app/src/main/res/layout/widget_layout.xml

@@ -36,7 +36,7 @@
     </LinearLayout>
 
     <include
-        layout="@layout/widget_keyboard"
+        layout="@layout/simple_keyboard"
         a:layout_width="match_parent"
         a:layout_height="0dp"
         a:layout_weight="5" />

app/src/main/res/layout/widget_layout_material.xml

@@ -36,7 +36,7 @@
     </LinearLayout>
 
     <include
-        layout="@layout/widget_keyboard_material"
+        layout="@layout/simple_keyboard_material"
         a:layout_width="match_parent"
         a:layout_height="0dp"
         a:layout_weight="5" />

app/src/main/res/layout/widget_layout_material_light.xml

@@ -36,7 +36,7 @@
     </LinearLayout>
 
     <include
-        layout="@layout/widget_keyboard_material_light"
+        layout="@layout/simple_keyboard_material_light"
         a:layout_width="match_parent"
         a:layout_height="0dp"
         a:layout_weight="5" />