New architecture

calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java

@@ -118,6 +118,11 @@ public class AndroidCalculator implements Calculator {
         calculator.evaluate();
     }
 
+    @Override
+    public void evaluate(@NotNull Long sequenceId) {
+        calculator.evaluate(sequenceId);
+    }
+
     @Override
     public void simplify() {
         calculator.simplify();

calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java

@@ -186,9 +186,6 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 			roundBracketsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new RoundBracketsDragProcessor(), dragPreferences), vibrator, preferences));
 		}
 
-
-        getEngine().softReset();
-
 		initMultiplicationButton();
 
         fixThemeParameters(true);

calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java

@@ -39,7 +39,7 @@ import java.util.List;
  * Time: 11:38 PM
  */
 
-public class AndroidCalculatorEngine implements CalculatorEngine {
+public class AndroidCalculatorEngine implements CalculatorEngine, SharedPreferences.OnSharedPreferenceChangeListener {
 
     private static final String GROUPING_SEPARATOR_P_KEY = "org.solovyev.android.calculator.CalculatorActivity_calc_grouping_separator";
 
@@ -104,6 +104,9 @@ public class AndroidCalculatorEngine implements CalculatorEngine {
 
     public AndroidCalculatorEngine(@NotNull Application application) {
         this.context = application;
+
+        PreferenceManager.getDefaultSharedPreferences(application).registerOnSharedPreferenceChangeListener(this);
+
         this.lock = new Object();
 
         final JsclMathEngine engine = JsclMathEngine.instance;
@@ -274,4 +277,12 @@ public class AndroidCalculatorEngine implements CalculatorEngine {
         return calculatorEngine.getMultiplicationSign();
     }
 
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if ( Preferences.getPreferenceKeys().contains(key) ) {
+            this.softReset();
+        }
+    }
+
 }