add constants for icon sizes etc., bigger top toolbar buttons

jensstein · Nov 7, 2022 · 658e65f · 658e65f
1 parent 4c6b3b3
commit 658e65f
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 22 deletions.
diff --git a/app/src/main/java/com/machiav3lli/backup/Constants.kt b/app/src/main/java/com/machiav3lli/backup/Constants.kt
@@ -19,6 +19,7 @@ package com.machiav3lli.backup
 
 import android.Manifest
 import android.content.Intent
+import androidx.compose.ui.unit.dp
 import com.machiav3lli.backup.ui.item.ChipItem
 import com.machiav3lli.backup.ui.item.Legend
 import com.machiav3lli.backup.ui.item.Link
@@ -62,6 +63,11 @@ val themeItems = mutableMapOf(
     if (OABX.minSDK(31)) set(THEME_DYNAMIC, R.string.prefs_theme_dynamic)
 }
 
+val BASIC_BUTTON_SIZE = 48.dp
+val BUTTON_ICON_SIZE = 24.dp
+val STANDALONE_ICON_SIZE = 48.dp
+val SMALL_ICON_SIZE = 32.dp
+
 val accentColorItems = mapOf(
     0 to R.string.prefs_accent_0,
     1 to R.string.prefs_accent_1,

diff --git a/app/src/main/java/com/machiav3lli/backup/activities/MainActivityX.kt b/app/src/main/java/com/machiav3lli/backup/activities/MainActivityX.kt
@@ -51,6 +51,7 @@ import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import com.google.accompanist.navigation.animation.rememberAnimatedNavController
+import com.machiav3lli.backup.BASIC_BUTTON_SIZE
 import com.machiav3lli.backup.MAIN_FILTER_DEFAULT
 import com.machiav3lli.backup.NAV_MAIN
 import com.machiav3lli.backup.OABX
@@ -188,11 +189,14 @@ class MainActivityX : BaseActivity() {
                     topBar = {
 
                         if (navController.currentDestination?.route == NavItem.Scheduler.destination)
-                            TopBar(title = stringResource(id = pageTitle)) {
+                            TopBar(
+                                title = stringResource(id = pageTitle)
+                            ) {
+
                                 RoundButton(
                                     modifier = Modifier
                                         .padding(horizontal = 4.dp)
-                                        .size(32.dp),
+                                        .size(BASIC_BUTTON_SIZE),
                                     icon = Phosphor.Prohibit,
                                     description = stringResource(id = R.string.sched_blocklist)
                                 ) {
@@ -218,7 +222,7 @@ class MainActivityX : BaseActivity() {
                                 RoundButton(
                                     modifier = Modifier
                                         .padding(horizontal = 4.dp)
-                                        .size(32.dp),
+                                        .size(BASIC_BUTTON_SIZE),
                                     description = stringResource(id = R.string.prefs_title),
                                     icon = Phosphor.GearSix
                                 ) { navController.navigate(NavItem.Settings.destination) }
@@ -238,14 +242,14 @@ class MainActivityX : BaseActivity() {
                                 RoundButton(
                                     modifier = Modifier
                                         .padding(horizontal = 4.dp)
-                                        .size(32.dp),
+                                        .size(BASIC_BUTTON_SIZE),
                                     description = stringResource(id = R.string.refresh),
                                     icon = Phosphor.ArrowsClockwise
                                 ) { OABX.main?.needRefresh = true }
                                 RoundButton(
                                     modifier = Modifier
                                         .padding(horizontal = 4.dp)
-                                        .size(32.dp),
+                                        .size(BASIC_BUTTON_SIZE),
                                     description = stringResource(id = R.string.prefs_title),
                                     icon = Phosphor.GearSix
                                 ) { navController.navigate(NavItem.Settings.destination) }

diff --git a/app/src/main/java/com/machiav3lli/backup/activities/PrefsActivityX.kt b/app/src/main/java/com/machiav3lli/backup/activities/PrefsActivityX.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.navigation.animation.rememberAnimatedNavController
+import com.machiav3lli.backup.BASIC_BUTTON_SIZE
 import com.machiav3lli.backup.NAV_PREFS
 import com.machiav3lli.backup.OABX
 import com.machiav3lli.backup.R
@@ -91,7 +92,7 @@ class PrefsActivityX : BaseActivity() {
                                     RoundButton(
                                         modifier = Modifier
                                             .padding(horizontal = 4.dp)
-                                            .size(32.dp),
+                                            .size(BASIC_BUTTON_SIZE),
                                         icon = Phosphor.Info,
                                         description = stringResource(id = R.string.help),
                                     ) {

diff --git a/app/src/main/java/com/machiav3lli/backup/pages/SchedulerPage.kt b/app/src/main/java/com/machiav3lli/backup/pages/SchedulerPage.kt
@@ -32,7 +32,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
+import com.machiav3lli.backup.BUTTON_ICON_SIZE
 import com.machiav3lli.backup.R
 import com.machiav3lli.backup.activities.MainActivityX
 import com.machiav3lli.backup.dbs.entity.Schedule
@@ -57,7 +57,7 @@ fun SchedulerPage(viewModel: SchedulerViewModel) {
                 text = { Text(stringResource(id = R.string.sched_add)) },
                 icon = {
                     Icon(
-                        modifier = Modifier.size(24.dp),
+                        modifier = Modifier.size(BUTTON_ICON_SIZE),
                         imageVector = Phosphor.CalendarPlus,
                         contentDescription = stringResource(id = R.string.sched_add)
                     )

diff --git a/app/src/main/java/com/machiav3lli/backup/preferences/ui/PrefsGroup.kt b/app/src/main/java/com/machiav3lli/backup/preferences/ui/PrefsGroup.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.machiav3lli.backup.BASIC_BUTTON_SIZE
 import com.machiav3lli.backup.ui.compose.item.PrefIcon
 import com.machiav3lli.backup.ui.item.Pref
 
@@ -82,7 +83,7 @@ fun PrefsGroupHeading(
     Column(
         verticalArrangement = Arrangement.Center,
         modifier = Modifier
-            .height(48.dp)
+            .height(BASIC_BUTTON_SIZE)
             .padding(horizontal = 32.dp)
             .fillMaxWidth(),
     ) {

diff --git a/app/src/main/java/com/machiav3lli/backup/ui/compose/item/Components.kt b/app/src/main/java/com/machiav3lli/backup/ui/compose/item/Components.kt
@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -74,6 +75,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Popup
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
+import com.machiav3lli.backup.BUTTON_ICON_SIZE
 import com.machiav3lli.backup.MAIN_FILTER_SPECIAL
 import com.machiav3lli.backup.MAIN_FILTER_SYSTEM
 import com.machiav3lli.backup.MAIN_FILTER_USER
@@ -84,10 +86,12 @@ import com.machiav3lli.backup.MODE_DATA_EXT
 import com.machiav3lli.backup.MODE_DATA_MEDIA
 import com.machiav3lli.backup.MODE_DATA_OBB
 import com.machiav3lli.backup.R
+import com.machiav3lli.backup.SMALL_ICON_SIZE
 import com.machiav3lli.backup.SPECIAL_FILTER_ALL
 import com.machiav3lli.backup.SPECIAL_FILTER_DISABLED
 import com.machiav3lli.backup.SPECIAL_FILTER_LAUNCHABLE
 import com.machiav3lli.backup.SPECIAL_FILTER_OLD
+import com.machiav3lli.backup.STANDALONE_ICON_SIZE
 import com.machiav3lli.backup.dbs.entity.Backup
 import com.machiav3lli.backup.dbs.entity.Schedule
 import com.machiav3lli.backup.items.Package
@@ -132,7 +136,7 @@ fun ButtonIcon(
     Icon(
         imageVector = icon,
         contentDescription = stringResource(id = textId),
-        modifier = Modifier.size(24.dp),
+        modifier = Modifier.size(BUTTON_ICON_SIZE),
         tint = tint ?: LocalContentColor.current
     )
 }
@@ -146,7 +150,7 @@ fun PrefIcon(
     Icon(
         imageVector = icon,
         contentDescription = text,
-        modifier = Modifier.size(32.dp),
+        modifier = Modifier.size(SMALL_ICON_SIZE),   //TODO BUTTON_ICON_SIZE?
         tint = tint ?: MaterialTheme.colorScheme.onBackground
     )
 }
@@ -159,7 +163,7 @@ fun PackageIcon(
 ) {
     AsyncImage(
         modifier = modifier
-            .size(48.dp)
+            .size(STANDALONE_ICON_SIZE)
             .clip(RoundedCornerShape(LocalShapes.current.medium)),
         model = ImageRequest.Builder(LocalContext.current)
             .crossfade(true)
@@ -208,7 +212,7 @@ fun ActionButton(
         if (icon != null) {
             if (iconOnSide) Spacer(modifier = Modifier.weight(1f))
             Icon(
-                modifier = Modifier.size(24.dp),
+                modifier = Modifier.size(BUTTON_ICON_SIZE),
                 imageVector = icon,
                 contentDescription = text
             )
@@ -247,7 +251,7 @@ fun ElevatedActionButton(
     ) {
         if (icon != null) {
             Icon(
-                modifier = Modifier.size(24.dp),
+                modifier = Modifier.size(BUTTON_ICON_SIZE),
                 imageVector = icon,
                 contentDescription = text
             )
@@ -385,7 +389,7 @@ fun RoundButton(
         onClick = onClick
     ) {
         Icon(
-            modifier = Modifier.size(24.dp),
+            modifier = Modifier.padding(8.dp).fillMaxSize(),
             imageVector = icon,
             contentDescription = description
         )
@@ -413,7 +417,7 @@ fun StateChip(
         onClick = onClick,
     ) {
         Icon(
-            modifier = Modifier.size(24.dp),
+            modifier = Modifier.size(BUTTON_ICON_SIZE),
             imageVector = icon,
             contentDescription = text
         )

diff --git a/app/src/main/java/com/machiav3lli/backup/ui/compose/item/Preference.kt b/app/src/main/java/com/machiav3lli/backup/ui/compose/item/Preference.kt
@@ -32,6 +32,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.machiav3lli.backup.BUTTON_ICON_SIZE
 import com.machiav3lli.backup.ui.compose.ifThen
 import com.machiav3lli.backup.ui.item.BooleanPref
 import com.machiav3lli.backup.ui.item.EnumPref
@@ -250,7 +251,7 @@ fun SwitchPreference(
         endWidget = { isEnabled ->
             Switch(
                 modifier = Modifier
-                    .height(24.dp),
+                    .height(BUTTON_ICON_SIZE),
                 checked = checked,
                 onCheckedChange = {
                     onCheckedChange(it)
@@ -298,7 +299,7 @@ fun CheckboxPreference(
         endWidget = { isEnabled ->
             Checkbox(
                 modifier = Modifier
-                    .height(24.dp),
+                    .height(BUTTON_ICON_SIZE),
                 checked = checked,
                 onCheckedChange = {
                     onCheckedChange(it)

diff --git a/app/src/main/java/com/machiav3lli/backup/ui/compose/item/Tags.kt b/app/src/main/java/com/machiav3lli/backup/ui/compose/item/Tags.kt
@@ -39,6 +39,7 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.flowlayout.FlowRow
+import com.machiav3lli.backup.BUTTON_ICON_SIZE
 import com.machiav3lli.backup.R
 import com.machiav3lli.backup.ui.compose.icons.Phosphor
 import com.machiav3lli.backup.ui.compose.icons.phosphor.PlusCircle
@@ -100,7 +101,7 @@ fun TagItem(
             Icon(
                 imageVector = icon,
                 contentDescription = stringResource(id = R.string.dialogCancel),
-                modifier = Modifier.size(24.dp)
+                modifier = Modifier.size(BUTTON_ICON_SIZE)
             )
         },
         onClick = {

diff --git a/app/src/main/java/com/machiav3lli/backup/ui/compose/item/TopBar.kt b/app/src/main/java/com/machiav3lli/backup/ui/compose/item/TopBar.kt
@@ -52,6 +52,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.machiav3lli.backup.BASIC_BUTTON_SIZE
 import com.machiav3lli.backup.OABX
 import com.machiav3lli.backup.R
 import com.machiav3lli.backup.preferences.pref_showInfoLogBar
@@ -256,7 +257,7 @@ fun ExpandableSearchAction(
             RoundButton(
                 modifier = modifier
                     .padding(horizontal = 4.dp)
-                    .size(32.dp),
+                    .size(BASIC_BUTTON_SIZE),
                 icon = Phosphor.MagnifyingGlass,
                 description = stringResource(id = R.string.search),
                 onClick = { onExpanded(true) }

diff --git a/app/src/main/java/com/machiav3lli/backup/ui/compose/recycler/Recyclers.kt b/app/src/main/java/com/machiav3lli/backup/ui/compose/recycler/Recyclers.kt
@@ -20,6 +20,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.flowlayout.FlowMainAxisAlignment
 import com.google.accompanist.flowlayout.FlowRow
+import com.machiav3lli.backup.BUTTON_ICON_SIZE
 import com.machiav3lli.backup.dbs.entity.Backup
 import com.machiav3lli.backup.dbs.entity.Schedule
 import com.machiav3lli.backup.items.Log
@@ -158,7 +159,7 @@ fun InfoChipsBlock(
                         if (chip.icon != null) Icon(
                             imageVector = chip.icon,
                             contentDescription = chip.text,
-                            modifier = Modifier.size(24.dp)
+                            modifier = Modifier.size(BUTTON_ICON_SIZE)
                         )
                     },
                     border = SuggestionChipDefaults.suggestionChipBorder(
@@ -190,7 +191,7 @@ fun InfoChipsBlock(
                     if (chip.icon != null) Icon(
                         imageVector = chip.icon,
                         contentDescription = chip.text,
-                        modifier = Modifier.size(24.dp)
+                        modifier = Modifier.size(BUTTON_ICON_SIZE)
                     )
                 },
                 border = SuggestionChipDefaults.suggestionChipBorder(