From 7b59bcec2f59a93c62b9ab2e08234bcf13e9e27b Mon Sep 17 00:00:00 2001 From: serso Date: Sat, 2 Apr 2016 17:56:28 +0200 Subject: [PATCH] Move zero back in the middle + E to 6 --- .../android/calculator/FloatingCalculatorKeyboard.java | 6 +++--- .../solovyev/android/calculator/keyboard/KeyboardUi.java | 5 ++--- app/src/main/res/layout/cpp_app_button_0.xml | 4 ++-- app/src/main/res/layout/cpp_app_button_6.xml | 1 + app/src/main/res/layout/cpp_app_button_plus.xml | 1 - app/src/main/res/layout/cpp_app_keyboard.xml | 4 ++-- app/src/main/res/layout/onscreen_layout.xml | 2 +- app/src/main/res/layout/onscreen_layout_material.xml | 2 +- app/src/main/res/layout/onscreen_layout_material_light.xml | 2 +- .../res/layout/{widget_keyboard.xml => simple_keyboard.xml} | 4 ++-- ...t_keyboard_material.xml => simple_keyboard_material.xml} | 4 ++-- ...aterial_light.xml => simple_keyboard_material_light.xml} | 4 ++-- app/src/main/res/layout/widget_layout.xml | 2 +- app/src/main/res/layout/widget_layout_material.xml | 2 +- app/src/main/res/layout/widget_layout_material_light.xml | 2 +- 15 files changed, 22 insertions(+), 23 deletions(-) rename app/src/main/res/layout/{widget_keyboard.xml => simple_keyboard.xml} (100%) rename app/src/main/res/layout/{widget_keyboard_material.xml => simple_keyboard_material.xml} (100%) rename app/src/main/res/layout/{widget_keyboard_material_light.xml => simple_keyboard_material_light.xml} (100%) diff --git a/app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java b/app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java index a9033767..422a3bc7 100644 --- a/app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java +++ b/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); } diff --git a/app/src/main/java/org/solovyev/android/calculator/keyboard/KeyboardUi.java b/app/src/main/java/org/solovyev/android/calculator/keyboard/KeyboardUi.java index 044a9100..735a8cba 100644 --- a/app/src/main/java/org/solovyev/android/calculator/keyboard/KeyboardUi.java +++ b/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(copyButton, left, up, down); - hideText(pasteButton, left, up, down); + hideText(plusButton, up); hideText(functionsButton, up, down); } multiplicationButton.setText(engine.getMultiplicationSign()); diff --git a/app/src/main/res/layout/cpp_app_button_0.xml b/app/src/main/res/layout/cpp_app_button_0.xml index d4c8b543..070151ea 100644 --- a/app/src/main/res/layout/cpp_app_button_0.xml +++ b/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:directionTextUp="00" + c:directionTextDown="00" + c:directionTextUp="000" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_6.xml b/app/src/main/res/layout/cpp_app_button_6.xml index de56b116..cb0768a0 100644 --- a/app/src/main/res/layout/cpp_app_button_6.xml +++ b/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" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_plus.xml b/app/src/main/res/layout/cpp_app_button_plus.xml index b0c8bea8..99fccc8c 100644 --- a/app/src/main/res/layout/cpp_app_button_plus.xml +++ b/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" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_keyboard.xml b/app/src/main/res/layout/cpp_app_keyboard.xml index f0b54318..533c6fa3 100644 --- a/app/src/main/res/layout/cpp_app_keyboard.xml +++ b/app/src/main/res/layout/cpp_app_keyboard.xml @@ -102,12 +102,12 @@ a:layout_height="0dp" a:layout_weight="1"> + + - - diff --git a/app/src/main/res/layout/onscreen_layout.xml b/app/src/main/res/layout/onscreen_layout.xml index 513b64d4..848e7e23 100644 --- a/app/src/main/res/layout/onscreen_layout.xml +++ b/app/src/main/res/layout/onscreen_layout.xml @@ -42,7 +42,7 @@ diff --git a/app/src/main/res/layout/onscreen_layout_material.xml b/app/src/main/res/layout/onscreen_layout_material.xml index d49c831e..83fb39f1 100644 --- a/app/src/main/res/layout/onscreen_layout_material.xml +++ b/app/src/main/res/layout/onscreen_layout_material.xml @@ -43,7 +43,7 @@ diff --git a/app/src/main/res/layout/onscreen_layout_material_light.xml b/app/src/main/res/layout/onscreen_layout_material_light.xml index 45a8a1de..e8634fc3 100644 --- a/app/src/main/res/layout/onscreen_layout_material_light.xml +++ b/app/src/main/res/layout/onscreen_layout_material_light.xml @@ -42,7 +42,7 @@ diff --git a/app/src/main/res/layout/widget_keyboard.xml b/app/src/main/res/layout/simple_keyboard.xml similarity index 100% rename from app/src/main/res/layout/widget_keyboard.xml rename to app/src/main/res/layout/simple_keyboard.xml index c7b7734e..4d70efdc 100644 --- a/app/src/main/res/layout/widget_keyboard.xml +++ b/app/src/main/res/layout/simple_keyboard.xml @@ -110,12 +110,12 @@ + + - - diff --git a/app/src/main/res/layout/widget_keyboard_material.xml b/app/src/main/res/layout/simple_keyboard_material.xml similarity index 100% rename from app/src/main/res/layout/widget_keyboard_material.xml rename to app/src/main/res/layout/simple_keyboard_material.xml index a6852bf8..33cf9550 100644 --- a/app/src/main/res/layout/widget_keyboard_material.xml +++ b/app/src/main/res/layout/simple_keyboard_material.xml @@ -111,12 +111,12 @@ e for the specific language governing permissions and + + - - diff --git a/app/src/main/res/layout/widget_keyboard_material_light.xml b/app/src/main/res/layout/simple_keyboard_material_light.xml similarity index 100% rename from app/src/main/res/layout/widget_keyboard_material_light.xml rename to app/src/main/res/layout/simple_keyboard_material_light.xml index 445c9d70..a736401e 100644 --- a/app/src/main/res/layout/widget_keyboard_material_light.xml +++ b/app/src/main/res/layout/simple_keyboard_material_light.xml @@ -111,12 +111,12 @@ e for the specific language governing permissions and + + - - diff --git a/app/src/main/res/layout/widget_layout.xml b/app/src/main/res/layout/widget_layout.xml index 3cb00041..82af84ae 100644 --- a/app/src/main/res/layout/widget_layout.xml +++ b/app/src/main/res/layout/widget_layout.xml @@ -36,7 +36,7 @@ diff --git a/app/src/main/res/layout/widget_layout_material.xml b/app/src/main/res/layout/widget_layout_material.xml index a5100334..84d7443e 100644 --- a/app/src/main/res/layout/widget_layout_material.xml +++ b/app/src/main/res/layout/widget_layout_material.xml @@ -36,7 +36,7 @@ diff --git a/app/src/main/res/layout/widget_layout_material_light.xml b/app/src/main/res/layout/widget_layout_material_light.xml index 05e66d84..993216ca 100644 --- a/app/src/main/res/layout/widget_layout_material_light.xml +++ b/app/src/main/res/layout/widget_layout_material_light.xml @@ -36,7 +36,7 @@