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

changes

Browse Source
This commit is contained in:
Sergey Solovyev
2012-12-01 19:14:06 +04:00
parent 19818c510e
commit 8ce44cd900
64 changed files with 151 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android-app-core/res/layout/cpp_simple_app_button.xml
View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/appButton"
a:id="@id/cpp_button_app"
a:src="@drawable/kb_logo"
style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="App"/>

2
android-app-core/res/layout/cpp_simple_clear_button.xml
View File

@@ -7,7 +7,7 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/clearButton"
a:id="@id/cpp_button_clear"
a:text="@string/c_clear"
a:textStyle="bold"
style="@style/cpp_simple_metro_control_button_style"/>

2
android-app-core/res/layout/cpp_simple_copy_button.xml
View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/copyButton"
a:id="@id/cpp_button_copy"
a:src="@drawable/kb_copy"
style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Copy"/>

2
android-app-core/res/layout/cpp_simple_division_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/divisionButton"
a:id="@id/cpp_button_division"
a:text="/"
style="@style/cpp_simple_metro_blue_operation_button_style"/>

2
android-app-core/res/layout/cpp_simple_dot_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/periodButton"
a:id="@id/cpp_button_period"
a:text="."
style="@style/metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_eight_digit_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/eightDigitButton"
a:id="@id/cpp_button_8"
a:text="8"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_equals_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/equalsButton"
a:id="@id/cpp_button_equals"
a:text="="
style="@style/cpp_simple_metro_control_button_style"/>

2
android-app-core/res/layout/cpp_simple_erase_button.xml
View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/eraseButton"
a:id="@id/cpp_button_erase"
a:src="@drawable/kb_delete"
style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Erase"/>

2
android-app-core/res/layout/cpp_simple_five_digit_button.xml
View File

@@ -6,6 +6,6 @@
~ or visit http://se.solovyev.org
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/fiveDigitButton"
a:id="@id/cpp_button_5"
a:text="5"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_four_digit_button.xml
View File

@@ -6,6 +6,6 @@
~ or visit http://se.solovyev.org
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/fourDigitButton"
a:id="@id/cpp_button_4"
a:text="4"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_functions_button.xml
View File

@@ -7,7 +7,7 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/functions_button"
a:id="@id/cpp_button_functions"
a:text="ƒ(x)"
a:textStyle="italic"
style="@style/cpp_simple_metro_control_button_style"/>

2
android-app-core/res/layout/cpp_simple_history_button.xml
View File

@@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/historyButton"
a:id="@id/cpp_button_history"
a:text="@string/c_history_button"
style="@style/cpp_simple_metro_control_button_style"
a:textStyle="bold"/>

2
android-app-core/res/layout/cpp_simple_left_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/leftButton"
a:id="@id/cpp_button_left"
a:text="◀"
style="@style/cpp_simple_metro_control_button_style"/>

2
android-app-core/res/layout/cpp_simple_like_button.xml
View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/likeButton"
a:id="@id/cpp_button_like"
a:src="@drawable/kb_facebook"
style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Like"/>

2
android-app-core/res/layout/cpp_simple_multiplication_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/multiplicationButton"
a:id="@id/cpp_button_multiplication"
a:text="×"
style="@style/cpp_simple_metro_blue_operation_button_style"/>

2
android-app-core/res/layout/cpp_simple_nine_digit_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/nineDigitButton"
a:id="@id/cpp_button_9"
a:text="9"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_one_digit_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/oneDigitButton"
a:id="@id/cpp_button_1"
a:text="1"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_paste_button.xml
View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/pasteButton"
a:id="@id/cpp_button_paste"
a:src="@drawable/kb_paste"
style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Paste"/>

2
android-app-core/res/layout/cpp_simple_percent_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/percentButton"
a:id="@id/cpp_button_percent"
a:text="%"
style="@style/cpp_simple_metro_blue_operation_button_style"/>

2
android-app-core/res/layout/cpp_simple_plus_button.xml
View File

@@ -6,6 +6,6 @@
~ or visit http://se.solovyev.org
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/plusButton"
a:id="@id/cpp_button_plus"
a:text="+"
style="@style/cpp_simple_metro_blue_operation_button_style"/>

2
android-app-core/res/layout/cpp_simple_power_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/powerButton"
a:id="@id/cpp_button_power"
a:text="^"
style="@style/cpp_simple_metro_blue_operation_button_style"/>

2
android-app-core/res/layout/cpp_simple_right_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/rightButton"
a:id="@id/cpp_button_right"
a:text="▶"
style="@style/cpp_simple_metro_control_button_style"/>

2
android-app-core/res/layout/cpp_simple_round_brackets_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/roundBracketsButton"
a:id="@id/cpp_button_round_brackets"
a:text="()"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_settings_button.xml
View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/settingsButton"
a:id="@id/cpp_button_settings"
a:src="@drawable/kb_settings"
style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Settings"/>

2
android-app-core/res/layout/cpp_simple_seven_digit_button.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/sevenDigitButton"
a:id="@id/cpp_button_7"
a:text="7"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_six_digit_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/sixDigitButton"
a:id="@id/cpp_button_6"
a:text="6"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_subtraction_button.xml
View File

@@ -6,6 +6,6 @@
~ or visit http://se.solovyev.org
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/subtractionButton"
a:id="@id/cpp_button_subtraction"
a:text="-"
style="@style/cpp_simple_metro_blue_operation_button_style"/>

2
android-app-core/res/layout/cpp_simple_three_digit_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/threeDigitButton"
a:id="@id/cpp_button_3"
a:text="3"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_two_digit_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/twoDigitButton"
a:id="@id/cpp_button_2"
a:text="2"
style="@style/cpp_simple_metro_digit_button_style"/>

2
android-app-core/res/layout/cpp_simple_vars_button.xml
View File

@@ -7,7 +7,7 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/vars_button"
a:id="@id/cpp_button_vars"
a:text="π,…"
a:textStyle="italic"
style="@style/cpp_simple_metro_control_button_style"/>

2
android-app-core/res/layout/cpp_simple_zero_digit_button.xml
View File

@@ -7,6 +7,6 @@
-->
<Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/zeroDigitButton"
a:id="@id/cpp_button_0"
a:text="0"
style="@style/cpp_simple_metro_digit_button_style"/>

63
android-app-core/res/values/ids.xml
View File

@@ -1,36 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="id" name="oneDigitButton"/>
<item type="id" name="twoDigitButton"/>
<item type="id" name="threeDigitButton"/>
<item type="id" name="fourDigitButton"/>
<item type="id" name="fiveDigitButton"/>
<item type="id" name="sixDigitButton"/>
<item type="id" name="sevenDigitButton"/>
<item type="id" name="eightDigitButton"/>
<item type="id" name="nineDigitButton"/>
<item type="id" name="zeroDigitButton"/>
<item type="id" name="cpp_button_1"/>
<item type="id" name="cpp_button_2"/>
<item type="id" name="cpp_button_3"/>
<item type="id" name="cpp_button_4"/>
<item type="id" name="cpp_button_5"/>
<item type="id" name="cpp_button_6"/>
<item type="id" name="cpp_button_7"/>
<item type="id" name="cpp_button_8"/>
<item type="id" name="cpp_button_9"/>
<item type="id" name="cpp_button_0"/>
<item type="id" name="periodButton"/>
<item type="id" name="roundBracketsButton"/>
<item type="id" name="settingsButton"/>
<item type="id" name="likeButton"/>
<item type="id" name="leftButton"/>
<item type="id" name="rightButton"/>
<item type="id" name="vars_button"/>
<item type="id" name="functions_button"/>
<item type="id" name="appButton"/>
<item type="id" name="historyButton"/>
<item type="id" name="multiplicationButton"/>
<item type="id" name="divisionButton"/>
<item type="id" name="plusButton"/>
<item type="id" name="subtractionButton"/>
<item type="id" name="percentButton"/>
<item type="id" name="powerButton"/>
<item type="id" name="clearButton"/>
<item type="id" name="eraseButton"/>
<item type="id" name="copyButton"/>
<item type="id" name="pasteButton"/>
<item type="id" name="equalsButton"/>
<item type="id" name="cpp_button_period"/>
<item type="id" name="cpp_button_round_brackets"/>
<item type="id" name="cpp_button_settings"/>
<item type="id" name="cpp_button_like"/>
<item type="id" name="cpp_button_left"/>
<item type="id" name="cpp_button_right"/>
<item type="id" name="cpp_button_vars"/>
<item type="id" name="cpp_button_functions"/>
<item type="id" name="cpp_button_operators"/>
<item type="id" name="cpp_button_app"/>
<item type="id" name="cpp_button_history"/>
<item type="id" name="cpp_button_multiplication"/>
<item type="id" name="cpp_button_division"/>
<item type="id" name="cpp_button_plus"/>
<item type="id" name="cpp_button_subtraction"/>
<item type="id" name="cpp_button_percent"/>
<item type="id" name="cpp_button_power"/>
<item type="id" name="cpp_button_clear"/>
<item type="id" name="cpp_button_erase"/>
<item type="id" name="cpp_button_copy"/>
<item type="id" name="cpp_button_paste"/>
<item type="id" name="cpp_button_equals"/>
</resources>

62
android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButton.java
View File

@@ -16,47 +16,47 @@ import java.util.Map;
public enum CalculatorButton {
/*digits*/
one(R.id.oneDigitButton, "1"),
two(R.id.twoDigitButton, "2"),
three(R.id.threeDigitButton, "3"),
four(R.id.fourDigitButton, "4"),
five(R.id.fiveDigitButton, "5"),
six(R.id.sixDigitButton, "6"),
seven(R.id.sevenDigitButton, "7"),
eight(R.id.eightDigitButton, "8"),
nine(R.id.nineDigitButton, "9"),
zero(R.id.zeroDigitButton, "0"),
one(R.id.cpp_button_1, "1"),
two(R.id.cpp_button_2, "2"),
three(R.id.cpp_button_3, "3"),
four(R.id.cpp_button_4, "4"),
five(R.id.cpp_button_5, "5"),
six(R.id.cpp_button_6, "6"),
seven(R.id.cpp_button_7, "7"),
eight(R.id.cpp_button_8, "8"),
nine(R.id.cpp_button_9, "9"),
zero(R.id.cpp_button_0, "0"),
period(R.id.periodButton, "."),
brackets(R.id.roundBracketsButton, "()"),
period(R.id.cpp_button_period, "."),
brackets(R.id.cpp_button_round_brackets, "()"),
settings(R.id.settingsButton, CalculatorSpecialButton.settings_detached),
like(R.id.likeButton, CalculatorSpecialButton.like),
settings(R.id.cpp_button_settings, CalculatorSpecialButton.settings_detached),
like(R.id.cpp_button_like, CalculatorSpecialButton.like),
/*last row*/
left(R.id.leftButton, CalculatorSpecialButton.cursor_left),
right(R.id.rightButton, CalculatorSpecialButton.cursor_right),
vars(R.id.vars_button, CalculatorSpecialButton.vars_detached),
functions(R.id.functions_button, CalculatorSpecialButton.functions_detached),
app(R.id.appButton, CalculatorSpecialButton.open_app),
history(R.id.historyButton, CalculatorSpecialButton.history_detached),
left(R.id.cpp_button_left, CalculatorSpecialButton.cursor_left),
right(R.id.cpp_button_right, CalculatorSpecialButton.cursor_right),
vars(R.id.cpp_button_vars, CalculatorSpecialButton.vars_detached),
functions(R.id.cpp_button_functions, CalculatorSpecialButton.functions_detached),
app(R.id.cpp_button_app, CalculatorSpecialButton.open_app),
history(R.id.cpp_button_history, CalculatorSpecialButton.history_detached),
/*operations*/
multiplication(R.id.multiplicationButton, "*"),
division(R.id.divisionButton, "/"),
plus(R.id.plusButton, "+"),
subtraction(R.id.subtractionButton, "-"),
percent(R.id.percentButton, "%"),
power(R.id.powerButton, "^"),
multiplication(R.id.cpp_button_multiplication, "*"),
division(R.id.cpp_button_division, "/"),
plus(R.id.cpp_button_plus, "+"),
subtraction(R.id.cpp_button_subtraction, "-"),
percent(R.id.cpp_button_percent, "%"),
power(R.id.cpp_button_power, "^"),
/*last column*/
clear(R.id.clearButton, CalculatorSpecialButton.clear),
erase(R.id.eraseButton, CalculatorSpecialButton.erase, CalculatorSpecialButton.clear),
copy(R.id.copyButton, CalculatorSpecialButton.copy),
paste(R.id.pasteButton, CalculatorSpecialButton.paste),
clear(R.id.cpp_button_clear, CalculatorSpecialButton.clear),
erase(R.id.cpp_button_erase, CalculatorSpecialButton.erase, CalculatorSpecialButton.clear),
copy(R.id.cpp_button_copy, CalculatorSpecialButton.copy),
paste(R.id.cpp_button_paste, CalculatorSpecialButton.paste),
/*equals*/
equals(R.id.equalsButton, CalculatorSpecialButton.equals);
equals(R.id.cpp_button_equals, CalculatorSpecialButton.equals);
private final int buttonId;

6
android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
View File

@@ -53,14 +53,14 @@ public final class CalculatorButtons {
}
static void initMultiplicationButton(@NotNull View root) {
final View multiplicationButton = root.findViewById(R.id.multiplicationButton);
final View multiplicationButton = root.findViewById(R.id.cpp_button_multiplication);
if ( multiplicationButton instanceof Button) {
((Button) multiplicationButton).setText(Locator.getInstance().getEngine().getMultiplicationSign());
}
}
public static void initMultiplicationButton(@NotNull RemoteViews views) {
views.setTextViewText(R.id.multiplicationButton, Locator.getInstance().getEngine().getMultiplicationSign());
views.setTextViewText(R.id.cpp_button_multiplication, Locator.getInstance().getEngine().getMultiplicationSign());
}
@@ -75,7 +75,7 @@ public final class CalculatorButtons {
if (AndroidUtils.getScreenOrientation(activity) == Configuration.ORIENTATION_PORTRAIT
|| !CalculatorPreferences.Gui.autoOrientation.getPreference(preferences)) {
final DragButton equalsButton = (DragButton)activity.findViewById(R.id.equalsButton);
final DragButton equalsButton = (DragButton)activity.findViewById(R.id.cpp_button_equals);
if (equalsButton != null) {
if (CalculatorPreferences.Gui.showEqualsButton.getPreference(preferences)) {
equalsButton.setVisibility(View.VISIBLE);