Fixed delete all created of details after rotate in adddetailsactivity

CoolONEOfficial · May 6, 2018 · f1727c5 · f1727c5
1 parent 393a05b
commit f1727c5
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 6 deletions.
diff --git a/app/src/main/java/ru/coolone/travelquest/ui/activities/AddDetailsActivity.java b/app/src/main/java/ru/coolone/travelquest/ui/activities/AddDetailsActivity.java
@@ -36,6 +36,7 @@
 import lombok.val;
 import ru.coolone.travelquest.R;
 import ru.coolone.travelquest.ui.fragments.quests.details.FirebaseMethods;
+import ru.coolone.travelquest.ui.fragments.quests.details.add.PlaceDetailsAddAdapter;
 import ru.coolone.travelquest.ui.fragments.quests.details.add.PlaceDetailsAddFragment;
 import ru.coolone.travelquest.ui.fragments.quests.details.add.PlaceDetailsAddPagerAdapter;
 import uk.co.deanwild.materialshowcaseview.MaterialShowcaseSequence;
@@ -71,7 +72,7 @@ public class AddDetailsActivity extends AppCompatActivity implements FirebaseMet
 
     ProgressBar progressBar;
 
-    Fragment[] frags;
+    PlaceDetailsAddFragment[] frags;
 
     @AfterViews
     void afterViews() {
@@ -82,9 +83,10 @@ void afterViews() {
                 this
         );
         if(frags != null) {
-            pagerAdapter.tabFragments = (PlaceDetailsAddFragment[]) frags;
+            pagerAdapter.tabFragments = frags;
         }
         viewPager.setAdapter(pagerAdapter);
+        viewPager.setOffscreenPageLimit(MainActivity.SupportLang.values().length);
         ((PlaceDetailsAddFragment) pagerAdapter.getItem(viewPager.getCurrentItem()))
                 .addListener(
                         () -> {
@@ -228,13 +230,16 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Restore frags
         if(savedInstanceState != null) {
-            frags = new Fragment[MainActivity.SupportLang.values().length];
+            frags = new PlaceDetailsAddFragment[MainActivity.SupportLang.values().length];
             for(val mLang: MainActivity.SupportLang.values()) {
-                frags[mLang.ordinal()] = getSupportFragmentManager().getFragment(
+                frags[mLang.ordinal()] = (PlaceDetailsAddFragment) getSupportFragmentManager().getFragment(
                         savedInstanceState,
                         mLang.lang
                 );
             }
+            if(pagerAdapter != null) {
+                pagerAdapter.tabFragments = frags;
+            }
         }
     }
 

diff --git a/app/src/main/java/ru/coolone/travelquest/ui/adapters/BaseSectionedAdapter.java b/app/src/main/java/ru/coolone/travelquest/ui/adapters/BaseSectionedAdapter.java
@@ -11,6 +11,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * Created by radiationx on 14.09.17.
  */
@@ -19,6 +22,8 @@ public class BaseSectionedAdapter<
         H extends BaseSectionedHeader, HVH extends BaseSectionedViewHolder,
         I, IVH extends BaseSectionedViewHolder>
         extends SectionedRecyclerViewAdapter<IVH> {
+    @Getter
+    @Setter
     protected List<Pair<H, List<I>>> sections = new ArrayList<>();
 
     public void addSection(Pair<H, List<I>> item) {

diff --git a/app/src/main/java/ru/coolone/travelquest/ui/fragments/quests/PlacesFragment.java b/app/src/main/java/ru/coolone/travelquest/ui/fragments/quests/PlacesFragment.java
@@ -201,7 +201,9 @@ public void onCreate(Bundle savedInstanceState) {
                     savedInstanceState,
                     FRAG_PLACE_DETAILS_ID
             );
-            placeDetailsFragment.setFragmentListener(this);
+            if(placeDetailsFragment != null) {
+                placeDetailsFragment.setFragmentListener(this);
+            }
         }
     }
 

diff --git a/.../java/ru/coolone/travelquest/ui/fragments/quests/details/add/PlaceDetailsAddFragment.java b/.../java/ru/coolone/travelquest/ui/fragments/quests/details/add/PlaceDetailsAddFragment.java
@@ -1,5 +1,9 @@
 package ru.coolone.travelquest.ui.fragments.quests.details.add;
 
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.RecyclerView;
@@ -17,7 +21,9 @@
 import org.androidannotations.annotations.FragmentArg;
 import org.androidannotations.annotations.ViewById;
 
+import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 
 import lombok.val;
 import ru.coolone.travelquest.R;
@@ -39,6 +45,12 @@
 public class PlaceDetailsAddFragment extends Fragment {
     private static final String TAG = PlaceDetailsAddFragment.class.getSimpleName();
 
+    private static final String KEY_RECYCLER_INSTANCE = "recyclerInstance";
+    private static final String KEY_RECYCLER_SECTIONS = "recyclerInstance";
+
+    private Parcelable recyclerInstance;
+    private List<Pair<BaseSectionedHeader, List<BaseQuestDetailsItem>>> recyclerSections;
+
     @FragmentArg
     public SupportLang lang;
 
@@ -87,7 +99,30 @@ void afterViews() {
         );
         recyclerAdapter = (PlaceDetailsAddAdapter) recycler.getAdapter();
 
-        refreshDetails();
+        if (recyclerInstance == null && recyclerSections == null)
+            refreshDetails();
+        else {
+            recyclerAdapter.setSections(recyclerSections);
+            recycler.getLayoutManager().onRestoreInstanceState(recyclerInstance);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putParcelable(KEY_RECYCLER_INSTANCE, recycler.getLayoutManager().onSaveInstanceState());
+        outState.putSerializable(KEY_RECYCLER_SECTIONS, (Serializable) recyclerAdapter.getSections());
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if(savedInstanceState != null) {
+            recyclerInstance = savedInstanceState.getParcelable(KEY_RECYCLER_INSTANCE);
+            recyclerSections = (List<Pair<BaseSectionedHeader, List<BaseQuestDetailsItem>>>) savedInstanceState.getSerializable(KEY_RECYCLER_SECTIONS);
+        }
     }
 
     @Click(R.id.add_details_page_add_section_button)