TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move zero back in the middle + E to 6

Browse Source
This commit is contained in:
serso 2016-04-02 17:56:28 +02:00
parent 1a31c5a053
commit 7b59bcec2f
15 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java
View File

@ -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);
}

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

@ -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());

4
app/src/main/res/layout/cpp_app_button_0.xml
View File

@ -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" />

1
app/src/main/res/layout/cpp_app_button_6.xml
View File

@ -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" />

1
app/src/main/res/layout/cpp_app_button_plus.xml
View File

@ -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" />

4
app/src/main/res/layout/cpp_app_keyboard.xml
View File

@ -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" />

2
app/src/main/res/layout/onscreen_layout.xml
View File

@ -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" />

2
app/src/main/res/layout/onscreen_layout_material.xml
View File

@ -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" />

2
app/src/main/res/layout/onscreen_layout_material_light.xml
View File

@ -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" />

4
app/src/main/res/layout/widget_keyboard.xml → app/src/main/res/layout/simple_keyboard.xml
View File

@ -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" />

4
app/src/main/res/layout/widget_keyboard_material.xml → app/src/main/res/layout/simple_keyboard_material.xml
View File

@ -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" />

4
app/src/main/res/layout/widget_keyboard_material_light.xml → app/src/main/res/layout/simple_keyboard_material_light.xml
View File

@ -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" />

2
app/src/main/res/layout/widget_layout.xml
View File

@ -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" />

2
app/src/main/res/layout/widget_layout_material.xml
View File

@ -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" />

2
app/src/main/res/layout/widget_layout_material_light.xml
View File

@ -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" />