From cf37677e980f20073976564fee86ffad5b66aa18 Mon Sep 17 00:00:00 2001 From: Jon Eckenrode Date: Wed, 11 Dec 2024 22:52:03 +0000 Subject: [PATCH 1/4] Replaced deprecated WindowHeightSizeClass with isHeightAtLeastBreakpoint. --- .../compose/snippets/layouts/AdaptiveLayoutSnippets.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt index 7980eae05..7eaba09ed 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt @@ -52,9 +52,9 @@ fun MyApp( windowSizeClass: WindowSizeClass = currentWindowAdaptiveInfo().windowSizeClass ) { // Perform logic on the size class to decide whether to show the top app bar. - val showTopAppBar = windowSizeClass.windowHeightSizeClass != WindowHeightSizeClass.COMPACT + val showTopAppBar = windowSizeClass.isHeightAtLeastBreakpoint(480) - // MyScreen knows nothing about window sizes, and performs logic based on a Boolean flag. + // MyScreen knows nothing about window sizes, and performs logic based on a boolean flag. MyScreen( showTopAppBar = showTopAppBar, /* ... */ From 9ced8fbbb636c34d7858114762b9c9d8724b1e79 Mon Sep 17 00:00:00 2001 From: JonEckenrode Date: Wed, 11 Dec 2024 23:08:01 +0000 Subject: [PATCH 2/4] Apply Spotless --- .../example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt index 7eaba09ed..7e5adba94 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt @@ -28,7 +28,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.unit.dp -import androidx.window.core.layout.WindowHeightSizeClass import androidx.window.core.layout.WindowSizeClass /* From 5acb8a7f5ee480f00077e810f1f071969f6fc11c Mon Sep 17 00:00:00 2001 From: Jon Eckenrode Date: Wed, 11 Dec 2024 22:52:03 +0000 Subject: [PATCH 3/4] Replaced deprecated WindowHeightSizeClass with isHeightAtLeastBreakpoint. --- .../compose/snippets/layouts/AdaptiveLayoutSnippets.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt index 7980eae05..9447582cf 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/AdaptiveLayoutSnippets.kt @@ -28,7 +28,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.unit.dp -import androidx.window.core.layout.WindowHeightSizeClass import androidx.window.core.layout.WindowSizeClass /* @@ -51,10 +50,10 @@ import androidx.window.core.layout.WindowSizeClass fun MyApp( windowSizeClass: WindowSizeClass = currentWindowAdaptiveInfo().windowSizeClass ) { - // Perform logic on the size class to decide whether to show the top app bar. - val showTopAppBar = windowSizeClass.windowHeightSizeClass != WindowHeightSizeClass.COMPACT + // Decide whether to show the top app bar based on window size class. + val showTopAppBar = windowSizeClass.isHeightAtLeastBreakpoint(WindowSizeClass.HEIGHT_DP_MEDIUM_LOWER_BOUND) - // MyScreen knows nothing about window sizes, and performs logic based on a Boolean flag. + // MyScreen logic is based on the showTopAppBar boolean flag. MyScreen( showTopAppBar = showTopAppBar, /* ... */ From 94c805cc7e88d5f48073bbf3bf2e174b3879cd7f Mon Sep 17 00:00:00 2001 From: Jon Eckenrode Date: Tue, 7 Jan 2025 21:08:18 +0000 Subject: [PATCH 4/4] Updated androidx-window to 1.4.0-alpha05. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6b75440fe..bc15f0464 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ androidx-navigation = "2.8.4" androidx-paging = "3.3.4" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" -androidx-window = "1.3.0" +androidx-window = "1.4.0-alpha05" androidxHiltNavigationCompose = "1.2.0" coil = "2.7.0" # @keep