Rename "Undo" button to "Delete selected"

Fate-Grand-Automata · Dec 31, 2023 · 1874953 · 1874953
1 parent f264c6a
commit 1874953
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 deletions.
diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerMain.kt b/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerMain.kt
@@ -23,6 +23,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.RadioButton
@@ -90,9 +91,9 @@ fun SkillMakerMain(
                     val currentIndex by vm.currentIndex
 
                     ButtonWithIcon(
-                        text = R.string.skill_maker_main_undo,
-                        icon = icon(R.drawable.ic_undo),
-                        onClick = { vm.onUndo() },
+                        text = R.string.skill_maker_main_delete_selected,
+                        icon = icon(Icons.Default.Delete),
+                        onClick = { vm.onDeleteSelected() },
                         enabled = currentIndex > 0,
                         modifier = Modifier.padding(end = 5.dp)
                     )

diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerViewModel.kt b/app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerViewModel.kt
@@ -97,7 +97,7 @@ class SkillMakerViewModel @Inject constructor(
         ++_currentIndex.value
     }
 
-    private fun undo() {
+    private fun deleteSelected() {
         model.skillCommand.removeAt(currentIndex.value)
         --_currentIndex.value
     }
@@ -181,7 +181,7 @@ class SkillMakerViewModel @Inject constructor(
         _currentIndex.value = model.skillCommand.lastIndex
 
         while (last.let { l -> l is SkillMakerEntry.Next && l.action == AutoSkillAction.Atk.noOp() }) {
-            undo()
+            deleteSelected()
         }
 
         return getSkillCmdString()
@@ -216,7 +216,7 @@ class SkillMakerViewModel @Inject constructor(
                 lastAction.action is AutoSkillAction.MasterSkill &&
                 lastAction.action.skill == Skill.Master.C
             ) {
-                undo()
+                deleteSelected()
             }
         }
 
@@ -257,14 +257,14 @@ class SkillMakerViewModel @Inject constructor(
         _enemyTarget.value = target
     }
 
-    private fun undoStageOrTurn() {
+    private fun deleteStageOrTurn() {
         // Decrement Battle/Turn count
         if (last is SkillMakerEntry.Next.Wave) {
             prevStage()
         }
 
         // Undo the Battle/Turn change
-        undo()
+        deleteSelected()
 
         revertToPreviousEnemyTarget()
     }
@@ -273,24 +273,24 @@ class SkillMakerViewModel @Inject constructor(
         _currentIndex.value = model.skillCommand.lastIndex
 
         while (!isEmpty()) {
-            onUndo()
+            onDeleteSelected()
         }
     }
 
-    fun onUndo() {
+    fun onDeleteSelected() {
         if (!isEmpty()) {
             // Un-select target
             when (val last = last) {
                 // Battle/Turn change
                 is SkillMakerEntry.Next -> {
-                    undoStageOrTurn()
+                    deleteStageOrTurn()
                 }
 
                 is SkillMakerEntry.Action -> {
                     if (last.action is AutoSkillAction.TargetEnemy) {
-                        undo()
+                        deleteSelected()
                         revertToPreviousEnemyTarget()
-                    } else undo()
+                    } else deleteSelected()
                 }
                 // Do nothing
                 is SkillMakerEntry.Start -> {

diff --git a/app/src/main/res/values-b+zh+CN/localized.xml b/app/src/main/res/values-b+zh+CN/localized.xml
@@ -37,7 +37,6 @@
     <string name="skill_maker_main_enemy">"敌人 %d"</string>
     <string name="skill_maker_main_battle">"战斗 %d"</string>
     <string name="skill_maker_main_master_skills">"御主技能"</string>
-    <string name="skill_maker_main_undo">"复原"</string>
     <string name="skill_maker_main_clear">"重设"</string>
     <string name="skill_maker_main_servant">"从者 %d"</string>
     <string name="skill_maker_main_attack">"攻击"</string>

diff --git a/app/src/main/res/values-b+zh+TW/localized.xml b/app/src/main/res/values-b+zh+TW/localized.xml
@@ -37,7 +37,6 @@
     <string name="skill_maker_main_enemy">敵人 %d</string>
     <string name="skill_maker_main_battle">BATTLE %d</string>
     <string name="skill_maker_main_master_skills">御主技能</string>
-    <string name="skill_maker_main_undo">復原</string>
     <string name="skill_maker_main_clear">重設</string>
     <string name="skill_maker_main_servant">從者 %d</string>
     <string name="skill_maker_main_attack">Attack</string>

diff --git a/app/src/main/res/values-ja/localized.xml b/app/src/main/res/values-ja/localized.xml
@@ -38,7 +38,6 @@
     <string name="skill_maker_main_battle">"Battle: %d"</string>
     <string name="skill_maker_main_master_skills">"マスター
 スキル"</string>
-    <string name="skill_maker_main_undo">"削除"</string>
     <string name="skill_maker_main_clear">"全削除"</string>
     <string name="skill_maker_main_servant">"サーヴァント %d"</string>
     <string name="skill_maker_main_attack">"Attack"</string>

diff --git a/app/src/main/res/values-ko/localized.xml b/app/src/main/res/values-ko/localized.xml
@@ -38,7 +38,6 @@
     <string name="skill_maker_main_battle">"배틀: %d"</string>
     <string name="skill_maker_main_master_skills">"마스터
 스킬"</string>
-    <string name="skill_maker_main_undo">"되돌리기"</string>
     <string name="skill_maker_main_clear">"초기화"</string>
     <string name="skill_maker_main_servant">"서번트 %d"</string>
     <string name="skill_maker_main_attack">"공격"</string>

diff --git a/app/src/main/res/values-vi/localized.xml b/app/src/main/res/values-vi/localized.xml
@@ -37,7 +37,6 @@ Bảo Khí"</string>
     <string name="skill_maker_main_battle">"Trận đấu: %d"</string>
     <string name="skill_maker_main_master_skills">"Kĩ năng 
 Master"</string>
-    <string name="skill_maker_main_undo">"Làm lại"</string>
     <string name="skill_maker_main_clear">"Dọn sạch"</string>
     <string name="skill_maker_main_servant">"Servant %d"</string>
     <string name="skill_maker_main_attack">"Tấn công"</string>

diff --git a/app/src/main/res/values/localized.xml b/app/src/main/res/values/localized.xml
@@ -38,7 +38,7 @@ in same wave"</string>
     <string name="skill_maker_main_battle">"Battle: %d"</string>
     <string name="skill_maker_main_master_skills">"Master
 Skills"</string>
-    <string name="skill_maker_main_undo">"Undo"</string>
+    <string name="skill_maker_main_delete_selected">"Delete selected"</string>
     <string name="skill_maker_main_clear">"Clear"</string>
     <string name="skill_maker_main_servant">"Servant %d"</string>
     <string name="skill_maker_main_attack">"Attack"</string>