Skip to content

Commit e301ba4

Browse files
philips77philips77
authored
Merge pull request #98 from NordicPlayground/improvements/dependency-update
Dependency update.
2 parents c4f106d + 9c27dec commit e301ba4

File tree

8 files changed

+45
-22
lines changed

8 files changed

+45
-22
lines changed

‎app/src/main/java/no/nordicsemi/android/common/test/main/page/WizardPage.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import androidx.compose.material.icons.filled.AccountCircle
4848
import androidx.compose.material.icons.filled.Build
4949
import androidx.compose.material.icons.filled.Warning
5050
import androidx.compose.material3.LinearProgressIndicator
51+
import androidx.compose.material3.MaterialTheme
5152
import androidx.compose.material3.OutlinedCard
5253
import androidx.compose.material3.Text
5354
import androidx.compose.runtime.Composable
@@ -136,6 +137,8 @@ private fun WizardScreen() {
136137
LinearProgressIndicator(
137138
progress = { progress },
138139
modifier = Modifier.fillMaxWidth(),
140+
trackColor = MaterialTheme.colorScheme.surfaceVariant,
141+
drawStopIndicator = {}
139142
)
140143
Text(
141144
text = "%.1f%%".format(progress * 100),

‎app/src/main/java/no/nordicsemi/android/common/test/simple/Hello.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
3838
import androidx.compose.material3.AlertDialog
3939
import androidx.compose.material3.Button
4040
import androidx.compose.material3.Text
41+
import androidx.compose.material3.TextButton
4142
import androidx.compose.runtime.Composable
4243
import androidx.compose.ui.Alignment
4344
import androidx.compose.ui.Modifier
@@ -83,7 +84,7 @@ private val HelloDialogDestination = defineDialogDestination(HelloDialog) {
8384
title = { Text(text = param) },
8485
text = { Text(text = "This is a dialog.") },
8586
confirmButton = {
86-
Button(onClick = { vm.navigateUp() }) {
87+
TextButton(onClick = { vm.navigateUp() }) {
8788
Text(text = "OK")
8889
}
8990
},

‎gradle/libs.versions.toml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
[versions]
22
androidDesugarJdkLibs = "2.0.4"
3-
androidGradlePlugin = "8.3.2"
3+
androidGradlePlugin = "8.4.2"
44
androidxActivity = "1.9.0"
5-
androidxAnnotation = "1.7.1"
6-
androidxAppCompat = "1.6.1"
7-
androidxComposeBom = "2024.04.01" # https://developer.android.com/jetpack/compose/bom/bom-mapping
8-
androidxComposeCompiler = "1.5.11" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin
5+
androidxAnnotation = "1.8.0"
6+
androidxAppCompat = "1.7.0"
7+
androidxComposeBom = "2024.05.00" # https://developer.android.com/jetpack/compose/bom/bom-mapping
8+
androidxComposeCompiler = "1.5.14" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin
99
androidxComposeRuntimeTracing = "1.0.0-beta01"
10-
androidxCore = "1.13.0"
10+
androidxCore = "1.13.1"
1111
androidxCoreSplashscreen = "1.0.1"
12-
androidxDataStore = "1.1.0"
12+
androidxDataStore = "1.1.1"
1313
androidxEspresso = "3.5.1"
1414
androidxHiltNavigationCompose = "1.2.0"
15-
androidxLifecycle = "2.7.0"
15+
androidxLifecycle = "2.8.1"
1616
androidxMacroBenchmark = "1.2.4"
1717
androidxNavigation = "2.7.7"
1818
androidxMetrics = "1.0.0-beta01"
1919
androidxProfileinstaller = "1.3.1"
2020
androidxStartup = "1.1.1"
21-
androidxWindowManager = "1.2.0"
21+
androidxWindowManager = "1.3.0"
2222
androidxTestCore = "1.5.0"
2323
androidxTestExt = "1.1.5"
2424
androidxTestRunner = "1.5.2"
2525
androidxTestRules = "1.5.0"
2626
androidxTracing = "1.2.0"
2727
androidxUiAutomator = "2.3.0"
2828
androidxWork = "2.9.0"
29-
firebaseBom = "32.8.1"
29+
firebaseBom = "33.1.0"
3030
hilt = "2.51.1"
3131
hiltExt = "1.2.0"
3232
junit4 = "4.13.2"
33-
kotlin = "1.9.23"
33+
kotlin = "1.9.24"
3434
kotlinxCoroutines = "1.8.0"
3535
kotlinxDatetime = "0.5.0"
3636
kotlinxSerializationJson = "1.6.3"
3737
ksp = "1.9.23-1.0.20"
38-
lint = "31.3.2"
38+
lint = "31.4.2"
3939
publishPlugin = "1.2.1"
4040
markdown = "0.4.1"
4141
leakcanary = "2.14"
4242
mockk = "1.13.10"
4343
slf4j = "2.0.13" # don't update
4444
robolectric = "4.12.1"
45-
material3 = "1.2.1"
46-
material = "1.6.6"
45+
material3 = "1.3.0-beta02"
46+
material = "1.6.7"
4747

4848
nordic-log = "2.3.0"
4949
nordicPlugins = "2.0.1"
5050
dokkaPlugin = "1.9.20"
51-
googleServicesPlugins = "4.4.1"
52-
firebaseCrashlyticsPlugins = "2.9.9"
51+
googleServicesPlugins = "4.4.2"
52+
firebaseCrashlyticsPlugins = "3.0.1"
5353

5454
[libraries]
5555
android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }

‎theme/src/main/java/no/nordicsemi/android/common/theme/NordicTheme.kt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import androidx.compose.material3.*
3939
import androidx.compose.runtime.Composable
4040
import androidx.compose.runtime.CompositionLocalProvider
4141
import androidx.compose.ui.Modifier
42+
import androidx.compose.ui.graphics.Color
4243
import androidx.compose.ui.res.colorResource
4344

4445
@Composable
@@ -61,6 +62,10 @@ fun NordicTheme(content: @Composable () -> Unit) {
6162
onBackground = colorResource(id = R.color.md_theme_onBackground),
6263
surface = colorResource(id = R.color.md_theme_surface),
6364
onSurface = colorResource(id = R.color.md_theme_onSurface),
65+
surfaceContainer = colorResource(id = R.color.md_theme_surfaceContainer),
66+
surfaceContainerLow = colorResource(id = R.color.md_theme_surfaceContainerLow),
67+
surfaceContainerHigh = colorResource(id = R.color.md_theme_surfaceContainerHigh),
68+
surfaceContainerHighest = colorResource(id = R.color.md_theme_surfaceContainerHighest),
6469
surfaceVariant = colorResource(id = R.color.md_theme_surfaceVariant),
6570
onSurfaceVariant = colorResource(id = R.color.md_theme_onSurfaceVariant),
6671
inverseSurface = colorResource(id = R.color.md_theme_inverseSurface),
@@ -89,6 +94,10 @@ fun NordicTheme(content: @Composable () -> Unit) {
8994
background = colorResource(id = R.color.md_theme_background),
9095
onBackground = colorResource(id = R.color.md_theme_onBackground),
9196
surface = colorResource(id = R.color.md_theme_surface),
97+
surfaceContainer = colorResource(id = R.color.md_theme_surfaceContainer),
98+
surfaceContainerLow = colorResource(id = R.color.md_theme_surfaceContainerLow),
99+
surfaceContainerHigh = colorResource(id = R.color.md_theme_surfaceContainerHigh),
100+
surfaceContainerHighest = colorResource(id = R.color.md_theme_surfaceContainerHighest),
92101
onSurface = colorResource(id = R.color.md_theme_onSurface),
93102
surfaceVariant = colorResource(id = R.color.md_theme_surfaceVariant),
94103
onSurfaceVariant = colorResource(id = R.color.md_theme_onSurfaceVariant),

‎theme/src/main/java/no/nordicsemi/android/common/theme/view/PagerView.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,19 @@
3131

3232
package no.nordicsemi.android.common.theme.view
3333

34-
import androidx.compose.foundation.ExperimentalFoundationApi
3534
import androidx.compose.foundation.layout.Column
3635
import androidx.compose.foundation.layout.PaddingValues
3736
import androidx.compose.foundation.layout.fillMaxWidth
3837
import androidx.compose.foundation.pager.HorizontalPager
3938
import androidx.compose.foundation.pager.PagerState
4039
import androidx.compose.foundation.pager.rememberPagerState
41-
import androidx.compose.material3.*
40+
import androidx.compose.material3.MaterialTheme
41+
import androidx.compose.material3.ScrollableTabRow
42+
import androidx.compose.material3.Tab
43+
import androidx.compose.material3.TabRow
4244
import androidx.compose.material3.TabRowDefaults.SecondaryIndicator
4345
import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
46+
import androidx.compose.material3.Text
4447
import androidx.compose.runtime.Composable
4548
import androidx.compose.runtime.rememberCoroutineScope
4649
import androidx.compose.ui.Alignment
@@ -61,7 +64,6 @@ class PagerViewItem(
6164
val drawView: @Composable () -> Unit,
6265
)
6366

64-
@OptIn(ExperimentalFoundationApi::class)
6567
@Composable
6668
fun PagerView(
6769
viewEntity: PagerViewEntity,
@@ -80,7 +82,6 @@ fun PagerView(
8082
)
8183
}
8284

83-
@OptIn(ExperimentalFoundationApi::class)
8485
@Composable
8586
fun PagerView(
8687
viewEntity: PagerViewEntity,

‎theme/src/main/java/no/nordicsemi/android/common/theme/view/WizardStepComponent.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ fun WizardStepComponent(
115115
CircularProgressIndicator(
116116
modifier = Modifier
117117
.size(48.dp)
118-
.padding(8.dp)
118+
.padding(8.dp),
119+
trackColor = MaterialTheme.colorScheme.surfaceVariant
119120
)
120121
}
121122
else -> {}

‎theme/src/main/res/values-night/colors_theme.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
<color name="md_theme_background">@android:color/black</color>
5353
<color name="md_theme_onBackground">#E1E2E5</color>
5454
<color name="md_theme_surface">#191C1E</color>
55+
<color name="md_theme_surfaceContainer">#1B282B</color>
56+
<color name="md_theme_surfaceContainerLow">#1B1F22</color>
57+
<color name="md_theme_surfaceContainerHigh">#2D3336</color>
58+
<color name="md_theme_surfaceContainerHighest">#42484B</color>
5559
<color name="md_theme_onSurface">#E1E2E5</color>
5660
<color name="md_theme_surfaceVariant">#40484B</color>
5761
<color name="md_theme_onSurfaceVariant">#BFC8CC</color>

‎theme/src/main/res/values/colors_theme.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
<color name="md_theme_background">@android:color/white</color>
5353
<color name="md_theme_onBackground">#191C1E</color>
5454
<color name="md_theme_surface">#F5F5F5</color>
55+
<color name="md_theme_surfaceContainer">#E4EFF2</color>
56+
<color name="md_theme_surfaceContainerLow">#EAF1F4</color>
57+
<color name="md_theme_surfaceContainerHigh">#E1E8EB</color>
58+
<color name="md_theme_surfaceContainerHighest">#DDE4E7</color>
5559
<color name="md_theme_onSurface">#191C1E</color>
5660
<color name="md_theme_surfaceVariant">#DCE4E8</color>
5761
<color name="md_theme_onSurfaceVariant">#40484B</color>

0 commit comments

Comments
 (0)