Merge pull request #98 from NordicPlayground/improvements/dependency-update

Dependency update.

Author: philips77

Diff for: app/src/main/java/no/nordicsemi/android/common/test/main/page/WizardPage.kt

@@ -48,6 +48,7 @@ import androidx.compose.material.icons.filled.AccountCircle
 import androidx.compose.material.icons.filled.Build
 import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -136,6 +137,8 @@ private fun WizardScreen() {
                     LinearProgressIndicator(
                         progress = { progress },
                         modifier = Modifier.fillMaxWidth(),
+                        trackColor = MaterialTheme.colorScheme.surfaceVariant,
+                        drawStopIndicator = {}
                     )
                     Text(
                         text = "%.1f%%".format(progress * 100),

Diff for: app/src/main/java/no/nordicsemi/android/common/test/simple/Hello.kt

@@ -38,6 +38,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -83,7 +84,7 @@ private val HelloDialogDestination = defineDialogDestination(HelloDialog) {
         title = { Text(text = param) },
         text = { Text(text = "This is a dialog.") },
         confirmButton = {
-            Button(onClick = { vm.navigateUp() }) {
+            TextButton(onClick = { vm.navigateUp() }) {
                 Text(text = "OK")
             }
         },

Diff for: gradle/libs.versions.toml

@@ -1,55 +1,55 @@
 [versions]
 androidDesugarJdkLibs = "2.0.4"
-androidGradlePlugin = "8.3.2"
+androidGradlePlugin = "8.4.2"
 androidxActivity = "1.9.0"
-androidxAnnotation = "1.7.1"
-androidxAppCompat = "1.6.1"
-androidxComposeBom = "2024.04.01" # https://developer.android.com/jetpack/compose/bom/bom-mapping
-androidxComposeCompiler = "1.5.11" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin
+androidxAnnotation = "1.8.0"
+androidxAppCompat = "1.7.0"
+androidxComposeBom = "2024.05.00" # https://developer.android.com/jetpack/compose/bom/bom-mapping
+androidxComposeCompiler = "1.5.14" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin
 androidxComposeRuntimeTracing = "1.0.0-beta01"
-androidxCore = "1.13.0"
+androidxCore = "1.13.1"
 androidxCoreSplashscreen = "1.0.1"
-androidxDataStore = "1.1.0"
+androidxDataStore = "1.1.1"
 androidxEspresso = "3.5.1"
 androidxHiltNavigationCompose = "1.2.0"
-androidxLifecycle = "2.7.0"
+androidxLifecycle = "2.8.1"
 androidxMacroBenchmark = "1.2.4"
 androidxNavigation = "2.7.7"
 androidxMetrics = "1.0.0-beta01"
 androidxProfileinstaller = "1.3.1"
 androidxStartup = "1.1.1"
-androidxWindowManager = "1.2.0"
+androidxWindowManager = "1.3.0"
 androidxTestCore = "1.5.0"
 androidxTestExt = "1.1.5"
 androidxTestRunner = "1.5.2"
 androidxTestRules = "1.5.0"
 androidxTracing = "1.2.0"
 androidxUiAutomator = "2.3.0"
 androidxWork = "2.9.0"
-firebaseBom = "32.8.1"
+firebaseBom = "33.1.0"
 hilt = "2.51.1"
 hiltExt = "1.2.0"
 junit4 = "4.13.2"
-kotlin = "1.9.23"
+kotlin = "1.9.24"
 kotlinxCoroutines = "1.8.0"
 kotlinxDatetime = "0.5.0"
 kotlinxSerializationJson = "1.6.3"
 ksp = "1.9.23-1.0.20"
-lint = "31.3.2"
+lint = "31.4.2"
 publishPlugin = "1.2.1"
 markdown = "0.4.1"
 leakcanary = "2.14"
 mockk = "1.13.10"
 slf4j = "2.0.13" # don't update
 robolectric = "4.12.1"
-material3 = "1.2.1"
-material = "1.6.6"
+material3 = "1.3.0-beta02"
+material = "1.6.7"
 
 nordic-log = "2.3.0"
 nordicPlugins = "2.0.1"
 dokkaPlugin = "1.9.20"
-googleServicesPlugins = "4.4.1"
-firebaseCrashlyticsPlugins = "2.9.9"
+googleServicesPlugins = "4.4.2"
+firebaseCrashlyticsPlugins = "3.0.1"
 
 [libraries]
 android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }

Diff for: theme/src/main/java/no/nordicsemi/android/common/theme/NordicTheme.kt

@@ -39,6 +39,7 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
 
 @Composable
@@ -61,6 +62,10 @@ fun NordicTheme(content: @Composable () -> Unit) {
         onBackground = colorResource(id = R.color.md_theme_onBackground),
         surface = colorResource(id = R.color.md_theme_surface),
         onSurface = colorResource(id = R.color.md_theme_onSurface),
+        surfaceContainer = colorResource(id = R.color.md_theme_surfaceContainer),
+        surfaceContainerLow = colorResource(id = R.color.md_theme_surfaceContainerLow),
+        surfaceContainerHigh = colorResource(id = R.color.md_theme_surfaceContainerHigh),
+        surfaceContainerHighest = colorResource(id = R.color.md_theme_surfaceContainerHighest),
         surfaceVariant = colorResource(id = R.color.md_theme_surfaceVariant),
         onSurfaceVariant = colorResource(id = R.color.md_theme_onSurfaceVariant),
         inverseSurface = colorResource(id = R.color.md_theme_inverseSurface),
@@ -89,6 +94,10 @@ fun NordicTheme(content: @Composable () -> Unit) {
         background = colorResource(id = R.color.md_theme_background),
         onBackground = colorResource(id = R.color.md_theme_onBackground),
         surface = colorResource(id = R.color.md_theme_surface),
+        surfaceContainer = colorResource(id = R.color.md_theme_surfaceContainer),
+        surfaceContainerLow = colorResource(id = R.color.md_theme_surfaceContainerLow),
+        surfaceContainerHigh = colorResource(id = R.color.md_theme_surfaceContainerHigh),
+        surfaceContainerHighest = colorResource(id = R.color.md_theme_surfaceContainerHighest),
         onSurface = colorResource(id = R.color.md_theme_onSurface),
         surfaceVariant = colorResource(id = R.color.md_theme_surfaceVariant),
         onSurfaceVariant = colorResource(id = R.color.md_theme_onSurfaceVariant),

Diff for: theme/src/main/java/no/nordicsemi/android/common/theme/view/PagerView.kt

@@ -31,16 +31,19 @@
 
 package no.nordicsemi.android.common.theme.view
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material3.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ScrollableTabRow
+import androidx.compose.material3.Tab
+import androidx.compose.material3.TabRow
 import androidx.compose.material3.TabRowDefaults.SecondaryIndicator
 import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
@@ -61,7 +64,6 @@ class PagerViewItem(
     val drawView: @Composable () -> Unit,
 )
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun PagerView(
     viewEntity: PagerViewEntity,
@@ -80,7 +82,6 @@ fun PagerView(
     )
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun PagerView(
     viewEntity: PagerViewEntity,

Diff for: theme/src/main/java/no/nordicsemi/android/common/theme/view/WizardStepComponent.kt

@@ -115,7 +115,8 @@ fun WizardStepComponent(
                     CircularProgressIndicator(
                         modifier = Modifier
                             .size(48.dp)
-                            .padding(8.dp)
+                            .padding(8.dp),
+                        trackColor = MaterialTheme.colorScheme.surfaceVariant
                     )
                 }
                 else -> {}

Diff for: theme/src/main/res/values-night/colors_theme.xml

@@ -52,6 +52,10 @@
     <color name="md_theme_background">@android:color/black</color>
     <color name="md_theme_onBackground">#E1E2E5</color>
     <color name="md_theme_surface">#191C1E</color>
+    <color name="md_theme_surfaceContainer">#1B282B</color>
+    <color name="md_theme_surfaceContainerLow">#1B1F22</color>
+    <color name="md_theme_surfaceContainerHigh">#2D3336</color>
+    <color name="md_theme_surfaceContainerHighest">#42484B</color>
     <color name="md_theme_onSurface">#E1E2E5</color>
     <color name="md_theme_surfaceVariant">#40484B</color>
     <color name="md_theme_onSurfaceVariant">#BFC8CC</color>

Diff for: theme/src/main/res/values/colors_theme.xml

@@ -52,6 +52,10 @@
     <color name="md_theme_background">@android:color/white</color>
     <color name="md_theme_onBackground">#191C1E</color>
     <color name="md_theme_surface">#F5F5F5</color>
+    <color name="md_theme_surfaceContainer">#E4EFF2</color>
+    <color name="md_theme_surfaceContainerLow">#EAF1F4</color>
+    <color name="md_theme_surfaceContainerHigh">#E1E8EB</color>
+    <color name="md_theme_surfaceContainerHighest">#DDE4E7</color>
     <color name="md_theme_onSurface">#191C1E</color>
     <color name="md_theme_surfaceVariant">#DCE4E8</color>
     <color name="md_theme_onSurfaceVariant">#40484B</color>