🔧 android build upgrades

boitakub · Oct 14, 2023 · b008dd0 · b008dd0
1 parent 3b35280
commit b008dd0
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 34 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "fr.boitakub.bogadex"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
     }
     dependencies {
         // -- Core plugins
-        classpath("com.android.tools.build:gradle:8.0.2")
+        classpath("com.android.tools.build:gradle:8.1.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
 
         // -- Application plugins

diff --git a/feature/boardgame/src/main/java/fr/boitakub/bogadex/boardgame/ui/BoardGameDetailScreen.kt b/feature/boardgame/src/main/java/fr/boitakub/bogadex/boardgame/ui/BoardGameDetailScreen.kt
@@ -111,7 +111,7 @@ fun TopBar(
         }) {
             Icon(
                 imageVector = Icons.Default.ArrowBack,
-                contentDescription = stringResource(id = R.string.back),
+                contentDescription = stringResource(id = fr.boitakub.bogadex.common.R.string.back),
                 tint = MaterialTheme.colorScheme.primary,
             )
         }
@@ -194,7 +194,7 @@ private fun GameDetailLinks(
                 }
             },
         ) {
-            Text(resources.getString(R.string.link_to_boardgamegeek))
+            Text(resources.getString(fr.boitakub.bogadex.common.R.string.link_to_boardgamegeek))
         }
         Button(
             modifier = Modifier.padding(4.dp),
@@ -210,7 +210,7 @@ private fun GameDetailLinks(
                 }
             },
         ) {
-            Text(resources.getString(R.string.link_to_bgstats))
+            Text(resources.getString(fr.boitakub.bogadex.common.R.string.link_to_bgstats))
         }
     }
 }

diff --git a/feature/boardgame_list/src/main/java/fr/boitakub/bogadex/boardgame/model/CollectionType.kt b/feature/boardgame_list/src/main/java/fr/boitakub/bogadex/boardgame/model/CollectionType.kt
@@ -37,11 +37,11 @@ enum class CollectionType(
     @StringRes val labelRes: Int,
     @DrawableRes val iconRes: Int,
 ) {
-    ALL("all", R.string.display_all, R.drawable.ic_clear_all_24),
-    MY_COLLECTION("collection", R.string.display_collection, R.drawable.ic_outline_all_inbox_24),
-    WISHLIST("wishlist", R.string.display_wishlist, R.drawable.ic_outline_shopping_cart_24),
-    SOLO("solo", R.string.display_solo, R.drawable.ic_user_solid),
-    FILLER("filler", R.string.display_filler, R.drawable.ic_stopwatch_solid),
+    ALL("all", fr.boitakub.bogadex.common.R.string.display_all, R.drawable.ic_clear_all_24),
+    MY_COLLECTION("collection", fr.boitakub.bogadex.common.R.string.display_collection, R.drawable.ic_outline_all_inbox_24),
+    WISHLIST("wishlist", fr.boitakub.bogadex.common.R.string.display_wishlist, R.drawable.ic_outline_shopping_cart_24),
+    SOLO("solo", fr.boitakub.bogadex.common.R.string.display_solo, fr.boitakub.bogadex.common.R.drawable.ic_user_solid),
+    FILLER("filler", fr.boitakub.bogadex.common.R.string.display_filler, R.drawable.ic_stopwatch_solid),
     ;
 
     companion object {

diff --git a/...oardgame_list/src/main/java/fr/boitakub/bogadex/boardgame/ui/BoardGameCollectionScreen.kt b/...oardgame_list/src/main/java/fr/boitakub/bogadex/boardgame/ui/BoardGameCollectionScreen.kt
@@ -110,7 +110,7 @@ fun BoardGameCollectionScreen(
                     imageVector = ImageVector.vectorResource(id = R.drawable.ic_filter_solid),
                     contentDescription = "Add FAB",
                 )
-                Text(modifier = Modifier.padding(start = 8.dp), text = stringResource(id = R.string.filters))
+                Text(modifier = Modifier.padding(start = 8.dp), text = stringResource(id = fr.boitakub.bogadex.common.R.string.filters))
             }
         },
     ) { padding ->
@@ -213,7 +213,7 @@ private fun TopBar(
             }) {
                 Icon(
                     imageVector = Icons.Default.List,
-                    contentDescription = stringResource(id = R.string.change_display),
+                    contentDescription = stringResource(id = fr.boitakub.bogadex.common.R.string.change_display),
                     tint = MaterialTheme.colorScheme.primary,
                 )
             }
@@ -222,7 +222,7 @@ private fun TopBar(
             }) {
                 Icon(
                     imageVector = Icons.Default.Settings,
-                    contentDescription = stringResource(id = R.string.settings),
+                    contentDescription = stringResource(id = fr.boitakub.bogadex.common.R.string.settings),
                     tint = MaterialTheme.colorScheme.primary,
                 )
             }

diff --git a/.../boardgame_list/src/main/java/fr/boitakub/bogadex/boardgame/ui/component/BoardGameInfo.kt b/.../boardgame_list/src/main/java/fr/boitakub/bogadex/boardgame/ui/component/BoardGameInfo.kt
@@ -97,7 +97,7 @@ fun BoardGameRecommendInfo(
             Icon(
                 modifier = Modifier.size(16.dp),
                 imageVector = ImageVector.vectorResource(id = iconRes),
-                contentDescription = stringResource(id = R.string.recommended_players),
+                contentDescription = stringResource(id = fr.boitakub.bogadex.common.R.string.recommended_players),
                 tint = tintColor,
             )
             Text(

diff --git a/...rdgame_list/src/main/java/fr/boitakub/bogadex/boardgame/ui/component/BoardGameListItem.kt b/...rdgame_list/src/main/java/fr/boitakub/bogadex/boardgame/ui/component/BoardGameListItem.kt
@@ -110,7 +110,7 @@ fun BoardGameListItem(
                 Icon(
                     modifier = Modifier.padding(4.dp).size(16.dp),
                     imageVector = ImageVector.vectorResource(id = R.drawable.ic_puzzle_piece_solid),
-                    contentDescription = stringResource(id = R.string.expansion_icon),
+                    contentDescription = stringResource(id = fr.boitakub.bogadex.common.R.string.expansion_icon),
                     tint = MaterialTheme.colorScheme.secondary,
                 )
             }

diff --git a/...ardgame_list/src/main/java/fr/boitakub/bogadex/boardgame/ui/component/SearchInputField.kt b/...ardgame_list/src/main/java/fr/boitakub/bogadex/boardgame/ui/component/SearchInputField.kt
@@ -84,7 +84,7 @@ fun SearchInputField(
         leadingIcon = {
             Icon(
                 imageVector = Icons.Default.Search,
-                contentDescription = stringResource(id = R.string.decorative_image),
+                contentDescription = stringResource(id = fr.boitakub.bogadex.common.R.string.decorative_image),
             )
         },
         trailingIcon = {
@@ -95,7 +95,7 @@ fun SearchInputField(
                 }) {
                     Icon(
                         imageVector = Icons.Default.Close,
-                        contentDescription = stringResource(id = R.string.searchbar_clear),
+                        contentDescription = stringResource(id = fr.boitakub.bogadex.common.R.string.searchbar_clear),
                     )
                 }
             }
@@ -106,7 +106,7 @@ fun SearchInputField(
         },
         maxLines = 1,
         singleLine = true,
-        placeholder = { Text(text = stringResource(id = R.string.searchbar_hint)) },
+        placeholder = { Text(text = stringResource(id = fr.boitakub.bogadex.common.R.string.searchbar_hint)) },
         keyboardOptions = KeyboardOptions(
             keyboardType = KeyboardType.Text,
         ),

diff --git a/...re/preferences/src/main/kotlin/fr/boitakub/bogadex/preferences/user/UserSettingsScreen.kt b/...re/preferences/src/main/kotlin/fr/boitakub/bogadex/preferences/user/UserSettingsScreen.kt
@@ -139,24 +139,24 @@ private fun SettingsContent(
         verticalArrangement = Arrangement.spacedBy(8.dp),
         content = {
             ClickableLineComponent(
-                iconRes = R.drawable.ic_user_solid,
-                titleRes = R.string.bgg_username,
-                subtitleRes = R.string.bgg_username_summary,
+                iconRes = fr.boitakub.bogadex.common.R.drawable.ic_user_solid,
+                titleRes = fr.boitakub.bogadex.common.R.string.bgg_username,
+                subtitleRes = fr.boitakub.bogadex.common.R.string.bgg_username_summary,
                 onClick = onBggUsernameClick,
             )
             SwitchComponent(
-                iconRes = R.drawable.ic_person_carry_box_solid,
-                titleRes = R.string.filter_previously_own,
-                subtitleRes = R.string.filter_previously_own_summary,
+                iconRes = fr.boitakub.bogadex.common.R.drawable.ic_person_carry_box_solid,
+                titleRes = fr.boitakub.bogadex.common.R.string.filter_previously_own,
+                subtitleRes = fr.boitakub.bogadex.common.R.string.filter_previously_own_summary,
                 previousState = state.displayPreviouslyOwned,
                 updateSelection = {
                     viewModel.updateFilterPreviouslyOwned(it)
                 },
             )
             ClickableLineComponent(
-                iconRes = R.drawable.ic_eclipse_solid,
-                titleRes = R.string.pref_night_title,
-                subtitleRes = R.string.pref_night_summary,
+                iconRes = fr.boitakub.bogadex.common.R.drawable.ic_eclipse_solid,
+                titleRes = fr.boitakub.bogadex.common.R.string.pref_night_title,
+                subtitleRes = fr.boitakub.bogadex.common.R.string.pref_night_summary,
                 onClick = onThemeSelectionClick,
             )
         },
@@ -174,7 +174,7 @@ fun BggUsernameTextDialog(
     TextDialog(
         title = {
             Text(
-                text = stringResource(id = R.string.bgg_username),
+                text = stringResource(id = fr.boitakub.bogadex.common.R.string.bgg_username),
                 style = MaterialTheme.typography.headlineSmall,
             )
         },
@@ -212,7 +212,7 @@ fun ThemeListDialog(
     TextDialog(
         title = {
             Text(
-                text = stringResource(id = R.string.pref_night_title),
+                text = stringResource(id = fr.boitakub.bogadex.common.R.string.pref_night_title),
                 style = MaterialTheme.typography.headlineSmall,
             )
         },
@@ -408,12 +408,12 @@ fun TopBar(
         }) {
             Icon(
                 imageVector = Icons.Default.ArrowBack,
-                contentDescription = stringResource(id = R.string.back),
+                contentDescription = stringResource(id = fr.boitakub.bogadex.common.R.string.back),
                 tint = MaterialTheme.colorScheme.primary,
             )
         }
         Text(
-            text = stringResource(id = R.string.settings),
+            text = stringResource(id = fr.boitakub.bogadex.common.R.string.settings),
             style = MaterialTheme.typography.titleLarge,
             textAlign = TextAlign.Start,
             maxLines = 1,

diff --git a/gradle.properties b/gradle.properties
@@ -27,12 +27,15 @@ android.useAndroidX=true
 android.enableJetifier=false
 android.enableR8.fullMode=true
 android.useMinimalKeepRules=true
+android.nonTransitiveRClass=true
+android.nonFinalResIds=true
 
 # Removes uneccessary default build features
 android.defaults.buildfeatures.aidl=false
 android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
+android.defaults.buildfeatures.buildconfig=true
 
 # ----Android Studio---
 # Defaults sidebar view to project instead of android
@@ -68,6 +71,3 @@ androidTestVersion=1.1.1
 testCoreVersion=1.5.0
 espressoVersion=3.5.1
 mockkVersion=1.13.3
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false