Skip to content

Commit 1c39df5

Browse files
TlasterTlaster
authored
Merge pull request #948 from DimensionDev/dependabot/gradle/androidx.window-window-core-1.4.0
Bump androidx.window:window-core from 1.3.0 to 1.4.0
2 parents 9dbe92e + 42df756 commit 1c39df5

File tree

7 files changed

+30
-23
lines changed

7 files changed

+30
-23
lines changed

‎app/src/main/java/dev/dimension/flare/ui/common/WindowSizeClass.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package dev.dimension.flare.ui.common
2+
3+
import androidx.window.core.layout.WindowSizeClass
4+
5+
internal fun WindowSizeClass.isCompat(): Boolean = this.minWidthDp < WindowSizeClass.WIDTH_DP_MEDIUM_LOWER_BOUND
6+
7+
internal fun WindowSizeClass.isNormal(): Boolean =
8+
this.minWidthDp in WindowSizeClass.WIDTH_DP_MEDIUM_LOWER_BOUND..WindowSizeClass.WIDTH_DP_EXPANDED_LOWER_BOUND
9+
10+
internal fun WindowSizeClass.isExpanded(): Boolean = this.minWidthDp > WindowSizeClass.WIDTH_DP_EXPANDED_LOWER_BOUND

‎app/src/main/java/dev/dimension/flare/ui/screen/home/DiscoverScreen.kt‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import androidx.compose.ui.Modifier
2929
import androidx.compose.ui.res.stringResource
3030
import androidx.compose.ui.text.style.TextOverflow
3131
import androidx.compose.ui.unit.dp
32-
import androidx.window.core.layout.WindowWidthSizeClass
3332
import com.ramcosta.composedestinations.annotation.Destination
3433
import com.ramcosta.composedestinations.annotation.RootGraph
3534
import com.ramcosta.composedestinations.generated.destinations.ProfileRouteDestination
@@ -40,6 +39,8 @@ import dev.dimension.flare.common.onLoading
4039
import dev.dimension.flare.common.onSuccess
4140
import dev.dimension.flare.model.AccountType
4241
import dev.dimension.flare.model.MicroBlogKey
42+
import dev.dimension.flare.ui.common.isCompat
43+
import dev.dimension.flare.ui.common.isNormal
4344
import dev.dimension.flare.ui.component.FlareScaffold
4445
import dev.dimension.flare.ui.component.RefreshContainer
4546
import dev.dimension.flare.ui.component.SearchBar
@@ -227,18 +228,14 @@ private fun DiscoverScreen(
227228
span = StaggeredGridItemSpan.FullLine,
228229
) {
229230
val maxItemsInEachRow =
230-
when (windowInfo.windowSizeClass.windowWidthSizeClass) {
231-
WindowWidthSizeClass.COMPACT -> {
232-
2
233-
}
234-
235-
WindowWidthSizeClass.MEDIUM -> {
236-
4
237-
}
238-
239-
else -> {
240-
8
241-
}
231+
if (windowInfo.windowSizeClass.isCompat()
232+
) {
233+
2
234+
} else if (windowInfo.windowSizeClass.isNormal()
235+
) {
236+
4
237+
} else {
238+
8
242239
}
243240
FlowRow(
244241
horizontalArrangement = Arrangement.spacedBy(8.dp),

‎app/src/main/java/dev/dimension/flare/ui/screen/home/NotificationScreen.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import androidx.compose.ui.Modifier
2121
import androidx.compose.ui.input.nestedscroll.nestedScroll
2222
import androidx.compose.ui.res.stringResource
2323
import androidx.compose.ui.unit.dp
24-
import androidx.window.core.layout.WindowWidthSizeClass
2524
import com.ramcosta.composedestinations.annotation.Destination
2625
import com.ramcosta.composedestinations.annotation.RootGraph
2726
import dev.dimension.flare.R
2827
import dev.dimension.flare.common.isRefreshing
2928
import dev.dimension.flare.data.datasource.microblog.NotificationFilter
3029
import dev.dimension.flare.model.AccountType
30+
import dev.dimension.flare.ui.common.isCompat
3131
import dev.dimension.flare.ui.component.AvatarComponent
3232
import dev.dimension.flare.ui.component.FlareScaffold
3333
import dev.dimension.flare.ui.component.FlareTopAppBar
@@ -89,7 +89,7 @@ private fun NotificationScreen(
8989
},
9090
scrollBehavior = topAppBarScrollBehavior,
9191
actions = {
92-
if (windowInfo.windowSizeClass.windowWidthSizeClass != WindowWidthSizeClass.COMPACT) {
92+
if (!windowInfo.windowSizeClass.isCompat()) {
9393
state.state.allTypes.onSuccess {
9494
if (it.size > 1) {
9595
NotificationFilterSelector(it, state.state)
@@ -121,7 +121,7 @@ private fun NotificationScreen(
121121
state = lazyListState,
122122
contentPadding = contentPadding,
123123
) {
124-
if (windowInfo.windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT) {
124+
if (windowInfo.windowSizeClass.isCompat()) {
125125
state.state.allTypes.onSuccess {
126126
if (it.size > 1) {
127127
item(

‎app/src/main/java/dev/dimension/flare/ui/screen/profile/ProfileScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ import androidx.compose.ui.platform.LocalDensity
5656
import androidx.compose.ui.res.stringResource
5757
import androidx.compose.ui.unit.dp
5858
import androidx.compose.ui.unit.toSize
59-
import androidx.window.core.layout.WindowWidthSizeClass
6059
import com.ramcosta.composedestinations.annotation.Destination
6160
import com.ramcosta.composedestinations.annotation.RootGraph
6261
import com.ramcosta.composedestinations.annotation.parameters.DeepLink
@@ -76,6 +75,7 @@ import dev.dimension.flare.common.onSuccess
7675
import dev.dimension.flare.data.datasource.microblog.ProfileTab
7776
import dev.dimension.flare.model.AccountType
7877
import dev.dimension.flare.model.MicroBlogKey
78+
import dev.dimension.flare.ui.common.isExpanded
7979
import dev.dimension.flare.ui.common.plus
8080
import dev.dimension.flare.ui.component.BackButton
8181
import dev.dimension.flare.ui.component.FlareScaffold
@@ -404,7 +404,7 @@ private fun ProfileScreen(
404404
with(LocalDensity.current) {
405405
currentWindowSize().toSize().toDpSize()
406406
}
407-
val bigScreen = windowInfo.windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.EXPANDED
407+
val bigScreen = windowInfo.windowSizeClass.isExpanded()
408408
val scope = rememberCoroutineScope()
409409
FlareScaffold(
410410
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),

‎app/src/main/java/dev/dimension/flare/ui/screen/status/VVOStatusScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import androidx.compose.ui.platform.LocalDensity
3333
import androidx.compose.ui.res.stringResource
3434
import androidx.compose.ui.unit.dp
3535
import androidx.compose.ui.unit.toSize
36-
import androidx.window.core.layout.WindowWidthSizeClass
3736
import com.ramcosta.composedestinations.annotation.Destination
3837
import com.ramcosta.composedestinations.annotation.RootGraph
3938
import com.ramcosta.composedestinations.annotation.parameters.DeepLink
@@ -47,6 +46,7 @@ import dev.dimension.flare.common.AppDeepLink
4746
import dev.dimension.flare.common.PagingState
4847
import dev.dimension.flare.model.AccountType
4948
import dev.dimension.flare.model.MicroBlogKey
49+
import dev.dimension.flare.ui.common.isExpanded
5050
import dev.dimension.flare.ui.common.plus
5151
import dev.dimension.flare.ui.component.BackButton
5252
import dev.dimension.flare.ui.component.FAIcon
@@ -131,7 +131,7 @@ private fun VVOStatusScreen(
131131
currentWindowSize().toSize().toDpSize()
132132
}
133133
val topAppBarScrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
134-
val bigScreen = windowInfo.windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.EXPANDED
134+
val bigScreen = windowInfo.windowSizeClass.isExpanded()
135135
FlareScaffold(
136136
topBar = {
137137
FlareTopAppBar(

‎app/src/main/java/dev/dimension/flare/ui/theme/Theme.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import androidx.compose.ui.platform.LocalContext
2020
import androidx.compose.ui.platform.LocalView
2121
import androidx.core.view.WindowCompat
2222
import androidx.navigation.NavBackStackEntry
23-
import androidx.window.core.layout.WindowWidthSizeClass
2423
import com.materialkolor.rememberDynamicColorScheme
2524
import com.ramcosta.composedestinations.animations.NavHostAnimatedDestinationStyle
2625
import dev.dimension.flare.data.model.LocalAppearanceSettings
2726
import dev.dimension.flare.data.model.Theme
27+
import dev.dimension.flare.ui.common.isExpanded
2828
import soup.compose.material.motion.animation.materialSharedAxisXIn
2929
import soup.compose.material.motion.animation.materialSharedAxisXOut
3030
import soup.compose.material.motion.animation.rememberSlideDistance
@@ -94,7 +94,7 @@ fun FlareTheme(
9494
val seed = Color(LocalAppearanceSettings.current.colorSeed)
9595
val pureColorMode = LocalAppearanceSettings.current.pureColorMode
9696
val windowInfo = currentWindowAdaptiveInfo()
97-
val bigScreen = windowInfo.windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.EXPANDED
97+
val bigScreen = windowInfo.windowSizeClass.isExpanded()
9898
val colorScheme =
9999
when {
100100
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ navigation-compose = { group = "androidx.navigation", name = "navigation-compose
9191
composeIcons-fontAwesome = { module = "moe.tlaster.compose.icons:font-awesome", version.ref = "composeIcons" }
9292
datastore = { group = "androidx.datastore", name = "datastore", version = "1.1.7" }
9393
desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
94-
androidx-window = { group = "androidx.window", name = "window-core", version = "1.3.0" }
94+
androidx-window = { group = "androidx.window", name = "window-core", version = "1.4.0" }
9595
androidx-splash = { group = "androidx.core", name = "core-splashscreen", version = "1.2.0-beta02" }
9696
room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
9797
room-paging = { group = "androidx.room", name = "room-paging", version.ref = "room" }

0 commit comments

Comments
 (0)