yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 2 Wiki Activity

fix(rules): reset edit sheets between additions

Browse Source
This commit is contained in:
HapeLee
2026-07-02 22:20:41 +08:00
parent b9a54d5ae2
commit cda772f835
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/highlightTagRule/HighlightTagRuleEditSheet.kt
+5 -5
View File
@@ -54,15 +54,15 @@ fun HighlightTagRuleEditSheet(
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
val isNew = rule == null || rule.id == 0L val isNew = rule == null || rule.id == 0L
val initial = remember(rule) { val initial = remember(show, rule) {
rule ?: HighlightTagRule() rule ?: HighlightTagRule()
} }
var title by remember(initial) { mutableStateOf(initial.title) } var title by remember(show, rule) { mutableStateOf(initial.title) }
var pattern by remember(initial) { mutableStateOf(initial.pattern) } var pattern by remember(show, rule) { mutableStateOf(initial.pattern) }
var enabled by remember(initial) { mutableStateOf(initial.enabled) } var enabled by remember(show, rule) { mutableStateOf(initial.enabled) }
var showMenu by remember { mutableStateOf(false) } var showMenu by remember(show, rule) { mutableStateOf(false) }
fun getCurrentRule(): HighlightTagRule { fun getCurrentRule(): HighlightTagRule {
return initial.copy( return initial.copy(
app/src/main/java/io/legado/app/ui/tagGroupRule/TagGroupRuleEditSheet.kt
+4 -4
View File
@@ -49,13 +49,13 @@ fun TagGroupRuleEditSheet(
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
val isNew = rule == null || rule.id == 0L val isNew = rule == null || rule.id == 0L
val initial = remember(rule) { val initial = remember(show, rule) {
rule ?: TagGroupRule() rule ?: TagGroupRule()
} }
var pattern by remember(initial) { mutableStateOf(initial.pattern) } var pattern by remember(show, rule) { mutableStateOf(initial.pattern) }
var groupName by remember(initial) { mutableStateOf(initial.groupName) } var groupName by remember(show, rule) { mutableStateOf(initial.groupName) }
var showMenu by remember { mutableStateOf(false) } var showMenu by remember(show, rule) { mutableStateOf(false) }
fun getCurrentRule(): TagGroupRule { fun getCurrentRule(): TagGroupRule {
return initial.copy( return initial.copy(
app/src/main/java/io/legado/app/ui/widget/components/rules/RuleEditSheet.kt
+5 -5
View File
@@ -62,12 +62,12 @@ fun <T> RuleEditSheet(
) { ) {
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
val initialFields = remember(rule) { toFields(rule) } val initialFields = remember(show, rule) { toFields(rule) }
var name by remember(initialFields) { mutableStateOf(initialFields.name) } var name by remember(show, rule) { mutableStateOf(initialFields.name) }
var rule1 by remember(initialFields) { mutableStateOf(initialFields.rule1) } var rule1 by remember(show, rule) { mutableStateOf(initialFields.rule1) }
var rule2 by remember(initialFields) { mutableStateOf(initialFields.rule2) } var rule2 by remember(show, rule) { mutableStateOf(initialFields.rule2) }
var showMenu by remember { mutableStateOf(false) } var showMenu by remember(show, rule) { mutableStateOf(false) }
fun getCurrentEntity() = fromFields(RuleEditFields(name, rule1, rule2), rule) fun getCurrentEntity() = fromFields(RuleEditFields(name, rule1, rule2), rule)