From 7fe8bbd125098423a5e30e3d6b268d3f759a6015 Mon Sep 17 00:00:00 2001 From: reconman Date: Sun, 22 Sep 2024 14:21:06 +0200 Subject: [PATCH] Update compose to 2024.09.02 --- .../io/github/fate_grand_automata/ui/HoldRepeatClickable.kt | 4 ++-- .../ui/battle_config_item/BattleConfigScreen.kt | 2 +- .../fate_grand_automata/ui/battle_config_item/Materials.kt | 2 +- .../ui/battle_config_item/SkillCommandGroup.kt | 4 ++++ .../io/github/fate_grand_automata/ui/spam/SpamScreen.kt | 6 +++++- gradle/libs.versions.toml | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/HoldRepeatClickable.kt b/app/src/main/java/io/github/fate_grand_automata/ui/HoldRepeatClickable.kt index acbf01b61..7916ad2e0 100644 --- a/app/src/main/java/io/github/fate_grand_automata/ui/HoldRepeatClickable.kt +++ b/app/src/main/java/io/github/fate_grand_automata/ui/HoldRepeatClickable.kt @@ -5,7 +5,7 @@ import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.indication import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.PressInteraction -import androidx.compose.material.ripple.rememberRipple +import androidx.compose.material.ripple import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -88,6 +88,6 @@ fun Modifier.holdRepeatClickable( } .indication( interactionSource = interactionSource, - indication = rememberRipple() + indication = ripple() ) } \ No newline at end of file diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/BattleConfigScreen.kt b/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/BattleConfigScreen.kt index 6581f0834..02e04db4c 100644 --- a/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/BattleConfigScreen.kt +++ b/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/BattleConfigScreen.kt @@ -177,7 +177,7 @@ private fun BattleConfigContent( Card( modifier = Modifier .padding(horizontal = 16.dp) - .padding(bottom = 16.dp) + .padding(bottom = 5.dp) ) { Column { Row( diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/Materials.kt b/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/Materials.kt index 50c067cbc..07e53b0f5 100644 --- a/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/Materials.kt +++ b/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/Materials.kt @@ -93,7 +93,7 @@ fun Pref>.Materials() { modifier = Modifier .fillMaxWidth() .clickable { dialog.show() } - .heightIn(min = 70.dp) + .heightIn(min = 55.dp) .padding(vertical = 5.dp) ) { Text( diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/SkillCommandGroup.kt b/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/SkillCommandGroup.kt index 6c8c18059..01398c2ce 100644 --- a/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/SkillCommandGroup.kt +++ b/app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/SkillCommandGroup.kt @@ -1,6 +1,8 @@ package io.github.fate_grand_automata.ui.battle_config_item import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items @@ -99,6 +101,8 @@ fun SkillCommandSummary(skillCommand: List) { LazyRow( modifier = Modifier .padding(vertical = 2.dp) + .height(25.dp) // without this, the app crashes when opening battle configs + .fillMaxWidth() ) { items(skillCommand) { Card( diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/spam/SpamScreen.kt b/app/src/main/java/io/github/fate_grand_automata/ui/spam/SpamScreen.kt index 456ea76c5..9c90e82cd 100644 --- a/app/src/main/java/io/github/fate_grand_automata/ui/spam/SpamScreen.kt +++ b/app/src/main/java/io/github/fate_grand_automata/ui/spam/SpamScreen.kt @@ -2,10 +2,12 @@ package io.github.fate_grand_automata.ui.spam import androidx.compose.foundation.background import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyRow @@ -125,7 +127,9 @@ fun SpamScreen( item { LazyRow( - contentPadding = PaddingValues(16.dp, 5.dp) + contentPadding = PaddingValues(10.dp, 5.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + modifier = Modifier.fillMaxWidth() ) { items(vm.presets) { preset -> HeadingButton( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 46e7b9d41..04b5b26e8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ tesseract4android_version = "4.7.0" timber_version = "5.0.1" -compose_bom_version = "2024.06.00" +compose_bom_version = "2024.09.02"