Merge branch 'master' into cs-refill

Fate-Grand-Automata · Jan 16, 2025 · 611964b · 611964b
2 parents 3b9fbf4 + 8d45fe5
commit 611964b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/card_priority/CardPriorityWaveSelector.kt b/app/src/main/java/io/github/fate_grand_automata/ui/card_priority/CardPriorityWaveSelector.kt
@@ -75,7 +75,7 @@ fun CardPriorityWaveSelector(
                                             if (selectedWave == items.lastIndex) {
                                                 onSelectedWaveChange(items.lastIndex - 1)
                                             }
-                                            items.removeLast()
+                                            items.removeAt(items.lastIndex)
                                         }
                                     }
                             ) {

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
@@ -45,7 +45,9 @@ class SkillMakerViewModel @Inject constructor(
         if (skillString.isNotEmpty()) {
             m.skillCommand.last().let { l ->
                 if (l is SkillMakerEntry.Action && l.action is AutoSkillAction.Atk) {
-                    m.skillCommand.removeLast()
+                    // openjdk problem with android 15
+                    // https://developer.android.com/about/versions/15/behavior-changes-15#openjdk-api-changes
+                    m.skillCommand.removeAt(m.skillCommand.lastIndex)
                     m.skillCommand.add(SkillMakerEntry.Next.Wave(l.action))
                 }
             }