change AppFABPadding to 90.dp

aliernfrog · Dec 21, 2024 · 8e3dabc · 8e3dabc
1 parent 4124219
commit 8e3dabc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsEditScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsEditScreen.kt
@@ -31,7 +31,7 @@ import com.aliernfrog.lactool.ui.component.form.ExpandableRow
 import com.aliernfrog.lactool.ui.component.form.FormSection
 import com.aliernfrog.lactool.ui.component.form.SwitchRow
 import com.aliernfrog.lactool.ui.dialog.SaveWarningDialog
-import com.aliernfrog.lactool.ui.theme.AppFABHeight
+import com.aliernfrog.lactool.ui.theme.AppFABPadding
 import com.aliernfrog.lactool.ui.viewmodel.MapsEditViewModel
 import com.aliernfrog.lactool.util.Destination
 import com.aliernfrog.lactool.util.extension.getName
@@ -82,7 +82,7 @@ fun MapsEditScreen(
             )
             OptionsActions()
             MiscActions()
-            Spacer(Modifier.navigationBarsPadding().height(AppFABHeight))
+            Spacer(Modifier.navigationBarsPadding().height(AppFABPadding))
         }
     }
     if (mapsEditViewModel.saveWarningShown) SaveWarningDialog(

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsListScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsListScreen.kt
@@ -74,7 +74,7 @@ import com.aliernfrog.lactool.ui.component.SegmentedButtons
 import com.aliernfrog.lactool.ui.component.SettingsButton
 import com.aliernfrog.lactool.ui.component.maps.GridMapItem
 import com.aliernfrog.lactool.ui.component.maps.ListMapItem
-import com.aliernfrog.lactool.ui.theme.AppFABHeight
+import com.aliernfrog.lactool.ui.theme.AppFABPadding
 import com.aliernfrog.lactool.ui.viewmodel.MapsListViewModel
 import com.aliernfrog.lactool.ui.viewmodel.MapsViewModel
 import com.aliernfrog.lactool.util.staticutil.UriUtil
@@ -343,7 +343,7 @@ private fun Header(
 
 @Composable
 private fun Footer() {
-    Spacer(Modifier.navigationBarsPadding().height(AppFABHeight))
+    Spacer(Modifier.navigationBarsPadding().height(AppFABPadding))
 }
 
 @OptIn(ExperimentalMaterial3Api::class)

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsMergeScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsMergeScreen.kt
@@ -36,7 +36,7 @@ import com.aliernfrog.lactool.ui.component.form.FormSection
 import com.aliernfrog.lactool.ui.component.form.RoundedButtonRow
 import com.aliernfrog.lactool.ui.component.maps.MapToMerge
 import com.aliernfrog.lactool.ui.dialog.MergeMapDialog
-import com.aliernfrog.lactool.ui.theme.AppFABHeight
+import com.aliernfrog.lactool.ui.theme.AppFABPadding
 import com.aliernfrog.lactool.ui.viewmodel.MapsMergeViewModel
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
@@ -117,7 +117,7 @@ private fun MergeScreen(
             MapsList(
                 maps = mapsMergeViewModel.mapMerger.mapsToMerge
             )
-            Spacer(Modifier.navigationBarsPadding().height(AppFABHeight))
+            Spacer(Modifier.navigationBarsPadding().height(AppFABPadding))
         }
     }
 

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsRolesScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsRolesScreen.kt
@@ -31,7 +31,7 @@ import com.aliernfrog.lactool.ui.component.FloatingActionButton
 import com.aliernfrog.lactool.ui.component.maps.MapRoleRow
 import com.aliernfrog.lactool.ui.dialog.DeleteConfirmationDialog
 import com.aliernfrog.lactool.ui.sheet.AddRoleSheet
-import com.aliernfrog.lactool.ui.theme.AppFABHeight
+import com.aliernfrog.lactool.ui.theme.AppFABPadding
 import com.aliernfrog.lactool.ui.viewmodel.MapsEditViewModel
 import com.aliernfrog.lactool.util.extension.removeHtml
 import kotlinx.coroutines.launch
@@ -101,7 +101,7 @@ fun MapsRolesScreen(
                 )
             }
             item {
-                Spacer(Modifier.navigationBarsPadding().height(AppFABHeight))
+                Spacer(Modifier.navigationBarsPadding().height(AppFABPadding))
             }
         }
     }

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/wallpapers/WallpapersScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/wallpapers/WallpapersScreen.kt
@@ -56,7 +56,7 @@ import com.aliernfrog.lactool.ui.component.ImageButtonOverlay
 import com.aliernfrog.lactool.ui.component.ListViewOptionsDropdown
 import com.aliernfrog.lactool.ui.component.SettingsButton
 import com.aliernfrog.lactool.ui.theme.AppComponentShape
-import com.aliernfrog.lactool.ui.theme.AppFABHeight
+import com.aliernfrog.lactool.ui.theme.AppFABPadding
 import com.aliernfrog.lactool.ui.viewmodel.WallpapersViewModel
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
@@ -238,5 +238,5 @@ private fun Header(
 
 @Composable
 private fun Footer() {
-    Spacer(Modifier.navigationBarsPadding().height(AppFABHeight))
+    Spacer(Modifier.navigationBarsPadding().height(AppFABPadding))
 }
diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/theme/Shape.kt b/app/src/main/java/com/aliernfrog/lactool/ui/theme/Shape.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.unit.dp
 val AppRoundnessSize = 28.dp
 val AppComponentShape = RoundedCornerShape(AppRoundnessSize)
 val AppSmallComponentShape = RoundedCornerShape(5.dp)
-val AppFABHeight = 70.dp
+val AppFABPadding = 90.dp
 
 val Shapes = Shapes(
     small = RoundedCornerShape(4.dp),