Feature restore spinner values on rotate

app/src/cnm/java/org/eyeseetea/malariacare/views/question/multiquestion/IFillSavedInstanceValues.java

@@ -0,0 +1,8 @@
+package org.eyeseetea.malariacare.views.question.multiquestion;
+
+import android.os.Bundle;
+
+public interface IFillSavedInstanceValues{
+        Bundle fillSavedInstanceValues(Bundle savedInstanceValues);
+        void restoreSavedInstanceValues(Bundle savedInstanceValues);
+}

app/src/cnm/java/org/eyeseetea/malariacare/views/question/multiquestion/OuTreeMultiQuestionView.java

@@ -1,6 +1,7 @@
 package org.eyeseetea.malariacare.views.question.multiquestion;
 
 import android.content.Context;
+import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Spinner;
@@ -13,16 +14,17 @@
 import org.eyeseetea.malariacare.views.question.AOptionQuestionView;
 import org.eyeseetea.malariacare.views.question.IMultiQuestionView;
 import org.eyeseetea.malariacare.views.question.IQuestionView;
+import org.eyeseetea.sdk.presentation.views.CustomSpinner;
 import org.eyeseetea.sdk.presentation.views.CustomTextView;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 public class OuTreeMultiQuestionView extends AOptionQuestionView implements IQuestionView,
-        IMultiQuestionView {
+        IMultiQuestionView, IFillSavedInstanceValues {
     private CustomTextView header;
-    private Spinner spinnerProvince, spinnerDistrict, spinnerCommune, spinnerVillage;
+    private CustomSpinner spinnerProvince, spinnerDistrict, spinnerCommune, spinnerVillage;
     private QuestionDB mQuestionDB;
     private boolean optionSetFromSavedValue = false;
     private List<OptionDB> mOptionDBs;
@@ -37,10 +39,10 @@ public OuTreeMultiQuestionView(Context context) {
     private void init(Context context) {
         inflate(context, R.layout.multi_question_dropdown_tree, this);
         header = (CustomTextView) findViewById(R.id.row_header_text);
-        spinnerProvince = (Spinner) findViewById(R.id.spinner_province);
-        spinnerDistrict = (Spinner) findViewById(R.id.spinner_district);
-        spinnerCommune = (Spinner) findViewById(R.id.spinner_commune);
-        spinnerVillage = (Spinner) findViewById(R.id.spinner_village);
+        spinnerProvince = (CustomSpinner) findViewById(R.id.spinner_province);
+        spinnerDistrict = (CustomSpinner) findViewById(R.id.spinner_district);
+        spinnerCommune = (CustomSpinner) findViewById(R.id.spinner_commune);
+        spinnerVillage = (CustomSpinner) findViewById(R.id.spinner_village);
         mContext = context;
 
         setSpinnerOnItemSelectedListener(spinnerProvince, spinnerDistrict,
@@ -180,4 +182,59 @@ public void onNothingSelected(AdapterView<?> adapterView) {
             }
         });
     }
+
+    @Override
+    public Bundle fillSavedInstanceValues(Bundle savedInstanceValues) {
+        if(spinnerProvince.getSelectedItemPosition()!=0){
+            savedInstanceValues.putInt("R.id.spinner_province", spinnerProvince.getSelectedItemPosition());
+        }
+        if(spinnerDistrict.getSelectedItemPosition()!=0){
+            savedInstanceValues.putInt("R.id.spinner_district",
+                    spinnerDistrict.getSelectedItemPosition());
+        }
+        if(spinnerCommune.getSelectedItemPosition()!=0){
+            savedInstanceValues.putInt("R.id.spinner_commune", spinnerCommune.getSelectedItemPosition());
+        }
+        if(spinnerVillage.getSelectedItemPosition()!=0){
+            savedInstanceValues.putInt("R.id.spinner_village", spinnerVillage.getSelectedItemPosition());
+        }
+        return savedInstanceValues;
+    }
+
+    @Override
+    public void restoreSavedInstanceValues(Bundle savedInstanceValues) {
+        if(savedInstanceValues.containsKey("R.id.spinner_province")){
+            Integer selectedItem = savedInstanceValues.getInt("R.id.spinner_province");
+            if(selectedItem!=null) {
+                spinnerProvince.setSelection(selectedItem, true, true);
+                OptionDB seltectedOptionDB = (OptionDB)spinnerProvince.getSelectedItem();
+                setOptionsWithParent(spinnerDistrict, seltectedOptionDB.getId_option(),
+                        mContext.getString(R.string.district));
+            }
+        }
+        if(savedInstanceValues.containsKey("R.id.spinner_district")){
+            Integer selectedItem = savedInstanceValues.getInt("R.id.spinner_district");
+            if(selectedItem!=null) {
+                spinnerDistrict.setSelection(selectedItem, true, true);
+                OptionDB seltectedOptionDB = (OptionDB)spinnerDistrict.getSelectedItem();
+                setOptionsWithParent(spinnerCommune, seltectedOptionDB.getId_option(),
+                        mContext.getString(R.string.district));
+            }
+        }
+        if(savedInstanceValues.containsKey("R.id.spinner_commune")){
+            Integer selectedItem = savedInstanceValues.getInt("R.id.spinner_commune");
+            if(selectedItem!=null) {
+                spinnerCommune.setSelection(selectedItem, true, true);
+                OptionDB seltectedOptionDB = (OptionDB)spinnerCommune.getSelectedItem();
+                setOptionsWithParent(spinnerVillage, seltectedOptionDB.getId_option(),
+                        mContext.getString(R.string.district));
+            }
+        }
+        if(savedInstanceValues.containsKey("R.id.spinner_village")){
+            Integer selectedItem = savedInstanceValues.getInt("R.id.spinner_village");
+            if(selectedItem!=null) {
+                spinnerVillage.setSelection(selectedItem);
+            }
+        }
+    }
 }

app/src/cnm/res/layout/multi_question_dropdown_tree.xml

@@ -24,7 +24,7 @@
         app:font_name="@string/normal_font" />
 
 
-    <Spinner
+    <org.eyeseetea.sdk.presentation.views.CustomSpinner
         android:id="@+id/spinner_province"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
         android:paddingTop="2dip"
         android:textColor="@color/black" />
 
-    <Spinner
+    <org.eyeseetea.sdk.presentation.views.CustomSpinner
         android:id="@+id/spinner_district"
         android:layout_width="match_parent"
         android:layout_marginTop="10dp"
@@ -54,7 +54,7 @@
         android:background="@drawable/spinner_background"
         android:textColor="@color/black" />
 
-    <Spinner
+    <org.eyeseetea.sdk.presentation.views.CustomSpinner
         android:id="@+id/spinner_commune"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
         android:background="@drawable/spinner_background"
         android:textColor="@color/black" />
 
-    <Spinner
+    <org.eyeseetea.sdk.presentation.views.CustomSpinner
         android:id="@+id/spinner_village"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/java/org/eyeseetea/malariacare/fragments/SurveyFragment.java

@@ -20,7 +20,9 @@
 
 import android.app.Activity;
 import android.app.Fragment;
+import android.content.res.Configuration;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -231,4 +233,18 @@ private void showSurvey() {
             new LoadingSurveyException(e);
         }
     }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        saveInstanceState();
+    }
+
+    public void saveInstanceState() {
+        dynamicTabAdapter.fillSaveInstanceState();
+    }
+
+    public void restoreInstanceState() {
+        dynamicTabAdapter.restoreSaveInstanceState();
+    }
 }

app/src/main/java/org/eyeseetea/malariacare/layout/adapters/survey/DynamicTabAdapter.java

@@ -28,6 +28,8 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Typeface;
+import android.os.Bundle;
+import android.os.Parcelable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -57,6 +59,7 @@
 import org.eyeseetea.malariacare.data.database.utils.PreferencesState;
 import org.eyeseetea.malariacare.data.database.utils.Session;
 import org.eyeseetea.malariacare.domain.entity.Validation;
+import org.eyeseetea.malariacare.fragments.SurveyFragment;
 import org.eyeseetea.malariacare.layout.adapters.survey.navigation.NavigationController;
 import org.eyeseetea.malariacare.layout.adapters.survey.strategies.ADynamicTabAdapterStrategy;
 import org.eyeseetea.malariacare.layout.adapters.survey.strategies.DynamicTabAdapterStrategy;
@@ -81,6 +84,7 @@
 import org.eyeseetea.malariacare.views.question.IQuestionView;
 import org.eyeseetea.malariacare.views.question.multiquestion.DatePickerQuestionView;
 import org.eyeseetea.malariacare.views.question.multiquestion.DropdownMultiQuestionView;
+import org.eyeseetea.malariacare.views.question.multiquestion.IFillSavedInstanceValues;
 import org.eyeseetea.malariacare.views.question.multiquestion.YearSelectorQuestionView;
 import org.eyeseetea.malariacare.views.question.singlequestion.ImageRadioButtonSingleQuestionView;
 import org.eyeseetea.malariacare.views.question.singlequestion.strategies
@@ -134,6 +138,7 @@ public class DynamicTabAdapter extends BaseAdapter implements ITabAdapter {
     public static SwipeTouchListener swipeTouchListener;
     private boolean mReviewMode = false;
     private boolean isBackward = true;
+    Bundle savedInstanceState;
 
     public DynamicTabAdapter(Context context, boolean reviewMode) throws NullPointerException {
         mReviewMode = reviewMode;
@@ -552,7 +557,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         rowView.requestLayout();
         reloadingQuestionFromInvalidOption = false;
-
+        restoreSaveInstanceState();
         return rowView;
     }
 
@@ -1145,4 +1150,24 @@ private void saveSwitchOption(QuestionDB questionDB, boolean isChecked) {
         questionDB.saveValuesDDL(selectedOptionDB, questionDB.getValueBySession());
         showOrHideChildren(questionDB);
     }
+
+    public void fillSaveInstanceState() {
+        savedInstanceState = new Bundle();
+        for(IMultiQuestionView multiQuestionView:mMultiQuestionViews){
+            if(multiQuestionView instanceof IFillSavedInstanceValues){
+                ((IFillSavedInstanceValues)multiQuestionView).fillSavedInstanceValues(savedInstanceState);
+            }
+        }
+    }
+
+    public void restoreSaveInstanceState() {
+        if(savedInstanceState!=null) {
+            for (IMultiQuestionView multiQuestionView : mMultiQuestionViews) {
+                if (multiQuestionView instanceof IFillSavedInstanceValues) {
+                    ((IFillSavedInstanceValues) multiQuestionView).restoreSavedInstanceValues(
+                            savedInstanceState);
+                }
+            }
+        }
+    }
 }