Merge branch 'add-saving-data-on-view-switch'

Author: gruszm

app/src/main/java/com/example/kalkulator/activities/AdvancedCalculatorActivity.java

@@ -33,6 +33,14 @@ protected void onCreate(Bundle savedInstanceState)
         CalculatorHandler.setPrevValueTextView(findViewById(R.id.previous_value_text_view));
         CalculatorHandler.setNewValueFlag(false);
 
+        if (savedInstanceState != null)
+        {
+            valueTextView.setText(savedInstanceState.getString("valueText"));
+            operationTextView.setText(savedInstanceState.getString("opText"));
+            prevValueTextView.setText(savedInstanceState.getString("prevValueText"));
+            newValueFlag = savedInstanceState.getBoolean("newValueFlag");
+        }
+
         btn0 = findViewById(R.id.btn0);
         btn1 = findViewById(R.id.btn1);
         btn2 = findViewById(R.id.btn2);
@@ -94,6 +102,16 @@ protected void onCreate(Bundle savedInstanceState)
         btnPercent.setOnClickListener(this::percentOnClick);
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState)
+    {
+        super.onSaveInstanceState(outState);
+        outState.putString("valueText", valueTextView.getText().toString());
+        outState.putString("opText", operationTextView.getText().toString());
+        outState.putString("prevValueText", prevValueTextView.getText().toString());
+        outState.putBoolean("newValueFlag", newValueFlag);
+    }
+
     public void percentOnClick(View v)
     {
         if (!prevValueTextView.getText().toString().isEmpty())

app/src/main/java/com/example/kalkulator/activities/SimpleCalculatorActivity.java

@@ -31,6 +31,14 @@ protected void onCreate(Bundle savedInstanceState)
         CalculatorHandler.setPrevValueTextView(findViewById(R.id.previous_value_text_view));
         CalculatorHandler.setNewValueFlag(false);
 
+        if (savedInstanceState != null)
+        {
+            valueTextView.setText(savedInstanceState.getString("valueText"));
+            operationTextView.setText(savedInstanceState.getString("opText"));
+            prevValueTextView.setText(savedInstanceState.getString("prevValueText"));
+            newValueFlag = savedInstanceState.getBoolean("newValueFlag");
+        }
+
         btn0 = findViewById(R.id.btn0);
         btn1 = findViewById(R.id.btn1);
         btn2 = findViewById(R.id.btn2);
@@ -74,6 +82,16 @@ protected void onCreate(Bundle savedInstanceState)
         btnClearOrClearAll.setOnClickListener(this::clearOrClearAllOnClick);
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState)
+    {
+        super.onSaveInstanceState(outState);
+        outState.putString("valueText", valueTextView.getText().toString());
+        outState.putString("opText", operationTextView.getText().toString());
+        outState.putString("prevValueText", prevValueTextView.getText().toString());
+        outState.putBoolean("newValueFlag", newValueFlag);
+    }
+
     private void clearOrClearAllOnClick(View view)
     {
         String valueText = valueTextView.getText().toString();