From e0bce886f4f07aca11e790a7745c5f05c68db1fe Mon Sep 17 00:00:00 2001 From: serso Date: Mon, 1 Jul 2013 16:54:18 +0400 Subject: [PATCH 01/35] pom changed --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index c8150287..ab19d744 100644 --- a/pom.xml +++ b/pom.xml @@ -56,8 +56,8 @@ UTF-8 - 1.1.1-SNAPSHOT - 1.0.5-SNAPSHOT + 1.1.1-SNAPSHOT + 1.0.5-SNAPSHOT @@ -93,67 +93,67 @@ org.solovyev common-core - ${common.version} + ${jcl.version} org.solovyev common-text - ${common.version} + ${jcl.version} org.solovyev common-listeners - ${common.version} + ${jcl.version} org.solovyev.android android-common-core apklib - ${android.common.version} + ${acl.version} org.solovyev.android android-common-ads apklib - ${android.common.version} + ${acl.version} org.solovyev.android android-common-view apklib - ${android.common.version} + ${acl.version} org.solovyev.android android-common-preferences apklib - ${android.common.version} + ${acl.version} org.solovyev.android android-common-menu apklib - ${android.common.version} + ${acl.version} org.solovyev.android android-common-db apklib - ${android.common.version} + ${acl.version} org.solovyev.android android-common-sherlock - ${android.common.version} + ${acl.version} apklib @@ -161,21 +161,21 @@ org.solovyev.android android-common-other apklib - ${android.common.version} + ${acl.version} org.solovyev.android android-common-billing apklib - ${android.common.version} + ${acl.version} org.solovyev.android android-common-all apklib - ${android.common.version} + ${acl.version} From 4dae4bbca4b50afd0631564c2e41aaa863b40661 Mon Sep 17 00:00:00 2001 From: Solovyev_S Date: Tue, 2 Jul 2013 13:23:28 +0400 Subject: [PATCH 02/35] numeral base/angle units button fix --- .../model/AndroidCalculatorEngine.java | 4 +- .../calculator/view/AngleUnitsButton.java | 34 +++++++- .../calculator/view/NumeralBasesButton.java | 35 +++++++- .../calculator/CalculatorTestUtils.java | 79 +++++++++++++++++++ .../calculator/view/AngleUnitsButtonTest.java | 75 ++++++++++++++++++ .../view/NumeralBasesButtonTest.java | 76 ++++++++++++++++++ .../calculator/AbstractCalculatorHelper.java | 24 +++++- .../CalculatorKeyboardFragment.java | 41 +++------- .../calculator/NumeralBaseButtons.java | 10 ++- 9 files changed, 333 insertions(+), 45 deletions(-) create mode 100644 android-app-core/src/main/test/org/solovyev/android/calculator/CalculatorTestUtils.java create mode 100644 android-app-core/src/main/test/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java create mode 100644 android-app-core/src/main/test/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java diff --git a/android-app-core/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java b/android-app-core/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java index 995ced40..d55e3b5a 100644 --- a/android-app-core/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java +++ b/android-app-core/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java @@ -274,12 +274,12 @@ public class AndroidCalculatorEngine implements CalculatorEngine, SharedPreferen } @Nonnull - public NumeralBase getNumeralBaseFromPrefs(@Nonnull SharedPreferences preferences) { + public static NumeralBase getNumeralBaseFromPrefs(@Nonnull SharedPreferences preferences) { return Preferences.numeralBase.getPreference(preferences); } @Nonnull - public AngleUnit getAngleUnitsFromPrefs(@Nonnull SharedPreferences preferences) { + public static AngleUnit getAngleUnitsFromPrefs(@Nonnull SharedPreferences preferences) { return Preferences.angleUnit.getPreference(preferences); } diff --git a/android-app-core/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java b/android-app-core/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java index 776c94b3..67522b5f 100644 --- a/android-app-core/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java +++ b/android-app-core/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java @@ -27,6 +27,7 @@ import android.content.res.Resources; import android.graphics.Paint; import android.text.TextPaint; import android.util.AttributeSet; +import jscl.AngleUnit; import javax.annotation.Nonnull; @@ -41,8 +42,12 @@ import org.solovyev.android.view.drag.DirectionDragButton; */ public class AngleUnitsButton extends DirectionDragButton { + @Nonnull + private AngleUnit angleUnit; + public AngleUnitsButton(Context context, @Nonnull AttributeSet attrs) { super(context, attrs); + this.angleUnit = Locator.getInstance().getEngine().getAngleUnits(); } @Override @@ -52,11 +57,32 @@ public class AngleUnitsButton extends DirectionDragButton { super.initDirectionTextPaint(basePaint, directionTextData, resources); final TextPaint directionTextPaint = directionTextData.getPaint(); - if (Locator.getInstance().getEngine().getAngleUnits().name().equals(directionTextData.getText())) { - directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color)); - } else { - directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color)); + final int color = getDirectionTextColor(directionTextData.getText()); + directionTextPaint.setColor(color); + if (!isCurrentAngleUnits(directionTextData.getText())) { directionTextPaint.setAlpha(getDirectionTextAlpha()); } } + + int getDirectionTextColor(@Nonnull String directionText) { + final int color; + final Resources resources = getResources(); + if (isCurrentAngleUnits(directionText)) { + color = resources.getColor(R.color.cpp_selected_angle_unit_text_color); + } else { + color = resources.getColor(R.color.cpp_default_text_color); + } + return color; + } + + boolean isCurrentAngleUnits(@Nonnull String directionText) { + return this.angleUnit.name().equals(directionText); + } + + public void setAngleUnit(@Nonnull AngleUnit angleUnit) { + if (this.angleUnit != angleUnit) { + this.angleUnit = angleUnit; + invalidate(); + } + } } diff --git a/android-app-core/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java b/android-app-core/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java index af4ab8e2..78080b10 100644 --- a/android-app-core/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java +++ b/android-app-core/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java @@ -27,6 +27,7 @@ import android.content.res.Resources; import android.graphics.Paint; import android.text.TextPaint; import android.util.AttributeSet; +import jscl.NumeralBase; import javax.annotation.Nonnull; @@ -41,8 +42,12 @@ import org.solovyev.android.view.drag.DirectionDragButton; */ public class NumeralBasesButton extends DirectionDragButton { + @Nonnull + private NumeralBase numeralBase; + public NumeralBasesButton(Context context, @Nonnull AttributeSet attrs) { super(context, attrs); + this.numeralBase = Locator.getInstance().getEngine().getNumeralBase(); } @Override @@ -52,11 +57,33 @@ public class NumeralBasesButton extends DirectionDragButton { super.initDirectionTextPaint(basePaint, directionTextData, resources); final TextPaint directionTextPaint = directionTextData.getPaint(); - if (Locator.getInstance().getEngine().getNumeralBase().name().equals(directionTextData.getText())) { - directionTextPaint.setColor(resources.getColor(R.color.cpp_selected_angle_unit_text_color)); - } else { - directionTextPaint.setColor(resources.getColor(R.color.cpp_default_text_color)); + + final int color = getDirectionTextColor(directionTextData.getText()); + directionTextPaint.setColor(color); + + if (!isCurrentNumberBase(directionTextData.getText())) { directionTextPaint.setAlpha(getDirectionTextAlpha()); } } + + int getDirectionTextColor(@Nonnull String directionText) { + final int color; + if (isCurrentNumberBase(directionText)) { + color = getResources().getColor(R.color.cpp_selected_angle_unit_text_color); + } else { + color = getResources().getColor(R.color.cpp_default_text_color); + } + return color; + } + + boolean isCurrentNumberBase(@Nonnull String directionText) { + return this.numeralBase.name().equals(directionText); + } + + public void setNumeralBase(@Nonnull NumeralBase numeralBase) { + if (this.numeralBase != numeralBase) { + this.numeralBase = numeralBase; + invalidate(); + } + } } diff --git a/android-app-core/src/main/test/org/solovyev/android/calculator/CalculatorTestUtils.java b/android-app-core/src/main/test/org/solovyev/android/calculator/CalculatorTestUtils.java new file mode 100644 index 00000000..2ef54856 --- /dev/null +++ b/android-app-core/src/main/test/org/solovyev/android/calculator/CalculatorTestUtils.java @@ -0,0 +1,79 @@ +/* + * Copyright 2013 serso aka se.solovyev + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Contact details + * + * Email: se.solovyev@gmail.com + * Site: http://se.solovyev.org + */ + +package org.solovyev.android.calculator; + +import android.content.Context; +import jscl.JsclMathEngine; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import org.mockito.Mockito; +import org.solovyev.android.calculator.history.CalculatorHistory; +import org.solovyev.android.calculator.plot.CalculatorPlotter; + +/** + * User: serso + * Date: 10/7/12 + * Time: 8:56 PM + */ +public class CalculatorTestUtils { + + public static void staticSetUp(@Nullable Context context) throws Exception { + Locator.getInstance().init(new CalculatorImpl(), newCalculatorEngine(), Mockito.mock(CalculatorClipboard.class), Mockito.mock(CalculatorNotifier.class), Mockito.mock(CalculatorHistory.class), new SystemOutCalculatorLogger(), Mockito.mock(CalculatorPreferenceService.class), Mockito.mock(CalculatorKeyboard.class), Mockito.mock(CalculatorPlotter.class), null); + Locator.getInstance().getEngine().init(); + + if (context != null) { + initViews(context); + } + } + + public static void initViews(@Nonnull Context context) { + final AndroidCalculatorEditorView editor = new AndroidCalculatorEditorView(context); + editor.init(); + Locator.getInstance().getEditor().setView(editor); + + final AndroidCalculatorDisplayView display = new AndroidCalculatorDisplayView(context); + display.init(context); + Locator.getInstance().getDisplay().setView(display); + } + + public static void staticSetUp() throws Exception { + staticSetUp(null); + } + + + @Nonnull + static CalculatorEngineImpl newCalculatorEngine() { + final MathEntityDao mathEntityDao = Mockito.mock(MathEntityDao.class); + + final JsclMathEngine jsclEngine = JsclMathEngine.getInstance(); + + final CalculatorVarsRegistry varsRegistry = new CalculatorVarsRegistry(jsclEngine.getConstantsRegistry(), mathEntityDao); + final CalculatorFunctionsMathRegistry functionsRegistry = new CalculatorFunctionsMathRegistry(jsclEngine.getFunctionsRegistry(), mathEntityDao); + final CalculatorOperatorsMathRegistry operatorsRegistry = new CalculatorOperatorsMathRegistry(jsclEngine.getOperatorsRegistry(), mathEntityDao); + final CalculatorPostfixFunctionsRegistry postfixFunctionsRegistry = new CalculatorPostfixFunctionsRegistry(jsclEngine.getPostfixFunctionsRegistry(), mathEntityDao); + + return new CalculatorEngineImpl(jsclEngine, varsRegistry, functionsRegistry, operatorsRegistry, postfixFunctionsRegistry, null); + } +} diff --git a/android-app-core/src/main/test/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java b/android-app-core/src/main/test/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java new file mode 100644 index 00000000..47006678 --- /dev/null +++ b/android-app-core/src/main/test/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java @@ -0,0 +1,75 @@ +package org.solovyev.android.calculator.view; + +import android.app.Activity; +import jscl.AngleUnit; + +import java.util.ArrayList; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.res.Attribute; +import org.robolectric.shadows.ShadowActivity; + +import static jscl.AngleUnit.deg; +import static jscl.AngleUnit.grad; +import static jscl.AngleUnit.rad; +import static jscl.AngleUnit.turns; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.solovyev.android.calculator.CalculatorTestUtils.staticSetUp; + +@RunWith(RobolectricTestRunner.class) +public class AngleUnitsButtonTest { + + private AngleUnitsButton button; + + @Before + public void setUp() throws Exception { + staticSetUp(); + + final Activity context = Robolectric.buildActivity(Activity.class).create().get(); + final ShadowActivity activity = Robolectric.shadowOf(context); + button = new AngleUnitsButton(context, activity.createAttributeSet(new ArrayList(), AngleUnitsButton.class)); + } + + @Test + public void testShouldReturnDifferentColorsForDifferentAngleUnits() throws Exception { + button.setAngleUnit(deg); + + assertEquals(button.getDirectionTextColor(deg.name()), button.getDirectionTextColor(deg.name())); + assertEquals(button.getDirectionTextColor(grad.name()), button.getDirectionTextColor(rad.name())); + assertNotSame(button.getDirectionTextColor(deg.name()), button.getDirectionTextColor(rad.name())); + assertNotSame(button.getDirectionTextColor(deg.name()), button.getDirectionTextColor(grad.name())); + assertNotSame(button.getDirectionTextColor(deg.name()), button.getDirectionTextColor(turns.name())); + } + + @Test + public void testIsCurrentAngleUnits() throws Exception { + button.setAngleUnit(rad); + assertTrue(button.isCurrentAngleUnits(rad.name())); + assertFalse(button.isCurrentAngleUnits(deg.name())); + assertFalse(button.isCurrentAngleUnits(grad.name())); + } + + @Test + public void testInvalidateShouldBeCalledOnlyWhenChangeIsDone() throws Exception { + button.setAngleUnit(rad); + + button = Mockito.spy(button); + + button.setAngleUnit(deg); + verify(button, times(1)).invalidate(); + + button.setAngleUnit(deg); + verify(button, times(1)).invalidate(); + } +} diff --git a/android-app-core/src/main/test/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java b/android-app-core/src/main/test/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java new file mode 100644 index 00000000..cb97783d --- /dev/null +++ b/android-app-core/src/main/test/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java @@ -0,0 +1,76 @@ +package org.solovyev.android.calculator.view; + +import android.app.Activity; +import jscl.NumeralBase; + +import java.util.ArrayList; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.res.Attribute; +import org.robolectric.shadows.ShadowActivity; + +import static jscl.AngleUnit.deg; +import static jscl.AngleUnit.rad; +import static jscl.NumeralBase.bin; +import static jscl.NumeralBase.dec; +import static jscl.NumeralBase.hex; +import static jscl.NumeralBase.oct; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.solovyev.android.calculator.CalculatorTestUtils.staticSetUp; + +@RunWith(RobolectricTestRunner.class) +public class NumeralBasesButtonTest { + + private NumeralBasesButton button; + + @Before + public void setUp() throws Exception { + staticSetUp(); + + final Activity context = Robolectric.buildActivity(Activity.class).create().get(); + final ShadowActivity activity = Robolectric.shadowOf(context); + button = new NumeralBasesButton(context, activity.createAttributeSet(new ArrayList(), NumeralBasesButton.class)); + } + + @Test + public void testShouldReturnDifferentColorsForDifferentNumeralBase() throws Exception { + button.setNumeralBase(dec); + + assertEquals(button.getDirectionTextColor(dec.name()), button.getDirectionTextColor(dec.name())); + assertEquals(button.getDirectionTextColor(hex.name()), button.getDirectionTextColor(bin.name())); + assertNotSame(button.getDirectionTextColor(dec.name()), button.getDirectionTextColor(bin.name())); + assertNotSame(button.getDirectionTextColor(dec.name()), button.getDirectionTextColor(hex.name())); + assertNotSame(button.getDirectionTextColor(dec.name()), button.getDirectionTextColor(oct.name())); + } + + @Test + public void testIsCurrentNumeralBase() throws Exception { + button.setNumeralBase(dec); + assertTrue(button.isCurrentNumberBase(dec.name())); + assertFalse(button.isCurrentNumberBase(hex.name())); + assertFalse(button.isCurrentNumberBase(bin.name())); + } + + @Test + public void testInvalidateShouldBeCalledOnlyWhenChangeIsDone() throws Exception { + button.setNumeralBase(dec); + + button = Mockito.spy(button); + + button.setNumeralBase(hex); + verify(button, times(1)).invalidate(); + + button.setNumeralBase(hex); + verify(button, times(1)).invalidate(); + } +} diff --git a/android-app/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java b/android-app/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java index 6addd298..7c83dd4c 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java @@ -52,6 +52,8 @@ import java.util.List; import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.simple; import static org.solovyev.android.calculator.CalculatorPreferences.Gui.Layout.simple_mobile; +import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.angleUnit; +import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.numeralBase; /** * User: serso @@ -75,6 +77,12 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh @Nonnull private String logTag = "CalculatorActivity"; + @Nullable + private AngleUnitsButton angleUnitsButton; + + @Nullable + private NumeralBasesButton clearButton; + protected AbstractCalculatorHelper() { } @@ -151,12 +159,12 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh equalsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new EqualsDragProcessor(), dragPreferences), vibrator, preferences)); } - final AngleUnitsButton angleUnitsButton = (AngleUnitsButton) getButton(root, R.id.cpp_button_6); + 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.cpp_button_clear); + clearButton = getButton(root, R.id.cpp_button_clear); if (clearButton != null) { clearButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.NumeralBasesChanger(activity), dragPreferences), vibrator, preferences)); } @@ -266,12 +274,22 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh @Override public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { - if (key != null && key.startsWith("org.solovyev.android.calculator.DragButtonCalibrationActivity")) { + if (key.startsWith("org.solovyev.android.calculator.DragButtonCalibrationActivity")) { final SimpleOnDragListener.Preferences dragPreferences = SimpleOnDragListener.getPreferences(preferences, CalculatorApplication.getInstance()); for (DragPreferencesChangeListener dragPreferencesChangeListener : dpclRegister.getListeners()) { dragPreferencesChangeListener.onDragPreferencesChange(dragPreferences); } } + + if (angleUnit.isSameKey(key) || numeralBase.isSameKey(key)) { + if (angleUnitsButton != null) { + angleUnitsButton.setAngleUnit(angleUnit.getPreference(preferences)); + } + + if (clearButton != null) { + clearButton.setNumeralBase(numeralBase.getPreference(preferences)); + } + } } public void onDestroy(@Nonnull Activity activity) { diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java index 7b66f0a2..3a5f2421 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java @@ -36,6 +36,14 @@ import javax.annotation.Nullable; import org.solovyev.android.calculator.model.AndroidCalculatorEngine; +import static org.solovyev.android.calculator.CalculatorPreferences.Gui.hideNumeralBaseDigits; +import static org.solovyev.android.calculator.CalculatorPreferences.Gui.showEqualsButton; +import static org.solovyev.android.calculator.NumeralBaseButtons.toggleNumericDigits; +import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences; +import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.angleUnit; +import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.multiplicationSign; +import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.numeralBase; + /** * User: Solovyev_S * Date: 25.09.12 @@ -108,21 +116,6 @@ public class CalculatorKeyboardFragment extends SherlockFragment implements Shar } - /* private static void setMarginsForView(@Nullable View view, int marginLeft, int marginBottom, @Nonnull Context context) { - // IMPORTANT: this is workaround for probably android bug - // currently margin values set in styles are not applied for some reasons to the views (using include tag) => set them manually - - if (view != null) { - final DisplayMetrics dm = context.getResources().getDisplayMetrics(); - if (view.getLayoutParams() instanceof LinearLayout.LayoutParams) { - final LinearLayout.LayoutParams oldParams = (LinearLayout.LayoutParams) view.getLayoutParams(); - final LinearLayout.LayoutParams newParams = new LinearLayout.LayoutParams(oldParams.width, oldParams.height, oldParams.weight); - newParams.setMargins(AndroidUtils.toPixels(dm, marginLeft), 0, 0, AndroidUtils.toPixels(dm, marginBottom)); - view.setLayoutParams(newParams); - } - } - }*/ - @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -130,25 +123,15 @@ public class CalculatorKeyboardFragment extends SherlockFragment implements Shar @Override public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { - if (AndroidCalculatorEngine.Preferences.numeralBase.getKey().equals(key) || - CalculatorPreferences.Gui.hideNumeralBaseDigits.getKey().equals(key)) { - NumeralBaseButtons.toggleNumericDigits(this.getActivity(), preferences); + if (numeralBase.isSameKey(key) || hideNumeralBaseDigits.isSameKey(key)) { + toggleNumericDigits(this.getActivity(), preferences); } - if (AndroidCalculatorEngine.Preferences.angleUnit.getKey().equals(key) || - AndroidCalculatorEngine.Preferences.numeralBase.getKey().equals(key)) { - View view = getView(); - if (view != null) { - // we should update state of angle units/numeral base button => we can achieve it by invalidating the whole view - view.invalidate(); - } - } - - if (CalculatorPreferences.Gui.showEqualsButton.getKey().equals(key)) { + if (showEqualsButton.isSameKey(key)) { CalculatorButtons.toggleEqualsButton(preferences, this.getActivity()); } - if (AndroidCalculatorEngine.Preferences.multiplicationSign.getKey().equals(key)) { + if (multiplicationSign.isSameKey(key)) { CalculatorButtons.initMultiplicationButton(getView()); } } diff --git a/android-app/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java b/android-app/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java index 2abbbcf1..ca92b428 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java @@ -30,6 +30,10 @@ import javax.annotation.Nonnull; import org.solovyev.android.calculator.model.AndroidCalculatorEngine; +import static jscl.NumeralBase.hex; +import static org.solovyev.android.calculator.CalculatorPreferences.Gui.hideNumeralBaseDigits; +import static org.solovyev.android.calculator.model.AndroidCalculatorEngine.Preferences.numeralBase; + /** * User: serso * Date: 4/20/12 @@ -48,12 +52,12 @@ public class NumeralBaseButtons { } public static void toggleNumericDigits(@Nonnull Activity activity, @Nonnull SharedPreferences preferences) { - if (CalculatorPreferences.Gui.hideNumeralBaseDigits.getPreference(preferences)) { - final NumeralBase nb = AndroidCalculatorEngine.Preferences.numeralBase.getPreference(preferences); + if (hideNumeralBaseDigits.getPreference(preferences)) { + final NumeralBase nb = numeralBase.getPreference(preferences); toggleNumericDigits(activity, nb); } else { // set HEX to show all digits - AndroidNumeralBase.valueOf(NumeralBase.hex).toggleButtons(true, activity); + AndroidNumeralBase.valueOf(hex).toggleButtons(true, activity); } } } From b7b32b1002de26b489cc9fcccaffd8c89cf729a1 Mon Sep 17 00:00:00 2001 From: Solovyev_S Date: Tue, 2 Jul 2013 13:23:44 +0400 Subject: [PATCH 03/35] safe loading of calculator engine --- .../calculator/CalculatorEngineImpl.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java index 120da439..ae38b995 100644 --- a/core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java +++ b/core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java @@ -179,13 +179,26 @@ public class CalculatorEngineImpl implements CalculatorEngine { @Override public void reset() { synchronized (lock) { - varsRegistry.load(); - functionsRegistry.load(); - operatorsRegistry.load(); - postfixFunctionsRegistry.load(); + safeLoadRegistry(varsRegistry); + safeLoadRegistry(functionsRegistry); + safeLoadRegistry(operatorsRegistry); + safeLoadRegistry(postfixFunctionsRegistry); } } + private void safeLoadRegistry(@Nonnull CalculatorMathRegistry registry) { + try { + registry.load(); + } catch (Exception e) { + logException(e); + } + } + + private void logException(@Nonnull Exception e) { + final CalculatorLogger logger = Locator.getInstance().getLogger(); + logger.error("Engine", e.getMessage(), e); + } + @Override public void softReset() { Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.engine_preferences_changed, null); From 9ae9aed9fc6b04f462712cf626f65cf64cec207b Mon Sep 17 00:00:00 2001 From: Solovyev_S Date: Tue, 2 Jul 2013 13:27:03 +0400 Subject: [PATCH 04/35] history item color changed --- android-app/res/layout/history_item.xml | 1 - android-app/res/layout/saved_history_item.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/android-app/res/layout/history_item.xml b/android-app/res/layout/history_item.xml index c4e89abd..588831eb 100644 --- a/android-app/res/layout/history_item.xml +++ b/android-app/res/layout/history_item.xml @@ -43,7 +43,6 @@ a:id="@+id/history_item" a:layout_width="fill_parent" a:layout_height="fill_parent" - a:textColor="@color/cpp_button_operator_text_color" style="@style/history_item"/> diff --git a/android-app/res/layout/saved_history_item.xml b/android-app/res/layout/saved_history_item.xml index f2af4d9a..8ec51887 100644 --- a/android-app/res/layout/saved_history_item.xml +++ b/android-app/res/layout/saved_history_item.xml @@ -36,7 +36,6 @@ a:id="@+id/history_item" a:layout_width="fill_parent" a:layout_height="fill_parent" - a:textColor="@color/cpp_button_operator_text_color" style="@style/history_item"/> Date: Tue, 2 Jul 2013 14:49:35 +0400 Subject: [PATCH 05/35] greek letters added to the var names --- android-app/res/layout/var_edit.xml | 63 +++++++++++++++++++ .../edit/AbstractMathEntityListFragment.java | 2 - .../math/edit/VarEditDialogFragment.java | 34 +++++++++- 3 files changed, 94 insertions(+), 5 deletions(-) diff --git a/android-app/res/layout/var_edit.xml b/android-app/res/layout/var_edit.xml index 91ac4823..06df2ea1 100644 --- a/android-app/res/layout/var_edit.xml +++ b/android-app/res/layout/var_edit.xml @@ -46,6 +46,69 @@ style="@style/cpp_default_text_size" a:inputType="text"/> + + +