Collapse multiple is an independent option

pull/206/head
M66B 3 years ago
parent ee15f7851a
commit 244bbb0e32

@ -338,7 +338,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("expand_all", checked).apply(); prefs.edit().putBoolean("expand_all", checked).apply();
swExpandOne.setEnabled(!checked); swExpandOne.setEnabled(!checked);
swCollapseMultiple.setEnabled(!swExpandOne.isChecked() || swExpandAll.isChecked());
} }
}); });
@ -346,7 +345,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
@Override @Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("expand_one", checked).apply(); prefs.edit().putBoolean("expand_one", checked).apply();
swCollapseMultiple.setEnabled(!swExpandOne.isChecked() || swExpandAll.isChecked());
} }
}); });
@ -528,7 +526,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
swExpandOne.setChecked(prefs.getBoolean("expand_one", true)); swExpandOne.setChecked(prefs.getBoolean("expand_one", true));
swExpandOne.setEnabled(!swExpandAll.isChecked()); swExpandOne.setEnabled(!swExpandAll.isChecked());
swCollapseMultiple.setChecked(prefs.getBoolean("collapse_multiple", true)); swCollapseMultiple.setChecked(prefs.getBoolean("collapse_multiple", true));
swCollapseMultiple.setEnabled(!swExpandOne.isChecked() || swExpandAll.isChecked());
swAutoClose.setChecked(prefs.getBoolean("autoclose", true)); swAutoClose.setChecked(prefs.getBoolean("autoclose", true));

@ -458,7 +458,6 @@
android:id="@+id/swCollapseMultiple" android:id="@+id/swCollapseMultiple"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_advanced_collapse_multiple" android:text="@string/title_advanced_collapse_multiple"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

Loading…
Cancel
Save