Merge pull request 'Update dependency androidx.compose.material:material to v1.10.0' (#347) from renovate/androidx.compose.material-material-1.x into main

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: set up secrets
         run: |

app/build.gradle

@@ -1,9 +1,9 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.20'
-    id 'org.jetbrains.kotlin.plugin.compose' version '2.2.20'
-    id 'com.mikepenz.aboutlibraries.plugin' version '12.2.4'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.21'
+    id 'org.jetbrains.kotlin.plugin.compose' version '2.2.21'
+    id 'com.mikepenz.aboutlibraries.plugin' version '13.1.0'
 }
 
 
@@ -95,13 +95,17 @@ aboutLibraries {
 }
 
 dependencies {
-    implementation 'androidx.compose.material3:material3:1.3.2'
-    implementation 'androidx.navigation:navigation-compose:2.9.4'
+    implementation 'androidx.compose.material3:material3:1.4.0'
+    implementation "androidx.compose.material:material:1.10.0"
+    implementation 'androidx.compose.material:material-icons-extended:1.7.8'
+    implementation 'androidx.navigation:navigation-compose:2.9.6'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
+
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.compose.ui:ui'
-    implementation "androidx.compose.material:material:1.9.1"
-    implementation "androidx.activity:activity-ktx:1.11.0"
+    implementation "androidx.activity:activity-ktx:1.12.1"
 
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'com.google.android.material:material:1.13.0'
@@ -110,11 +114,11 @@ dependencies {
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
-    implementation 'com.mikepenz:aboutlibraries:12.2.4'
-    implementation 'com.mikepenz:aboutlibraries-compose-m3:12.2.4'
-    implementation 'com.mikepenz:aboutlibraries-core:12.2.4'
+    implementation 'com.mikepenz:aboutlibraries:13.1.0'
+    implementation 'com.mikepenz:aboutlibraries-compose-m3:13.1.0'
+    implementation 'com.mikepenz:aboutlibraries-core:13.1.0'
 
 
-    implementation platform('androidx.compose:compose-bom:2025.09.00')
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.9.1'
+    implementation platform('androidx.compose:compose-bom:2025.12.00')
+    debugImplementation 'androidx.compose.ui:ui-tooling:1.9.5'
 }

app/src/main/java/net/helcel/beans/activity/EditScreen.kt

@@ -19,13 +19,15 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import net.helcel.beans.R
 import net.helcel.beans.activity.sub.EditPlaceScreen
 import net.helcel.beans.countries.World
 
+@Preview
 @Composable
-fun EditScreen(onExit:()->Unit) {
+fun EditScreen(onExit:()->Unit = {}) {
     SysTheme {
         Scaffold(
             topBar = {

app/src/main/java/net/helcel/beans/activity/MainScreen.kt

@@ -18,6 +18,7 @@ import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.DateRange
 import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.filled.Percent
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -82,7 +83,7 @@ class MainScreen : ComponentActivity() {
                                 Icon(Icons.Default.Edit, contentDescription = "Edit")
                             }
                             IconButton(onClick = {  nav.navigate("stats") }){
-                                Icon(Icons.Default.DateRange, contentDescription = "Stats")
+                                Icon(Icons.Default.Percent, contentDescription = "Stats")
                             }
                             IconButton(onClick = { nav.navigate("settings") }) {
                                 Icon(Icons.Default.Settings, contentDescription = "Settings")

app/src/main/java/net/helcel/beans/activity/SettingsScreen.kt

@@ -118,9 +118,10 @@ fun settingsNav(): NavHostController {
     return navController
 }
 
+@Preview
 @Composable
 fun SettingsMainScreen(onExit: ()->Unit = {}) {
-    var nav: NavHostController? = null
+    val nav: NavHostController = settingsNav()
     SysTheme {
         Scaffold(
             topBar = {
@@ -128,7 +129,7 @@ fun SettingsMainScreen(onExit: ()->Unit = {}) {
                     title = { Text(stringResource(R.string.action_settings)) },
                     navigationIcon = {
                         IconButton(onClick = {
-                            if(nav!=null && !nav!!.popBackStack())
+                            if(!nav.popBackStack())
                                 onExit()
                         }) {
                             Icon(
@@ -141,13 +142,12 @@ fun SettingsMainScreen(onExit: ()->Unit = {}) {
             }
         ) { innerPadding ->
             Box(modifier = Modifier.padding(innerPadding)) {
-                nav = settingsNav()
+                SettingsScreen()
             }
         }
     }
 }
 
-@Preview
 @Composable
 fun SettingsScreen(navController: NavHostController = settingsNav()) {
     val context = LocalContext.current

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.13.0' apply false
-    id 'com.android.library' version '8.13.0' apply false
-    id 'org.jetbrains.kotlin.android' version '2.2.20' apply false
+    id 'com.android.application' version '8.13.1' apply false
+    id 'com.android.library' version '8.13.1' apply false
+    id 'org.jetbrains.kotlin.android' version '2.2.21' apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME