Skip to content

Commit 6f1c66b

Browse files
committed
update m3
1 parent f9ad63a commit 6f1c66b

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

app/src/main/java/com/vanced/store/ui/component/Preferences.kt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.vanced.store.ui.component
22

33
import androidx.compose.foundation.layout.*
4-
import androidx.compose.material3.CardDefaults
54
import androidx.compose.material3.ProvideTextStyle
65
import androidx.compose.runtime.Composable
76
import androidx.compose.ui.Alignment

app/src/main/java/com/vanced/store/ui/widget/ScreenScaffold.kt

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ package com.vanced.store.ui.widget
22

33
import androidx.compose.animation.rememberSplineBasedDecay
44
import androidx.compose.foundation.layout.PaddingValues
5-
import androidx.compose.material3.FabPosition
6-
import androidx.compose.material3.Scaffold
7-
import androidx.compose.material3.TopAppBarDefaults
8-
import androidx.compose.material3.TopAppBarScrollBehavior
5+
import androidx.compose.material3.*
96
import androidx.compose.runtime.Composable
107
import androidx.compose.runtime.remember
118
import androidx.compose.ui.Modifier
@@ -20,10 +17,9 @@ fun ScreenScaffold(
2017
floatingActionButtonPosition: FabPosition = FabPosition.End,
2118
content: @Composable (PaddingValues) -> Unit
2219
) {
20+
val topbarScrollState = rememberTopAppBarScrollState()
2321
val decayAnimationSpec = rememberSplineBasedDecay<Float>()
24-
val scrollBehavior = remember(decayAnimationSpec) {
25-
TopAppBarDefaults.exitUntilCollapsedScrollBehavior(decayAnimationSpec)
26-
}
22+
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(decayAnimationSpec, topbarScrollState)
2723
Scaffold(
2824
modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
2925
topBar = { topBar(scrollBehavior) },

buildSrc/src/main/kotlin/Dependencies.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ sealed class Dependencies {
7676
private const val foundation = "androidx.compose.foundation:foundation:$version"
7777
private const val runtime = "androidx.compose.runtime:runtime:$version"
7878
private const val material = "androidx.compose.material:material:$version"
79-
private const val material3 = "androidx.compose.material3:material3:1.0.0-alpha12"
79+
private const val material3 = "androidx.compose.material3:material3:1.0.0-alpha14"
8080

8181
override fun applyDependencies(scope: DependencyHandlerScope) {
8282
scope {

0 commit comments

Comments
 (0)