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

Calculation fixable messages

Browse Source
This commit is contained in:
Sergey Solovyev
2012-11-18 00:39:04 +04:00
parent ef11120244
commit 606a5ffc99
9 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
View File

@@ -32,16 +32,16 @@ public class AndroidCalculatorPreferenceService implements CalculatorPreferenceS
@Override
public void checkPreferredPreferences(boolean force) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(application);
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(application);
final Long currentTime = System.currentTimeMillis();
if ( force || isTimeForCheck(currentTime, preferences)) {
final NumeralBase preferredNumeralBase = CalculatorPreferences.Calculations.preferredNumeralBase.getPreference(preferences);
final NumeralBase numeralBase = AndroidCalculatorEngine.Preferences.numeralBase.getPreference(preferences);
if ( force || ( CalculatorPreferences.Calculations.showCalculationMessagesDialog.getPreference(prefs) && isTimeForCheck(currentTime, prefs))) {
final NumeralBase preferredNumeralBase = CalculatorPreferences.Calculations.preferredNumeralBase.getPreference(prefs);
final NumeralBase numeralBase = AndroidCalculatorEngine.Preferences.numeralBase.getPreference(prefs);
final AngleUnit preferredAngleUnits = CalculatorPreferences.Calculations.preferredAngleUnits.getPreference(preferences);
final AngleUnit angleUnits = AndroidCalculatorEngine.Preferences.angleUnit.getPreference(preferences);
final AngleUnit preferredAngleUnits = CalculatorPreferences.Calculations.preferredAngleUnits.getPreference(prefs);
final AngleUnit angleUnits = AndroidCalculatorEngine.Preferences.angleUnit.getPreference(prefs);
final List<CalculatorFixableMessage> messages = new ArrayList<CalculatorFixableMessage>(2);
if ( numeralBase != preferredNumeralBase ) {
@@ -54,7 +54,7 @@ public class AndroidCalculatorPreferenceService implements CalculatorPreferenceS
CalculatorMessagesDialog.showDialog(messages, application);
CalculatorPreferences.Calculations.lastPreferredPreferencesCheck.putPreference(preferences, currentTime);
CalculatorPreferences.Calculations.lastPreferredPreferencesCheck.putPreference(prefs, currentTime);
}
}

4
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@@ -79,7 +79,9 @@ public class CalculatorActivity extends SherlockFragmentActivity implements Shar
toggleOrientationChange(preferences);
preferences.registerOnSharedPreferenceChangeListener(this);
}
CalculatorLocatorImpl.getInstance().getPreferenceService().checkPreferredPreferences(false);
}
@NotNull
private AndroidCalculator getCalculator() {

2
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
View File

@@ -126,8 +126,6 @@ public class CalculatorApplication extends android.app.Application {
CalculatorLocatorImpl.getInstance().getLogger().debug(TAG, "Application started!");
CalculatorLocatorImpl.getInstance().getNotifier().showDebugMessage(TAG, "Application started!");
CalculatorLocatorImpl.getInstance().getPreferenceService().checkPreferredPreferences(true);
}
private void setTheme(@NotNull SharedPreferences preferences) {