From 9e2aa0ad69f2df157974d51945fdd746bb6d9ee2 Mon Sep 17 00:00:00 2001 From: Android dev Date: Mon, 1 May 2023 19:23:11 -0700 Subject: [PATCH] Codelab updates --- app/build.gradle | 10 ++++----- .../java/com/example/tiptime/MainActivity.kt | 22 ++++--------------- build.gradle | 4 ++-- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 14 insertions(+), 26 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 73bc428..58f0dff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,18 +65,18 @@ android { dependencies { - implementation platform('androidx.compose:compose-bom:2023.01.00') - implementation 'androidx.activity:activity-compose:1.6.1' + implementation platform('androidx.compose:compose-bom:2023.04.01') + implementation 'androidx.activity:activity-compose:1.7.1' implementation 'androidx.compose.material3:material3' implementation 'androidx.compose.ui:ui' implementation "androidx.compose.ui:ui-tooling" implementation 'androidx.compose.ui:ui-tooling-preview' - implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0' + implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation platform('androidx.compose:compose-bom:2023.01.00') + androidTestImplementation platform('androidx.compose:compose-bom:2023.04.01') androidTestImplementation 'androidx.compose.ui:ui-test-junit4' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/app/src/main/java/com/example/tiptime/MainActivity.kt b/app/src/main/java/com/example/tiptime/MainActivity.kt index f4ea76e..fe2efc5 100644 --- a/app/src/main/java/com/example/tiptime/MainActivity.kt +++ b/app/src/main/java/com/example/tiptime/MainActivity.kt @@ -31,8 +31,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Icon @@ -48,11 +46,9 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview @@ -96,7 +92,6 @@ fun TipTimeLayout() { horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { - val largePadding = 32.dp Text( text = stringResource(R.string.calculate_tip), modifier = Modifier @@ -110,12 +105,9 @@ fun TipTimeLayout() { keyboardType = KeyboardType.Number, imeAction = ImeAction.Next ), - keyboardActions = KeyboardActions( - onNext = { focusManager.moveFocus(FocusDirection.Down) } - ), value = amountInput, onValueChanged = { amountInput = it }, - modifier = Modifier.padding(bottom = largePadding).fillMaxWidth(), + modifier = Modifier.padding(bottom = 32.dp).fillMaxWidth(), ) EditNumberField( label = R.string.how_was_the_service, @@ -124,17 +116,14 @@ fun TipTimeLayout() { keyboardType = KeyboardType.Number, imeAction = ImeAction.Done ), - keyboardActions = KeyboardActions( - onDone = { focusManager.clearFocus() } - ), value = tipInput, onValueChanged = { tipInput = it }, - modifier = Modifier.padding(bottom = largePadding).fillMaxWidth(), + modifier = Modifier.padding(bottom = 32.dp).fillMaxWidth(), ) RoundTheTipRow( roundUp = roundUp, onRoundUpChanged = { roundUp = it }, - modifier = Modifier.padding(bottom = largePadding) + modifier = Modifier.padding(bottom = 32.dp) ) Text( text = stringResource(R.string.tip_amount, tip), @@ -149,7 +138,6 @@ fun EditNumberField( @StringRes label: Int, @DrawableRes leadingIcon: Int, keyboardOptions: KeyboardOptions, - keyboardActions: KeyboardActions, value: String, onValueChanged: (String) -> Unit, modifier: Modifier = Modifier @@ -159,11 +147,9 @@ fun EditNumberField( singleLine = true, leadingIcon = { Icon(painter = painterResource(id = leadingIcon), null) }, modifier = modifier, - shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp), onValueChange = onValueChanged, label = { Text(stringResource(label)) }, - keyboardOptions = keyboardOptions, - keyboardActions = keyboardActions + keyboardOptions = keyboardOptions ) } diff --git a/build.gradle b/build.gradle index ade3e11..f7b4c93 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { } // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '8.0.0' apply false + id 'com.android.library' version '8.0.0' apply false id 'org.jetbrains.kotlin.android' version '1.8.10' apply false } diff --git a/gradle.properties b/gradle.properties index 2cbd6d1..0f025bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,3 +21,5 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f095944..a3c0b5b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Nov 12 13:07:13 PST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME