diff --git a/.gitignore b/.gitignore index 2e0a7488..df233383 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ target atlassian-ide-plugin.xml .idea/workspace.xml .idea/tasks.xml -.idea/uiDesigner.xml \ No newline at end of file +.idea/uiDesigner.xml +.idea/libraries/ \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index c7821849..42cacc1c 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -22,12 +22,18 @@ + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml index 9afb1828..ab16b3bf 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -11,25 +11,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/android-app-core.iml b/android-app-core.iml index 612dfa09..c5efdfbd 100644 --- a/android-app-core.iml +++ b/android-app-core.iml @@ -10,7 +10,7 @@ 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 67522b5f..bd7de550 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 @@ -28,13 +28,12 @@ import android.graphics.Paint; import android.text.TextPaint; import android.util.AttributeSet; import jscl.AngleUnit; - -import javax.annotation.Nonnull; - import org.solovyev.android.calculator.Locator; import org.solovyev.android.calculator.core.R; import org.solovyev.android.view.drag.DirectionDragButton; +import javax.annotation.Nonnull; + /** * User: serso * Date: 11/22/11 @@ -51,16 +50,16 @@ public class AngleUnitsButton extends DirectionDragButton { } @Override - protected void initDirectionTextPaint(@Nonnull Paint basePaint, - @Nonnull DirectionTextData directionTextData, - @Nonnull Resources resources) { - super.initDirectionTextPaint(basePaint, directionTextData, resources); + protected void initDirectionTextPaint(@Nonnull Paint basePaint, @Nonnull DirectionTextData textData) { + super.initDirectionTextPaint(basePaint, textData); - final TextPaint directionTextPaint = directionTextData.getPaint(); - final int color = getDirectionTextColor(directionTextData.getText()); - directionTextPaint.setColor(color); - if (!isCurrentAngleUnits(directionTextData.getText())) { - directionTextPaint.setAlpha(getDirectionTextAlpha()); + final String text = textData.getText(); + final TextPaint paint = textData.getPaint(); + + final int color = getDirectionTextColor(text); + paint.setColor(color); + if (!isCurrentAngleUnits(text)) { + paint.setAlpha(directionTextAlpha); } } 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 78080b10..11be30c8 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 @@ -23,18 +23,16 @@ package org.solovyev.android.calculator.view; import android.content.Context; -import android.content.res.Resources; import android.graphics.Paint; import android.text.TextPaint; import android.util.AttributeSet; import jscl.NumeralBase; - -import javax.annotation.Nonnull; - import org.solovyev.android.calculator.Locator; import org.solovyev.android.calculator.core.R; import org.solovyev.android.view.drag.DirectionDragButton; +import javax.annotation.Nonnull; + /** * User: serso * Date: 12/8/11 @@ -51,18 +49,16 @@ public class NumeralBasesButton extends DirectionDragButton { } @Override - protected void initDirectionTextPaint(@Nonnull Paint basePaint, - @Nonnull DirectionTextData directionTextData, - @Nonnull Resources resources) { - super.initDirectionTextPaint(basePaint, directionTextData, resources); + protected void initDirectionTextPaint(@Nonnull Paint basePaint, @Nonnull DirectionTextData textData) { + super.initDirectionTextPaint(basePaint, textData); - final TextPaint directionTextPaint = directionTextData.getPaint(); + final String text = textData.getText(); + final TextPaint paint = textData.getPaint(); - final int color = getDirectionTextColor(directionTextData.getText()); - directionTextPaint.setColor(color); - - if (!isCurrentNumberBase(directionTextData.getText())) { - directionTextPaint.setAlpha(getDirectionTextAlpha()); + final int color = getDirectionTextColor(text); + paint.setColor(color); + if (!isCurrentNumberBase(text)) { + paint.setAlpha(directionTextAlpha); } } diff --git a/android-app-onscreen.iml b/android-app-onscreen.iml index 91e67b84..72836511 100644 --- a/android-app-onscreen.iml +++ b/android-app-onscreen.iml @@ -10,7 +10,7 @@ diff --git a/android-app-widget.iml b/android-app-widget.iml index 9e2e94e2..bf03cbd6 100644 --- a/android-app-widget.iml +++ b/android-app-widget.iml @@ -10,7 +10,7 @@ diff --git a/android-app.iml b/android-app.iml index 2c0819c8..f37065f1 100644 --- a/android-app.iml +++ b/android-app.iml @@ -10,7 +10,7 @@ diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java index 133874dd..4993a487 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java @@ -46,7 +46,6 @@ import org.solovyev.android.calculator.wizard.CalculatorWizards; import org.solovyev.android.fragments.FragmentUtils; import org.solovyev.android.prefs.Preference; import org.solovyev.android.wizard.Wizard; -import org.solovyev.android.wizard.WizardUi; import org.solovyev.android.wizard.Wizards; import org.solovyev.common.Objects; import org.solovyev.common.history.HistoryAction; @@ -110,7 +109,9 @@ public class CalculatorActivity extends SherlockFragmentActivity implements Shar FragmentUtils.createFragment(this, CalculatorKeyboardFragment.class, R.id.keyboardContainer, "keyboard"); this.useBackAsPrev = CalculatorPreferences.Gui.usePrevAsBack.getPreference(preferences); - firstTimeInit(preferences, this); + if (savedInstanceState == null) { + firstTimeInit(preferences, this); + } toggleOrientationChange(preferences); diff --git a/core.iml b/core.iml index b8fddd59..20433099 100644 --- a/core.iml +++ b/core.iml @@ -12,10 +12,10 @@ - - + + - + diff --git a/pom.xml b/pom.xml index 3bbc8d1a..2a2c16ab 100644 --- a/pom.xml +++ b/pom.xml @@ -71,8 +71,8 @@ UTF-8 - 1.1.11 - 1.0.6 + 1.1.15 + 1.0.7 1.0.7