Migrate Compose sample to Material 3.

samples/compose/build.gradle.kts

@@ -94,7 +94,7 @@ kotlin {
                 implementation(projects.samples.shared)
                 implementation(projects.coilCompose)
                 implementation(compose.components.resources)
-                implementation(compose.material)
+                implementation(compose.material3)
             }
             resources.srcDir("../shared/src/commonMain/resources")
         }

samples/compose/src/commonMain/kotlin/sample/compose/App.kt

@@ -1,6 +1,7 @@
 package sample.compose
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -10,15 +11,17 @@ import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
 import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
 import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
 import androidx.compose.foundation.lazy.staggeredgrid.items
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.lightColors
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
@@ -74,10 +77,16 @@ fun App(
     }
 
     MaterialTheme(
-        colors = lightColors(
-            primary = Color.White,
-            onPrimary = Color.Black,
-        ),
+        colorScheme = if (isSystemInDarkTheme()) {
+            remember {
+                darkColorScheme(
+                    background = Color(0xFF141218),
+                    surface = Color(0xFF121212),
+                )
+            }
+        } else {
+            remember { lightColorScheme() }
+        },
     ) {
         val screen by viewModel.screen.collectAsState()
         val isDetail = screen is Screen.Detail
@@ -110,6 +119,7 @@ fun App(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun Toolbar(
     assetType: AssetType,
@@ -119,11 +129,13 @@ private fun Toolbar(
     onBackPressed: () -> Unit,
 ) {
     TopAppBar(
-        title = { Text(Title) },
-        navigationIcon = if (backEnabled) {
-            { BackIconButton(onBackPressed) }
-        } else {
-            null
+        title = {
+            Text(Title)
+        },
+        navigationIcon = {
+            if (backEnabled) {
+                BackIconButton(onBackPressed)
+            }
         },
         actions = {
             IconButton(

samples/compose/src/nonAndroidMain/kotlin/sample/compose/App.nonAndroid.kt

@@ -2,14 +2,23 @@ package sample.compose
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalWindowInfo
+import androidx.compose.ui.unit.IntSize
 
 @Stable
 actual fun Modifier.testTagsAsResourceId(enable: Boolean): Modifier {
     // Only supported on Android.
     return this
 }
 
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+actual fun containerSize(): IntSize {
+    return LocalWindowInfo.current.containerSize
+}
+
 @Composable
 actual fun BackHandler(
     enabled: Boolean,

samples/shared/build.gradle.kts

@@ -25,6 +25,7 @@ kotlin {
                 api(projects.coilVideo)
                 api(libs.androidx.core)
                 api(libs.androidx.lifecycle.viewmodel)
+                api(libs.google.material)
             }
         }
         appleMain {

samples/view/src/main/res/values-night/styles.xml → samples/shared/src/androidMain/res/values-night/styles.xml

@@ -5,7 +5,7 @@
         <item name="colorPrimaryDark">#121212</item>
         <item name="colorAccent">#121212</item>
 
-        <item name="android:statusBarColor">#00000000</item>
+        <item name="android:statusBarColor">#121212</item>
     </style>
 
     <style name="AppTheme" parent="AppTheme.v21"/>

samples/view/src/main/res/values-v23/styles.xml → samples/shared/src/androidMain/res/values-v23/styles.xml

@@ -1,11 +1,6 @@
 <resources>
 
     <style name="AppTheme.v23" parent="AppTheme.v21">
-        <item name="colorPrimary">#FFF</item>
-        <item name="colorPrimaryDark">#FFF</item>
-        <item name="colorAccent">#CCC</item>
-
-        <item name="android:statusBarColor">#00000000</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 

samples/view/src/main/res/values/styles.xml → samples/shared/src/androidMain/res/values/styles.xml

@@ -2,8 +2,10 @@
 
     <style name="AppTheme.v21" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">#FFF</item>
-        <item name="colorPrimaryDark">#AAA</item>
-        <item name="colorAccent">#CCC</item>
+        <item name="colorPrimaryDark">#FFF</item>
+        <item name="colorAccent">#FFF</item>
+
+        <item name="android:statusBarColor">#FFF</item>
     </style>
 
     <style name="AppTheme" parent="AppTheme.v21"/>

samples/view/build.gradle.kts

@@ -36,5 +36,4 @@ dependencies {
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.recyclerview)
-    implementation(libs.google.material)
 }