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
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ android {

defaultConfig {
applicationId = "com.example.platform"
minSdk = 23
minSdk = 24
targetSdk = 36
versionCode = 1
versionName = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ play-services-location = "21.1.0"
accompanist = "0.32.0"
androidx-datastore = "1.0.0"
androidx-navigation = "2.7.7"
androidx-window = "1.4.0-rc01"
androidx-window = "1.5.0"
casa = "0.5.1"
gradleDownloadTask = "4.1.2"
ksp = "1.9.22-1.0.17"
Expand Down
4 changes: 2 additions & 2 deletions samples/user-interface/windowmanager/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ android {
compileSdk = 36

defaultConfig {
minSdk = 21
targetSdk = 35
minSdk = 24
testOptions.targetSdk = 36
}
kotlinOptions {
jvmTarget = "1.8"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import androidx.window.core.layout.WindowSizeClass
import androidx.window.core.layout.WindowSizeClass.Companion.HEIGHT_DP_EXPANDED_LOWER_BOUND
import androidx.window.core.layout.WindowSizeClass.Companion.HEIGHT_DP_MEDIUM_LOWER_BOUND
import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_EXPANDED_LOWER_BOUND
import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_EXTRA_LARGE_LOWER_BOUND
import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_LARGE_LOWER_BOUND
import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
import androidx.window.core.layout.computeWindowSizeClass

Expand Down Expand Up @@ -53,7 +55,7 @@ class WindowMetricsActivity : AppCompatActivity() {
val width = windowMetrics.bounds.width()
val height = windowMetrics.bounds.height()
val density = resources.displayMetrics.density
val windowSizeClass = WindowSizeClass.BREAKPOINTS_V1.computeWindowSizeClass(width/density, height/density)
val windowSizeClass = WindowSizeClass.BREAKPOINTS_V2.computeWindowSizeClass(width/density, height/density)

adapter.append("WindowMetrics update", "width: $width, height: $height")
adapter.append("WindowSize Class", "Height: " + getHeightSizeClass(windowSizeClass) + "\nWidth: " + getWidthSizeClass(windowSizeClass))
Expand All @@ -62,29 +64,19 @@ class WindowMetricsActivity : AppCompatActivity() {

private fun getWidthSizeClass(sizeClass: WindowSizeClass): String {
return when {
sizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_EXPANDED_LOWER_BOUND) -> {
"EXPANDED"
}
sizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND) -> {
"MEDIUM"
}
else -> {
"COMPACT"
}
sizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_EXTRA_LARGE_LOWER_BOUND) -> "EXTRA-LARGE"
sizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_LARGE_LOWER_BOUND) -> "LARGE"
sizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_EXPANDED_LOWER_BOUND) -> "EXPANDED"
sizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND) -> "MEDIUM"
else -> "COMPACT"
}
}

private fun getHeightSizeClass(sizeClass: WindowSizeClass): String {
return when {
sizeClass.isHeightAtLeastBreakpoint(HEIGHT_DP_EXPANDED_LOWER_BOUND) -> {
"EXPANDED"
}
sizeClass.isHeightAtLeastBreakpoint(HEIGHT_DP_MEDIUM_LOWER_BOUND) -> {
"MEDIUM"
}
else -> {
"COMPACT"
}
sizeClass.isHeightAtLeastBreakpoint(HEIGHT_DP_EXPANDED_LOWER_BOUND) -> "EXPANDED"
sizeClass.isHeightAtLeastBreakpoint(HEIGHT_DP_MEDIUM_LOWER_BOUND) -> "MEDIUM"
else -> "COMPACT"
}
}
}
Loading