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/res/layout/calc_clear_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.calculator.view.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/clearButton"
a:id="@id/cpp_button_clear"
c:textUp="dec"
a:text="@string/c_clear"
c:textDown="bin"

2
android-app/res/layout/calc_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="?cpp_control_image_button_style"
a:onClick="copyButtonClickHandler"/>

2
android-app/res/layout/calc_division_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/divisionButton"
a:id="@id/cpp_button_division"
c:textUp="%"
a:text="/"
c:textDown="√"

2
android-app/res/layout/calc_donate_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="?cpp_control_image_button_style"
a:onClick="likeButtonClickHandler"/>

2
android-app/res/layout/calc_dot_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/periodButton"
a:id="@id/cpp_button_period"
a:text="."
c:textUp=","
c:directionTextScale="0.5"

2
android-app/res/layout/calc_eight_digit_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/eightDigitButton" a:text="8"
a:id="@id/cpp_button_8" a:text="8"
c:textUp="ln"
c:textLeft="0d:"
c:textDown="lg"

2
android-app/res/layout/calc_equals_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/equalsButton"
a:id="@id/cpp_button_equals"
c:textUp="≡"
a:text="="
c:directionTextScale="0.5"

2
android-app/res/layout/calc_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="?cpp_control_image_button_style"
a:onClick="eraseButtonClickHandler"/>

2
android-app/res/layout/calc_five_digit_button.xml
View File

@@ -7,7 +7,7 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/fiveDigitButton"
a:id="@id/cpp_button_5"
a:text="5"
c:textUp="t"
c:textLeft="E"

2
android-app/res/layout/calc_four_digit_button.xml
View File

@@ -7,7 +7,7 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/fourDigitButton"
a:id="@id/cpp_button_4"
a:text="4"
c:textUp="x"
c:textLeft="D"

2
android-app/res/layout/calc_functions_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/functions_button"
a:id="@id/cpp_button_functions"
c:directionTextScale="0.5"
c:textUp="+ƒ"
a:text="ƒ(x)"

2
android-app/res/layout/calc_history_button.xml
View File

@@ -7,7 +7,7 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/historyButton"
a:id="@id/cpp_button_history"
a:text="@string/c_history_button"
c:textUp="@string/c_undo"
c:textDown="@string/c_redo"

2
android-app/res/layout/calc_left_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/leftButton"
a:id="@id/cpp_button_left"
c:textUp="◀◀"
a:text="◀"
c:directionTextScale="0.5"

2
android-app/res/layout/calc_multiplication_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/multiplicationButton"
a:id="@id/cpp_button_multiplication"
a:text="×"
c:textUp="^"
c:textDown="^2"

2
android-app/res/layout/calc_nine_digit_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/nineDigitButton" a:text="9"
a:id="@id/cpp_button_9" a:text="9"
c:textDown="e"
c:textLeft="0x:"
c:textUp="π"

2
android-app/res/layout/calc_one_digit_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/oneDigitButton"
a:id="@id/cpp_button_1"
a:text="1"
c:textUp="sin"
c:textLeft="A"

2
android-app/res/layout/calc_operators_button.xml
View File

@@ -7,7 +7,7 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/functions_button"
a:id="@id/cpp_button_operators"
a:text="∂,…"
a:onClick="operatorsButtonClickHandler"
style="?cpp_control_button_style"/>

2
android-app/res/layout/calc_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="?cpp_control_image_button_style"
a:onClick="pasteButtonClickHandler"/>

2
android-app/res/layout/calc_plus_button.xml
View File

@@ -7,7 +7,7 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/plusButton"
a:id="@id/cpp_button_plus"
c:directionTextScale="0.5"
c:textUp="°"
c:textDown="E"

2
android-app/res/layout/calc_right_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/rightButton"
a:id="@id/cpp_button_right"
c:textUp="▶▶"
a:text="▶"
c:directionTextScale="0.5"

2
android-app/res/layout/calc_round_brackets_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/roundBracketsButton"
a:id="@id/cpp_button_round_brackets"
c:textUp="("
a:text="()"
c:textDown=")"

2
android-app/res/layout/calc_seven_digit_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/sevenDigitButton" a:text="7"
a:id="@id/cpp_button_7" a:text="7"
c:textUp="i"
c:textLeft="0b:"
c:textDown="!"

2
android-app/res/layout/calc_six_digit_button.xml
View File

@@ -9,7 +9,7 @@
<org.solovyev.android.calculator.view.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
c:textUp="deg"
a:id="@+id/sixDigitButton"
a:id="@id/cpp_button_6"
a:text="6"
c:textLeft="F"
c:textDown="rad"

2
android-app/res/layout/calc_subtraction_button.xml
View File

@@ -7,7 +7,7 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/subtractionButton"
a:id="@id/cpp_button_subtraction"
c:textDown="∂,…"
a:text="-"
c:directionTextScale="0.5"

2
android-app/res/layout/calc_three_digit_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/threeDigitButton"
a:id="@id/cpp_button_3"
a:text="3"
c:textUp="tan"
c:textLeft="C"

2
android-app/res/layout/calc_two_digit_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/twoDigitButton"
a:id="@id/cpp_button_2"
a:text="2"
c:textUp="cos"
c:textLeft="B"

2
android-app/res/layout/calc_vars_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/vars_button"
a:id="@id/cpp_button_vars"
c:directionTextScale="0.5"
c:textUp="+π"
a:text="π,…"

2
android-app/res/layout/calc_zero_digit_button.xml
View File

@@ -8,7 +8,7 @@
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/zeroDigitButton"
a:id="@id/cpp_button_0"
c:textUp="00"
a:text="0"
c:textDown="000"

44
android-app/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
View File

@@ -87,12 +87,12 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh
setOnDragListeners(root, dragPreferences, preferences);
final OnDragListener historyOnDragListener = new OnDragListenerVibrator(newOnDragListener(new HistoryDragProcessor<CalculatorHistoryState>(getCalculator()), dragPreferences), vibrator, preferences);
final DragButton historyButton = getButton(root, R.id.historyButton);
final DragButton historyButton = getButton(root, R.id.cpp_button_history);
if (historyButton != null) {
historyButton.setOnDragListener(historyOnDragListener);
}
final DragButton subtractionButton = getButton(root, R.id.subtractionButton);
final DragButton subtractionButton = getButton(root, R.id.cpp_button_subtraction);
if (subtractionButton != null) {
subtractionButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new SimpleOnDragListener.DragProcessor() {
@Override
@@ -108,64 +108,64 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh
final OnDragListener toPositionOnDragListener = new OnDragListenerVibrator(new SimpleOnDragListener(new CursorDragProcessor(), dragPreferences), vibrator, preferences);
final DragButton rightButton = getButton(root, R.id.rightButton);
final DragButton rightButton = getButton(root, R.id.cpp_button_right);
if (rightButton != null) {
rightButton.setOnDragListener(toPositionOnDragListener);
}
final DragButton leftButton = getButton(root, R.id.leftButton);
final DragButton leftButton = getButton(root, R.id.cpp_button_left);
if (leftButton != null) {
leftButton.setOnDragListener(toPositionOnDragListener);
}
final DragButton equalsButton = getButton(root, R.id.equalsButton);
final DragButton equalsButton = getButton(root, R.id.cpp_button_equals);
if (equalsButton != null) {
equalsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new EvalDragProcessor(), dragPreferences), vibrator, preferences));
}
final AngleUnitsButton angleUnitsButton = (AngleUnitsButton) getButton(root, R.id.sixDigitButton);
final AngleUnitsButton angleUnitsButton = (AngleUnitsButton) getButton(root, R.id.cpp_button_6);
if (angleUnitsButton != null) {
angleUnitsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.AngleUnitsChanger(activity), dragPreferences), vibrator, preferences));
}
final NumeralBasesButton clearButton = (NumeralBasesButton) getButton(root, R.id.clearButton);
final NumeralBasesButton clearButton = (NumeralBasesButton) getButton(root, R.id.cpp_button_clear);
if (clearButton != null) {
clearButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.NumeralBasesChanger(activity), dragPreferences), vibrator, preferences));
}
final DragButton varsButton = getButton(root, R.id.vars_button);
final DragButton varsButton = getButton(root, R.id.cpp_button_vars);
if (varsButton != null) {
varsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.VarsDragProcessor(activity), dragPreferences), vibrator, preferences));
}
final DragButton functionsButton = getButton(root, R.id.functions_button);
final DragButton functionsButton = getButton(root, R.id.cpp_button_functions);
if (functionsButton != null) {
functionsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.FunctionsDragProcessor(activity), dragPreferences), vibrator, preferences));
}
final DragButton roundBracketsButton = getButton(root, R.id.roundBracketsButton);
final DragButton roundBracketsButton = getButton(root, R.id.cpp_button_round_brackets);
if (roundBracketsButton != null) {
roundBracketsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.RoundBracketsDragProcessor(), dragPreferences), vibrator, preferences));
}
if (layout == CalculatorPreferences.Gui.Layout.simple) {
toggleButtonDirectionText(root, R.id.oneDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.twoDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.threeDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.cpp_button_1, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.cpp_button_2, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.cpp_button_3, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.sixDigitButton, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.sevenDigitButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.eightDigitButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.cpp_button_6, false, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.cpp_button_7, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.cpp_button_8, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.clearButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.cpp_button_clear, false, DragDirection.left, DragDirection.up, DragDirection.down);
toggleButtonDirectionText(root, R.id.fourDigitButton, false, DragDirection.down);
toggleButtonDirectionText(root, R.id.fiveDigitButton, false, DragDirection.down);
toggleButtonDirectionText(root, R.id.cpp_button_4, false, DragDirection.down);
toggleButtonDirectionText(root, R.id.cpp_button_5, false, DragDirection.down);
toggleButtonDirectionText(root, R.id.nineDigitButton, false, DragDirection.left);
toggleButtonDirectionText(root, R.id.cpp_button_9, false, DragDirection.left);
toggleButtonDirectionText(root, R.id.multiplicationButton, false, DragDirection.left);
toggleButtonDirectionText(root, R.id.plusButton, false, DragDirection.down, DragDirection.up);
toggleButtonDirectionText(root, R.id.cpp_button_multiplication, false, DragDirection.left);
toggleButtonDirectionText(root, R.id.cpp_button_plus, false, DragDirection.down, DragDirection.up);
}
CalculatorButtons.processButtons(theme, layout, root);

8
android-app/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java
View File

@@ -22,7 +22,7 @@ public enum AndroidNumeralBase {
@NotNull
@Override
public List<Integer> getButtonIds() {
return Arrays.asList(R.id.zeroDigitButton, R.id.oneDigitButton);
return Arrays.asList(R.id.cpp_button_0, R.id.cpp_button_1);
}
},
@@ -31,7 +31,7 @@ public enum AndroidNumeralBase {
@Override
public List<Integer> getButtonIds() {
final List<Integer> result = new ArrayList<Integer>(bin.getButtonIds());
result.addAll(Arrays.asList(R.id.twoDigitButton, R.id.threeDigitButton, R.id.fourDigitButton, R.id.fiveDigitButton, R.id.sixDigitButton, R.id.sevenDigitButton));
result.addAll(Arrays.asList(R.id.cpp_button_2, R.id.cpp_button_3, R.id.cpp_button_4, R.id.cpp_button_5, R.id.cpp_button_6, R.id.cpp_button_7));
return result;
}
},
@@ -41,7 +41,7 @@ public enum AndroidNumeralBase {
@Override
public List<Integer> getButtonIds() {
final List<Integer> result = new ArrayList<Integer>(oct.getButtonIds());
result.addAll(Arrays.asList(R.id.eightDigitButton, R.id.nineDigitButton));
result.addAll(Arrays.asList(R.id.cpp_button_8, R.id.cpp_button_9));
return result;
}
},
@@ -49,7 +49,7 @@ public enum AndroidNumeralBase {
hex(CalculatorNumeralBase.hex) {
@NotNull
private List<Integer> specialHexButtonIds = Arrays.asList(R.id.oneDigitButton, R.id.twoDigitButton, R.id.threeDigitButton, R.id.fourDigitButton, R.id.fiveDigitButton, R.id.sixDigitButton);
private List<Integer> specialHexButtonIds = Arrays.asList(R.id.cpp_button_1, R.id.cpp_button_2, R.id.cpp_button_3, R.id.cpp_button_4, R.id.cpp_button_5, R.id.cpp_button_6);
@NotNull
@Override