mirror of
https://github.com/Suwayomi/Suwayomi-Server.git
synced 2026-07-04 19:34:35 -05:00
Add enabled preference setting (#1539)
* Add enabled preference setting * Don't change preference if its not enabled
This commit is contained in:
@@ -23,6 +23,7 @@ public class Preference {
|
|||||||
protected Context context;
|
protected Context context;
|
||||||
|
|
||||||
private boolean isVisible;
|
private boolean isVisible;
|
||||||
|
private boolean isEnabled = true;
|
||||||
private String key;
|
private String key;
|
||||||
private CharSequence title;
|
private CharSequence title;
|
||||||
private CharSequence summary;
|
private CharSequence summary;
|
||||||
@@ -68,7 +69,11 @@ public class Preference {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setEnabled(boolean enabled) {
|
public void setEnabled(boolean enabled) {
|
||||||
throw new RuntimeException("Stub!");
|
isEnabled = enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isEnabled() {
|
||||||
|
return isEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getKey() {
|
public String getKey() {
|
||||||
|
|||||||
@@ -342,6 +342,7 @@ data class SwitchPreference(
|
|||||||
val title: String?,
|
val title: String?,
|
||||||
val summary: String?,
|
val summary: String?,
|
||||||
val visible: Boolean,
|
val visible: Boolean,
|
||||||
|
val enabled: Boolean,
|
||||||
val currentValue: Boolean?,
|
val currentValue: Boolean?,
|
||||||
val default: Boolean,
|
val default: Boolean,
|
||||||
) : Preference
|
) : Preference
|
||||||
@@ -351,6 +352,7 @@ data class CheckBoxPreference(
|
|||||||
val title: String?,
|
val title: String?,
|
||||||
val summary: String?,
|
val summary: String?,
|
||||||
val visible: Boolean,
|
val visible: Boolean,
|
||||||
|
val enabled: Boolean,
|
||||||
val currentValue: Boolean?,
|
val currentValue: Boolean?,
|
||||||
val default: Boolean,
|
val default: Boolean,
|
||||||
) : Preference
|
) : Preference
|
||||||
@@ -360,6 +362,7 @@ data class EditTextPreference(
|
|||||||
val title: String?,
|
val title: String?,
|
||||||
val summary: String?,
|
val summary: String?,
|
||||||
val visible: Boolean,
|
val visible: Boolean,
|
||||||
|
val enabled: Boolean,
|
||||||
val currentValue: String?,
|
val currentValue: String?,
|
||||||
val default: String?,
|
val default: String?,
|
||||||
val dialogTitle: String?,
|
val dialogTitle: String?,
|
||||||
@@ -372,6 +375,7 @@ data class ListPreference(
|
|||||||
val title: String?,
|
val title: String?,
|
||||||
val summary: String?,
|
val summary: String?,
|
||||||
val visible: Boolean,
|
val visible: Boolean,
|
||||||
|
val enabled: Boolean,
|
||||||
val currentValue: String?,
|
val currentValue: String?,
|
||||||
val default: String?,
|
val default: String?,
|
||||||
val entries: List<String>,
|
val entries: List<String>,
|
||||||
@@ -383,6 +387,7 @@ data class MultiSelectListPreference(
|
|||||||
val title: String?,
|
val title: String?,
|
||||||
val summary: String?,
|
val summary: String?,
|
||||||
val visible: Boolean,
|
val visible: Boolean,
|
||||||
|
val enabled: Boolean,
|
||||||
val currentValue: List<String>?,
|
val currentValue: List<String>?,
|
||||||
val default: List<String>?,
|
val default: List<String>?,
|
||||||
val dialogTitle: String?,
|
val dialogTitle: String?,
|
||||||
@@ -399,6 +404,7 @@ fun preferenceOf(preference: SourcePreference): Preference =
|
|||||||
preference.title?.toString(),
|
preference.title?.toString(),
|
||||||
preference.summary?.toString(),
|
preference.summary?.toString(),
|
||||||
preference.visible,
|
preference.visible,
|
||||||
|
preference.isEnabled,
|
||||||
preference.currentValue as Boolean,
|
preference.currentValue as Boolean,
|
||||||
preference.defaultValue as Boolean,
|
preference.defaultValue as Boolean,
|
||||||
)
|
)
|
||||||
@@ -408,6 +414,7 @@ fun preferenceOf(preference: SourcePreference): Preference =
|
|||||||
preference.title?.toString(),
|
preference.title?.toString(),
|
||||||
preference.summary?.toString(),
|
preference.summary?.toString(),
|
||||||
preference.visible,
|
preference.visible,
|
||||||
|
preference.isEnabled,
|
||||||
preference.currentValue as Boolean,
|
preference.currentValue as Boolean,
|
||||||
preference.defaultValue as Boolean,
|
preference.defaultValue as Boolean,
|
||||||
)
|
)
|
||||||
@@ -417,6 +424,7 @@ fun preferenceOf(preference: SourcePreference): Preference =
|
|||||||
preference.title?.toString(),
|
preference.title?.toString(),
|
||||||
preference.summary?.toString(),
|
preference.summary?.toString(),
|
||||||
preference.visible,
|
preference.visible,
|
||||||
|
preference.isEnabled,
|
||||||
(preference.currentValue as CharSequence?)?.toString(),
|
(preference.currentValue as CharSequence?)?.toString(),
|
||||||
(preference.defaultValue as CharSequence?)?.toString(),
|
(preference.defaultValue as CharSequence?)?.toString(),
|
||||||
preference.dialogTitle?.toString(),
|
preference.dialogTitle?.toString(),
|
||||||
@@ -429,6 +437,7 @@ fun preferenceOf(preference: SourcePreference): Preference =
|
|||||||
preference.title?.toString(),
|
preference.title?.toString(),
|
||||||
preference.summary?.toString(),
|
preference.summary?.toString(),
|
||||||
preference.visible,
|
preference.visible,
|
||||||
|
preference.isEnabled,
|
||||||
(preference.currentValue as CharSequence?)?.toString(),
|
(preference.currentValue as CharSequence?)?.toString(),
|
||||||
(preference.defaultValue as CharSequence?)?.toString(),
|
(preference.defaultValue as CharSequence?)?.toString(),
|
||||||
preference.entries.map { it.toString() },
|
preference.entries.map { it.toString() },
|
||||||
@@ -440,6 +449,7 @@ fun preferenceOf(preference: SourcePreference): Preference =
|
|||||||
preference.title?.toString(),
|
preference.title?.toString(),
|
||||||
preference.summary?.toString(),
|
preference.summary?.toString(),
|
||||||
preference.visible,
|
preference.visible,
|
||||||
|
preference.isEnabled,
|
||||||
(preference.currentValue as Collection<*>?)?.map { it.toString() },
|
(preference.currentValue as Collection<*>?)?.map { it.toString() },
|
||||||
(preference.defaultValue as Collection<*>?)?.map { it.toString() },
|
(preference.defaultValue as Collection<*>?)?.map { it.toString() },
|
||||||
preference.dialogTitle?.toString(),
|
preference.dialogTitle?.toString(),
|
||||||
|
|||||||
@@ -142,6 +142,10 @@ object Source {
|
|||||||
val screen = preferenceScreenMap[sourceId]!!
|
val screen = preferenceScreenMap[sourceId]!!
|
||||||
val pref = screen.preferences[position]
|
val pref = screen.preferences[position]
|
||||||
|
|
||||||
|
if (!pref.isEnabled) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
val newValue = getValue(pref)
|
val newValue = getValue(pref)
|
||||||
|
|
||||||
pref.saveNewValue(newValue)
|
pref.saveNewValue(newValue)
|
||||||
|
|||||||
Reference in New Issue
Block a user