Migration to material3 1.2.0-alpha11

NordicPlayground · Nov 17, 2023 · e161205 · e161205
1 parent b41a14b
commit e161205
Showing 9 changed files with 39 additions and 31 deletions.
diff --git a/app/src/main/java/no/nordicsemi/android/common/test/MainActivity.kt b/app/src/main/java/no/nordicsemi/android/common/test/MainActivity.kt
@@ -126,7 +126,7 @@ class MainActivity : NordicActivity() {
                                 modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding)
                             )
 
-                            Divider(
+                            HorizontalDivider(
                                 modifier = Modifier.padding(NavigationDrawerDividerDefaults.ItemPadding)
                             )
 

diff --git a/app/src/main/java/no/nordicsemi/android/common/test/main/page/BasicViewsPage.kt b/app/src/main/java/no/nordicsemi/android/common/test/main/page/BasicViewsPage.kt
@@ -31,14 +31,29 @@
 
 package no.nordicsemi.android.common.test.main.page
 
-import android.annotation.SuppressLint
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedCard
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -48,14 +63,11 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
 import no.nordicsemi.android.common.navigation.Navigator
 import no.nordicsemi.android.common.test.R
 import no.nordicsemi.android.common.test.simple.Hello
 import no.nordicsemi.android.common.theme.NordicTheme
 import no.nordicsemi.android.common.theme.view.PagerViewItem
-import no.nordicsemi.android.kotlin.ble.core.ServerDevice
-import java.util.*
 import javax.inject.Inject
 
 val BasicsPage = PagerViewItem("Basics") {
@@ -75,14 +87,6 @@ class BasicPageViewModel @Inject constructor(
     }
 }
 
-@SuppressLint("MissingPermission")
-data class DeviceInfo(
-    private val device: ServerDevice?
-) {
-    val name = device?.name ?: "Unknown"
-    val address = device?.address ?: "Unknown"
-}
-
 @Composable
 private fun BasicViewsScreen(
     onOpenSimple: () -> Unit,

diff --git a/app/src/main/java/no/nordicsemi/android/common/test/main/page/WizardPage.kt b/app/src/main/java/no/nordicsemi/android/common/test/main/page/WizardPage.kt
@@ -117,14 +117,15 @@ private fun WizardScreen() {
                     iconRightPadding = 24.dp,
                 )
 
-                val infiniteTransition = rememberInfiniteTransition()
+                val infiniteTransition = rememberInfiniteTransition(label = "ProgressTransition")
                 val progress by infiniteTransition.animateFloat(
                     initialValue = 0.0f,
                     targetValue = 1.0f,
                     animationSpec = infiniteRepeatable(
                         animation = tween(10000, easing = LinearEasing),
                         repeatMode = RepeatMode.Restart
-                    )
+                    ),
+                    label = "Progress"
                 )
 
                 ProgressItem(
@@ -133,8 +134,8 @@ private fun WizardScreen() {
                     iconRightPadding = 24.dp,
                 ) {
                     LinearProgressIndicator(
-                        progress = progress,
-                        modifier = Modifier.fillMaxWidth()
+                        progress = { progress },
+                        modifier = Modifier.fillMaxWidth(),
                     )
                     Text(
                         text = "%.1f%%".format(progress * 100),

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -42,6 +42,8 @@ leakcanary = "2.12"
 mockk = "1.13.8"
 slf4j = "2.0.9"
 robolectric = "4.11.1"
+material3 = "1.2.0-alpha11"
+material = "1.6.0-beta01"
 
 nordic-log = "2.3.0"
 nordicPlugins = "1.9.13"
@@ -58,9 +60,9 @@ androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-mac
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
 androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
 androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
-androidx-compose-material = { group = "androidx.compose.material", name = "material" }
+androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "material" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
-androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-compose-material3-windowSizeClass = {group = "androidx.compose.material3", name = "material3-window-size-class" }
 androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
 androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" }

diff --git a/theme/src/main/java/no/nordicsemi/android/common/theme/NordicActivity.kt b/theme/src/main/java/no/nordicsemi/android/common/theme/NordicActivity.kt
@@ -68,7 +68,7 @@ abstract class NordicActivity : ComponentActivity() {
                 )
             } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 val flags = view.systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-                view.setSystemUiVisibility(flags)
+                view.systemUiVisibility = flags
             }
         }
 

diff --git a/theme/src/main/java/no/nordicsemi/android/common/theme/view/NordicAppBar.kt b/theme/src/main/java/no/nordicsemi/android/common/theme/view/NordicAppBar.kt
@@ -33,7 +33,7 @@ package no.nordicsemi.android.common.theme.view
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
@@ -49,7 +49,7 @@ fun NordicAppBar(
     onNavigationButtonClick: (() -> Unit)? = null,
     onHamburgerButtonClick: (() -> Unit)? = null,
     showBackButton: Boolean = onNavigationButtonClick != null,
-    backButtonIcon:ImageVector = Icons.Default.ArrowBack,
+    backButtonIcon:ImageVector = Icons.AutoMirrored.Filled.ArrowBack,
     showHamburgerButton: Boolean = onHamburgerButtonClick != null,
     scrollBehavior: TopAppBarScrollBehavior? = null,
     actions: @Composable RowScope.() -> Unit = {},

diff --git a/theme/src/main/java/no/nordicsemi/android/common/theme/view/NordicLargeAppBar.kt b/theme/src/main/java/no/nordicsemi/android/common/theme/view/NordicLargeAppBar.kt
@@ -35,7 +35,7 @@ package no.nordicsemi.android.common.theme.view
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
@@ -50,7 +50,7 @@ fun NordicLargeAppBar(
     onNavigationButtonClick: (() -> Unit)? = null,
     onHamburgerButtonClick: (() -> Unit)? = null,
     showBackButton: Boolean = onNavigationButtonClick != null,
-    backButtonIcon: ImageVector = Icons.Default.ArrowBack,
+    backButtonIcon: ImageVector = Icons.AutoMirrored.Filled.ArrowBack,
     showHamburgerButton: Boolean = onHamburgerButtonClick != null,
     scrollBehavior: TopAppBarScrollBehavior? = null,
     actions: @Composable RowScope.() -> Unit = {},

diff --git a/theme/src/main/java/no/nordicsemi/android/common/theme/view/PagerView.kt b/theme/src/main/java/no/nordicsemi/android/common/theme/view/PagerView.kt
@@ -39,6 +39,7 @@ 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.TabRowDefaults.SecondaryIndicator
 import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
@@ -103,7 +104,7 @@ fun PagerView(
                 containerColor = colorResource(id = R.color.appBarColor),
                 contentColor = MaterialTheme.colorScheme.onPrimary,
                 indicator = @Composable { tabPositions ->
-                    TabRowDefaults.Indicator(
+                    SecondaryIndicator(
                         Modifier.tabIndicatorOffset(tabPositions[tabIndex]),
                         color = MaterialTheme.colorScheme.onPrimary
                     )
@@ -130,7 +131,7 @@ fun PagerView(
                 containerColor = colorResource(id = R.color.appBarColor),
                 contentColor = MaterialTheme.colorScheme.onPrimary,
                 indicator = @Composable { tabPositions ->
-                    TabRowDefaults.Indicator(
+                    SecondaryIndicator(
                         Modifier.tabIndicatorOffset(tabPositions[tabIndex]),
                         color = MaterialTheme.colorScheme.onPrimary
                     )

diff --git a/theme/src/main/java/no/nordicsemi/android/common/theme/view/ProgressItem.kt b/theme/src/main/java/no/nordicsemi/android/common/theme/view/ProgressItem.kt
@@ -122,8 +122,8 @@ private fun ProgressItemPreview_Working() {
             status = ProgressItemStatus.WORKING,
         ) {
             LinearProgressIndicator(
-                progress = 0.3f,
-                modifier = Modifier.fillMaxWidth()
+                progress = { 0.3f },
+                modifier = Modifier.fillMaxWidth(),
             )
             Text(
                 text = "30%",