Divider reset bugfix (issue #34)

gregkorossy · Jul 29, 2016 · e787c10 · e787c10
1 parent 627d854
commit e787c10
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...n/java/com/takisoft/fix/support/v7/preference/EditTextPreferenceDialogFragmentCompat.java b/...n/java/com/takisoft/fix/support/v7/preference/EditTextPreferenceDialogFragmentCompat.java
@@ -37,7 +37,7 @@ public EditTextPreferenceDialogFragmentCompat() {
     public static EditTextPreferenceDialogFragmentCompat newInstance(String key) {
         EditTextPreferenceDialogFragmentCompat fragment = new EditTextPreferenceDialogFragmentCompat();
         Bundle b = new Bundle(1);
-        b.putString("key", key);
+        b.putString(ARG_KEY, key);
         fragment.setArguments(b);
         return fragment;
     }

diff --git a/...rc/main/java/com/takisoft/fix/support/v7/preference/PreferenceFragmentCompatDividers.java b/...rc/main/java/com/takisoft/fix/support/v7/preference/PreferenceFragmentCompatDividers.java
@@ -146,6 +146,8 @@ protected void setDividerPreferences(@DividerPrefFlags @DividerPrefBase final in
     }
 
     void applyDividerPreference(final RecyclerView recyclerView, @DividerPrefFlags @DividerPrefBase final int flags) {
+        boolean decoratorRecreateNeeded = flags != divPrefFlags || divPrefInvalid;
+
         divPrefFlags = flags;
         divPrefInvalid = false;
 
@@ -173,6 +175,11 @@ void applyDividerPreference(final RecyclerView recyclerView, @DividerPrefFlags @
                 divPrefFlags = DIVIDER_PREFERENCE_BETWEEN;
             }
 
+            if (divItemDecoration != null && decoratorRecreateNeeded) {
+                recyclerView.removeItemDecoration(divItemDecoration);
+                divItemDecoration = null;
+            }
+
             if (divItemDecoration == null) {
                 divItemDecoration = new DividerItemDecoration(getDividerDrawable());
                 recyclerView.addItemDecoration(divItemDecoration);
@@ -201,6 +208,13 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         setDividerPreferences(divPrefFlags);
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        divPrefInvalid = true;
+    }
+
     @Override
     public void setDivider(Drawable divider) {
         super.setDivider(divider);