Skip to content

Commit

Permalink
[build|fix]更新依赖版本;修复首页“添加”FAB遮挡搜索结果“到顶部”FAB的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
SkyD666 committed Sep 26, 2023
1 parent 725d4eb commit ca19415
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ android {
minSdk 24
targetSdk 34
versionCode 33
versionName "1.6-beta02"
versionName "1.6-beta03"
flavorDimensions = ["versionName"]

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -124,7 +124,7 @@ kapt {

dependencies {

implementation "androidx.core:core-ktx:1.10.1"
implementation "androidx.core:core-ktx:1.12.0"
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material3:material3:$md3_version"
implementation "androidx.compose.material3:material3-window-size-class:$md3_version"
Expand All @@ -138,7 +138,7 @@ dependencies {
implementation "com.google.dagger:hilt-android:2.48"
kapt "com.google.dagger:hilt-android-compiler:2.48"
implementation "androidx.hilt:hilt-navigation-compose:1.0.0"
implementation "androidx.navigation:navigation-compose:2.7.1"
implementation "androidx.navigation:navigation-compose:2.7.3"
implementation "androidx.security:security-crypto:1.1.0-alpha06"
implementation "com.google.accompanist:accompanist-drawablepainter:$accompanist_version"
implementation "io.coil-kt:coil-compose:2.4.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ fun HomeScreen(viewModel: HomeViewModel = hiltViewModel()) {
val stickerDetailInfoScrollState = rememberScrollState()
val fabVisibility by remember {
derivedStateOf {
if (windowSizeClass.isCompact) {
!active && if (windowSizeClass.isCompact) {
mainCardScrollState.inBottomOrNotLarge
} else {
stickerDetailInfoScrollState.inBottomOrNotLarge
Expand Down

0 comments on commit ca19415

Please sign in to comment.