Merge branch 'master' into soujuurou

Fate-Grand-Automata · Oct 2, 2024 · c8c49ca · c8c49ca
2 parents cb8c2eb + 1cdcb68
commit c8c49ca
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
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
@@ -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
@@ -93,7 +93,7 @@ fun Pref<Set<MaterialEnum>>.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
@@ -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<SkillMakerEntry>) {
     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
@@ -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
@@ -7,8 +7,8 @@ documentfile_version = "1.0.1"
 flow_preferences_version = "1.9.1"
 hilt_navigation_compose_version = "1.2.0"
 kotlinx_coroutines_core_version = "1.9.0"
-lifecycle_version = "2.8.4"
-hilt_version = "2.51.1"
+lifecycle_version = "2.8.6"
+hilt_version = "2.52"
 gson_version = "2.11.0"
 
 
@@ -19,24 +19,24 @@ gradle_version = "8.5.2"
 
 
 ben-manes_versions = "0.51.0"
-accompanist_version = "0.34.0"
+accompanist_version = "0.36.0"
 
 google_android_play_version = "2.1.0"
 
-activity_version = "1.9.1"
+activity_version = "1.9.2"
 mockk_version = "1.13.12"
-navigation_compose_version = "2.7.7"
+navigation_compose_version = "2.8.1"
 opencv_android_version = "4.8.1r2"
 recyclerview_version = "1.3.2"
 tesseract4android_version = "4.7.0"
 
 timber_version = "5.0.1"
 
-compose_bom_version = "2024.09.00"
+compose_bom_version = "2024.09.02"
 
 
 
-junit_bom_version = "5.10.2"
+junit_bom_version = "5.11.0"
 
 
 [libraries]