From 8d45fe5d637211879e533e4b12429558ad254ed3 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Sun, 12 Jan 2025 01:32:42 +0800 Subject: [PATCH] Fix Android 15 - OpenJDK API changes (#1949) Co-authored-by: reconman --- .../ui/card_priority/CardPriorityWaveSelector.kt | 2 +- .../fate_grand_automata/ui/skill_maker/SkillMakerViewModel.kt | 4 +++- 2 files changed, 4 insertions(+), 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 index cdf41187c..afad96631 100644 --- 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 index 3101eaba6..5c7cb7e27 100644 --- 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 @@ -39,7 +39,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)) } }