Merge pull request android#293 from googlecodelabs/jv/basics-m3

Update Basics codelab code to M3

Author: JolandaVerhoef

BasicsCodelab/app/build.gradle

@@ -16,20 +16,31 @@
 
 plugins {
  id 'com.android.application'
- id 'kotlin-android'
+ id 'org.jetbrains.kotlin.android'
 }
 
 android {
- compileSdkVersion 33
+ namespace 'com.codelab.basics'
+ compileSdk 33
 
  defaultConfig {
  applicationId "com.codelab.basics"
- minSdkVersion 21
- targetSdkVersion 33
+ minSdk 21
+ targetSdk 33
  versionCode 1
  versionName "1.0"
 
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ vectorDrawables {
+ useSupportLibrary true
+ }
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
  }
  compileOptions {
  sourceCompatibility JavaVersion.VERSION_1_8
@@ -43,22 +54,22 @@ android {
  compose true
  }
  composeOptions {
- kotlinCompilerExtensionVersion "${composeCompiler_version}"
+ kotlinCompilerExtensionVersion "1.3.2"
  }
 }
 
 dependencies {
- implementation 'androidx.core:core-ktx:1.9.0'
- implementation 'androidx.appcompat:appcompat:1.5.1'
- implementation 'com.google.android.material:material:1.6.1'
+ implementation 'androidx.core:core-ktx:1.7.0'
+ implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+ implementation 'androidx.activity:activity-compose:1.5.1'
  implementation "androidx.compose.ui:ui:$compose_version"
- implementation 'androidx.activity:activity-compose:1.6.0'
- implementation "androidx.compose.material:material:$compose_version"
  implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+ implementation 'androidx.compose.material3:material3:1.0.0-SNAPSHOT'
  implementation "androidx.compose.material:material-icons-extended:$compose_version"
- debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-
  testImplementation 'junit:junit:4.13.2'
  androidTestImplementation 'androidx.test.ext:junit:1.1.3'
  androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+ androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
+ debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+ debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
 }

BasicsCodelab/app/src/main/AndroidManifest.xml

@@ -12,8 +12,7 @@
  or implied. See the License for the specific language governing permissions and limitations under
  the License.
  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.codelab.basics">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
  <application
  android:allowBackup="true"

BasicsCodelab/app/src/main/java/com/codelab/basics/MainActivity.kt

@@ -30,16 +30,17 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material.Button
-import androidx.compose.material.Card
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons.Filled
 import androidx.compose.material.icons.filled.ExpandLess
 import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -52,52 +53,58 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.codelab.basics.ui.BasicsCodelabTheme
+import com.codelab.basics.ui.theme.BasicsCodelabTheme
 
 class MainActivity : ComponentActivity() {
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
  setContent {
  BasicsCodelabTheme {
- MyApp()
+ MyApp(modifier = Modifier.fillMaxSize())
  }
  }
  }
 }
 
 @Composable
-private fun MyApp() {
+fun MyApp(modifier: Modifier = Modifier) {
  var shouldShowOnboarding by rememberSaveable { mutableStateOf(true) }
 
- if (shouldShowOnboarding) {
- OnboardingScreen(onContinueClicked = { shouldShowOnboarding = false })
- } else {
- Greetings()
+ Surface(modifier, color = MaterialTheme.colorScheme.background) {
+ if (shouldShowOnboarding) {
+ OnboardingScreen(onContinueClicked = { shouldShowOnboarding = false })
+ } else {
+ Greetings()
+ }
  }
 }
 
 @Composable
-private fun OnboardingScreen(onContinueClicked: () -> Unit) {
- Surface {
- Column(
- modifier = Modifier.fillMaxSize(),
- verticalArrangement = Arrangement.Center,
- horizontalAlignment = Alignment.CenterHorizontally
+fun OnboardingScreen(
+ onContinueClicked: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ Column(
+ modifier = modifier.fillMaxSize(),
+ verticalArrangement = Arrangement.Center,
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Text("Welcome to the Basics Codelab!")
+ Button(
+ modifier = Modifier.padding(vertical = 24.dp),
+ onClick = onContinueClicked
  ) {
- Text("Welcome to the Basics Codelab!")
- Button(
- modifier = Modifier.padding(vertical = 24.dp),
- onClick = onContinueClicked
- ) {
- Text("Continue")
- }
+ Text("Continue")
  }
  }
 }
 
 @Composable
-private fun Greetings(names: List<String> = List(1000) { "$it" } ) {
- LazyColumn(modifier = Modifier.padding(vertical = 4.dp)) {
+private fun Greetings(
+ modifier: Modifier = Modifier,
+ names: List<String> = List(1000) { "$it" }
+) {
+ LazyColumn(modifier = modifier.padding(vertical = 4.dp)) {
  items(items = names) { name ->
  Greeting(name = name)
  }
@@ -107,7 +114,9 @@ private fun Greetings(names: List<String> = List(1000) { "$it" } ) {
 @Composable
 private fun Greeting(name: String) {
  Card(
- backgroundColor = MaterialTheme.colors.primary,
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.primary
+ ),
  modifier = Modifier.padding(vertical = 4.dp, horizontal = 8.dp)
  ) {
  CardContent(name)
@@ -135,8 +144,7 @@ private fun CardContent(name: String) {
  ) {
  Text(text = "Hello, ")
  Text(
- text = name,
- style = MaterialTheme.typography.h4.copy(
+ text = name, style = MaterialTheme.typography.headlineMedium.copy(
  fontWeight = FontWeight.ExtraBold
  )
  )
@@ -155,7 +163,6 @@ private fun CardContent(name: String) {
  } else {
  stringResource(R.string.show_more)
  }
-
  )
  }
  }
@@ -182,3 +189,11 @@ fun OnboardingPreview() {
  OnboardingScreen(onContinueClicked = {})
  }
 }
+
+@Preview
+@Composable
+fun MyAppPreview() {
+ BasicsCodelabTheme {
+ MyApp(Modifier.fillMaxSize())
+ }
+}

BasicsCodelab/app/src/main/java/com/codelab/basics/ui/Shape.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.codelab.basics.ui
+package com.codelab.basics.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

BasicsCodelab/app/src/main/java/com/codelab/basics/ui/Theme.kt

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.codelab.basics.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.ViewCompat
+
+private val DarkColorScheme = darkColorScheme(
+ surface = Blue,
+ onSurface = Navy,
+ primary = Navy,
+ onPrimary = Chartreuse
+)
+
+private val LightColorScheme = lightColorScheme(
+ surface = Blue,
+ onSurface = Color.White,
+ primary = LightBlue,
+ onPrimary = Navy
+)
+
+@Suppress("DEPRECATION")
+@Composable
+fun BasicsCodelabTheme(
+ darkTheme: Boolean = isSystemInDarkTheme(),
+ // Dynamic color is available on Android 12+
+ dynamicColor: Boolean = true,
+ content: @Composable () -> Unit
+) {
+ val colorScheme = when {
+ dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+ val context = LocalContext.current
+ if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+ }
+ darkTheme -> DarkColorScheme
+ else -> LightColorScheme
+ }
+ val view = LocalView.current
+ if (!view.isInEditMode) {
+ SideEffect {
+ (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb()
+ ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
+ }
+ }
+
+ MaterialTheme(
+ colorScheme = colorScheme,
+ typography = Typography,
+ content = content
+ )
+}