Move zero back in the middle + E to 6
This commit is contained in:
parent
1a31c5a053
commit
7b59bcec2f
@ -95,7 +95,7 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
|
|||||||
addButton(row, 0, "1");
|
addButton(row, 0, "1");
|
||||||
addButton(row, 0, "2");
|
addButton(row, 0, "2");
|
||||||
addButton(row, 0, "3");
|
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, ",");
|
addButton(row, 0, ".").setText(up, ",");
|
||||||
addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
|
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);
|
addImageButton(row, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_white_24dp);
|
||||||
|
|
||||||
row = makeRow();
|
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, 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, "+");
|
addOperationButton(row, R.id.cpp_kb_button_plus, "+");
|
||||||
addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
|
addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
|
||||||
}
|
}
|
||||||
|
@ -161,13 +161,12 @@ public class KeyboardUi extends BaseKeyboardUi {
|
|||||||
hideText(button3, down);
|
hideText(button3, down);
|
||||||
hideText(button4, down);
|
hideText(button4, down);
|
||||||
hideText(button5, down);
|
hideText(button5, down);
|
||||||
|
hideText(button6, up);
|
||||||
hideText(button7, left, up, down);
|
hideText(button7, left, up, down);
|
||||||
hideText(button8, left, up, down);
|
hideText(button8, left, up, down);
|
||||||
hideText(button9, left);
|
hideText(button9, left);
|
||||||
hideText(multiplicationButton, 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);
|
hideText(functionsButton, up, down);
|
||||||
}
|
}
|
||||||
multiplicationButton.setText(engine.getMultiplicationSign());
|
multiplicationButton.setText(engine.getMultiplicationSign());
|
||||||
|
@ -29,6 +29,6 @@
|
|||||||
a:id="@id/cpp_button_0"
|
a:id="@id/cpp_button_0"
|
||||||
style="?attr/cpp_button_style_digit"
|
style="?attr/cpp_button_style_digit"
|
||||||
a:text="0"
|
a:text="0"
|
||||||
c:directionTextDown="000"
|
c:directionTextDown="00"
|
||||||
c:directionTextUp="00"
|
c:directionTextUp="000"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
@ -29,5 +29,6 @@
|
|||||||
a:id="@id/cpp_button_6"
|
a:id="@id/cpp_button_6"
|
||||||
style="?attr/cpp_button_style_digit"
|
style="?attr/cpp_button_style_digit"
|
||||||
a:text="6"
|
a:text="6"
|
||||||
|
c:directionTextUp="E"
|
||||||
c:directionTextLeft="F"
|
c:directionTextLeft="F"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
@ -28,6 +28,5 @@
|
|||||||
a:id="@id/cpp_button_plus"
|
a:id="@id/cpp_button_plus"
|
||||||
style="?attr/cpp_button_style_operation"
|
style="?attr/cpp_button_style_operation"
|
||||||
a:text="+"
|
a:text="+"
|
||||||
c:directionTextDown="E"
|
|
||||||
c:directionTextUp="°"
|
c:directionTextUp="°"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
@ -102,12 +102,12 @@
|
|||||||
a:layout_height="0dp"
|
a:layout_height="0dp"
|
||||||
a:layout_weight="1">
|
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_0" />
|
||||||
|
|
||||||
<include layout="@layout/cpp_app_button_dot" />
|
<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_plus" />
|
||||||
|
|
||||||
<include layout="@layout/cpp_app_button_history" />
|
<include layout="@layout/cpp_app_button_history" />
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/widget_keyboard"
|
layout="@layout/simple_keyboard"
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
a:layout_height="0dp"
|
a:layout_height="0dp"
|
||||||
a:layout_weight="5" />
|
a:layout_weight="5" />
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/widget_keyboard_material"
|
layout="@layout/simple_keyboard_material"
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
a:layout_height="0dp"
|
a:layout_height="0dp"
|
||||||
a:layout_weight="5" />
|
a:layout_weight="5" />
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/widget_keyboard_material_light"
|
layout="@layout/simple_keyboard_material_light"
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
a:layout_height="0dp"
|
a:layout_height="0dp"
|
||||||
a:layout_weight="5" />
|
a:layout_weight="5" />
|
||||||
|
@ -110,12 +110,12 @@
|
|||||||
|
|
||||||
<include layout="@layout/cpp_simple_button_power" />
|
<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_0" />
|
||||||
|
|
||||||
<include layout="@layout/cpp_simple_button_dot" />
|
<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_plus" />
|
||||||
|
|
||||||
<include layout="@layout/cpp_simple_button_history" />
|
<include layout="@layout/cpp_simple_button_history" />
|
@ -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_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_0_material" />
|
||||||
|
|
||||||
<include layout="@layout/cpp_simple_button_dot_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_plus_material" />
|
||||||
|
|
||||||
<include layout="@layout/cpp_simple_button_history_material" />
|
<include layout="@layout/cpp_simple_button_history_material" />
|
@ -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_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_0_material_light" />
|
||||||
|
|
||||||
<include layout="@layout/cpp_simple_button_dot_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_plus_material_light" />
|
||||||
|
|
||||||
<include layout="@layout/cpp_simple_button_history_material_light" />
|
<include layout="@layout/cpp_simple_button_history_material_light" />
|
@ -36,7 +36,7 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/widget_keyboard"
|
layout="@layout/simple_keyboard"
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
a:layout_height="0dp"
|
a:layout_height="0dp"
|
||||||
a:layout_weight="5" />
|
a:layout_weight="5" />
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/widget_keyboard_material"
|
layout="@layout/simple_keyboard_material"
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
a:layout_height="0dp"
|
a:layout_height="0dp"
|
||||||
a:layout_weight="5" />
|
a:layout_weight="5" />
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<include
|
<include
|
||||||
layout="@layout/widget_keyboard_material_light"
|
layout="@layout/simple_keyboard_material_light"
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
a:layout_height="0dp"
|
a:layout_height="0dp"
|
||||||
a:layout_weight="5" />
|
a:layout_weight="5" />
|
||||||
|
Loading…
Reference in New Issue
Block a user