Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.08.01')
def composeBom = platform('androidx.compose:compose-bom:2025.10.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -97,16 +97,16 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"

implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.activity:activity-ktx:1.10.1'
implementation 'androidx.activity:activity-ktx:1.11.0'
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.activity:activity-compose:1.10.1"
implementation "androidx.activity:activity-compose:1.11.0"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.3"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.4"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4"

implementation 'androidx.navigation:navigation-compose:2.9.3'
implementation 'androidx.navigation:navigation-compose:2.9.5'

androidTestImplementation 'androidx.test:rules:1.7.0'
androidTestImplementation 'androidx.test:runner:1.7.0'
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '7.2.1'
id 'com.diffplug.spotless' version '8.0.0'
id 'org.jetbrains.kotlin.plugin.compose' version "2.1.21" apply false
}

Expand Down
Binary file modified AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions AccessibilityCodelab/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions AccessibilityCodelab/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {

defaultConfig {
applicationId = "com.example.reply"
minSdk = 21
minSdk = 23
targetSdk = 33
versionCode = 1
versionName = "1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.toSize
import com.example.reply.data.Email
import kotlinx.coroutines.launch

private val WINDOW_WIDTH_LARGE = 1200.dp

Expand Down Expand Up @@ -100,9 +102,10 @@ fun ReplyAppContent(
) {
val selectedEmail = replyHomeUIState.selectedEmail
val navigator = rememberListDetailPaneScaffoldNavigator<Long>()
val coroutineScope = rememberCoroutineScope()

BackHandler(navigator.canNavigateBack()) {
navigator.navigateBack()
coroutineScope.launch { navigator.navigateBack() }
}

ListDetailPaneScaffold(
Expand All @@ -114,7 +117,9 @@ fun ReplyAppContent(
replyHomeUIState = replyHomeUIState,
onEmailClick = { email ->
onEmailClick(email)
navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, email.id)
coroutineScope.launch {
navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, email.id)
}
}
)
}
Expand Down
10 changes: 5 additions & 5 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[versions]
androidGradlePlugin = "8.13.0"
composeBom = "2025.08.01"
composeBom = "2025.10.00"
coreKtx = "1.17.0"
activityCompose = "1.10.1"
activityCompose = "1.11.0"
espressoCore = "3.7.0"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.1.21"
kotlinxCoroutinesAndroid = "1.10.2"
lifecycle = "2.9.3"
lifecycle = "2.9.4"
material3Adaptive = "1.1.0"
material3AdaptiveNavSuite = "1.3.2"
window = "1.4.0"
material3AdaptiveNavSuite = "1.4.0"
window = "1.5.0"

[libraries]
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
Expand Down
Binary file modified AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions AdaptiveUiCodelab/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions AdaptiveUiCodelab/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.10.1"
implementation "androidx.activity:activity-compose:1.11.0"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.tracing:tracing:1.3.0"

def composeBom = platform('androidx.compose:compose-bom:2025.08.01')
def composeBom = platform('androidx.compose:compose-bom:2025.10.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -121,12 +121,12 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-test-manifest"


def lifecycle_version = "2.9.3"
def lifecycle_version = "2.9.4"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.57.1"
kapt "com.google.dagger:hilt-compiler:2.57.1"
implementation "com.google.dagger:hilt-android:2.57.2"
kapt "com.google.dagger:hilt-compiler:2.57.2"

implementation "io.coil-kt:coil-compose:2.7.0"

Expand All @@ -137,7 +137,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0"
androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
androidTestImplementation "com.google.dagger:hilt-android:2.57.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.1"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.1"
androidTestImplementation "com.google.dagger:hilt-android:2.57.2"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.2"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.2"
}
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ buildscript {
dependencies {
classpath "com.android.tools.build:gradle:8.13.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.1"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
}

plugins {
id 'com.diffplug.spotless' version '7.2.1'
id 'com.diffplug.spotless' version '8.0.0'
}

subprojects {
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions AdvancedStateAndSideEffectsCodelab/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions AdvancedStateAndSideEffectsCodelab/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.08.01')
def composeBom = platform('androidx.compose:compose-bom:2025.10.00')
implementation(composeBom)
androidTestImplementation(composeBom)

implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.compose.ui:ui"
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material3:material3-window-size-class:1.3.2'
implementation 'androidx.compose.material3:material3-window-size-class:1.4.0'
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.13.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.3'
implementation 'androidx.activity:activity-compose:1.10.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.4'
implementation 'androidx.activity:activity-compose:1.11.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '7.2.1'
id 'com.diffplug.spotless' version '8.0.0'
}

subprojects {
Expand Down
Binary file modified BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading