fixed the logic to enable to remove the selection of selected NP

Fate-Grand-Automata · Dec 30, 2023 · d2dd5cf · d2dd5cf
1 parent eab67af
commit d2dd5cf
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerAtk.kt b/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerAtk.kt
@@ -73,16 +73,23 @@ private fun SelectNps(
                 modifier = Modifier
                     .padding(5.dp),
                 onClick = {
-                    if (canSelect) {
-                        val newNpSequence = when (isSelected) {
-                            true -> npSequence.filter { m -> m.toString() != servantNumber.toString() }
-                            false -> npSequence + servantNumber
+                    val newNpSequence = when {
+                        canSelect -> {
+                            if (isSelected) {
+                                npSequence.filter { m -> m.toString() != servantNumber.toString() }
+                            } else {
+                                npSequence + servantNumber
+                            }
+                        }
+                        isSelected -> {
+                            npSequence.filter { m -> m.toString() != servantNumber.toString() }
+                        }
+                        else -> {
+                            npSequence.dropLast(1) + servantNumber
                         }
-                        onNpSequenceChange(newNpSequence)
-                    } else {
-                        val newNpSequence = npSequence.dropLast(1) + servantNumber
-                        onNpSequenceChange(newNpSequence)
                     }
+                    onNpSequenceChange(newNpSequence)
+
 
                 }
             ) {