feat: upgrade version and fix some warning

huhx · Feb 13, 2024 · efeeb05 · efeeb05
1 parent bb2d42a
commit efeeb05
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
     implementation 'androidx.activity:activity-compose:1.8.2'
 
-    implementation 'androidx.navigation:navigation-compose:2.7.6'
+    implementation 'androidx.navigation:navigation-compose:2.7.7'
 
     implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
 
@@ -62,5 +62,5 @@ dependencies {
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.6.0'
+    debugImplementation 'androidx.compose.ui:ui-tooling:1.6.1'
 }
diff --git a/compose_image_picker/build.gradle b/compose_image_picker/build.gradle
@@ -102,19 +102,20 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
 
-    implementation platform("dev.chrisbanes.compose:compose-bom:2024.01.00-alpha03")
+    implementation platform("dev.chrisbanes.compose:compose-bom:2024.02.00-alpha01")
     implementation 'androidx.compose.material3:material3'
     implementation "androidx.compose.ui:ui"
 
-    implementation "com.google.accompanist:accompanist-permissions:0.34.0"
+    implementation "com.google.accompanist:accompanist-permissions:0.35.0-alpha"
 
-    implementation 'androidx.navigation:navigation-compose:2.7.6'
+    implementation 'androidx.navigation:navigation-compose:2.7.7'
 
+    def coil_version = "2.5.0"
     implementation "io.coil-kt:coil-compose:$coil_version"
     implementation "io.coil-kt:coil-video:$coil_version"
     implementation "io.coil-kt:coil-gif:$coil_version"
 
-    def media3_version = "1.3.0-alpha01"
+    def media3_version = "1.3.0-beta01"
     implementation "androidx.media3:media3-exoplayer:$media3_version"
     implementation "androidx.media3:media3-ui:$media3_version"
 

diff --git a/compose_image_picker/src/main/java/com/huhx/picker/component/AssetImageItem.kt b/compose_image_picker/src/main/java/com/huhx/picker/component/AssetImageItem.kt
@@ -1,7 +1,8 @@
 package com.huhx.picker.component
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
@@ -26,6 +27,7 @@ import coil.request.ImageRequest
 import com.huhx.picker.R
 import com.huhx.picker.model.AssetResourceType
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun AssetImageItem(
     urlString: String,
@@ -35,6 +37,7 @@ fun AssetImageItem(
     filterQuality: FilterQuality = FilterQuality.Low,
     onState: ((AsyncImagePainter.State) -> Unit)? = null,
     navigateToPreview: () -> Unit,
+    onLongClick: (() -> Unit)? = null,
 ) {
     val (backgroundColor, alpha) = if (isSelected) {
         Pair(Color.Black, 0.6F)
@@ -59,7 +62,10 @@ fun AssetImageItem(
             modifier = Modifier
                 .fillMaxSize()
                 .aspectRatio(1.0F)
-                .clickable { navigateToPreview() },
+                .combinedClickable(
+                    onClick = navigateToPreview,
+                    onLongClick = onLongClick,
+                ),
             filterQuality = filterQuality,
             onState = onState,
             contentScale = ContentScale.Crop,

diff --git a/compose_image_picker/src/main/java/com/huhx/picker/view/AssetDisplayScreen.kt b/compose_image_picker/src/main/java/com/huhx/picker/view/AssetDisplayScreen.kt
@@ -4,7 +4,6 @@ import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -55,7 +54,6 @@ import com.huhx.picker.viewmodel.AssetViewModel
 import kotlinx.coroutines.launch
 
 @Composable
-@OptIn(ExperimentalFoundationApi::class)
 internal fun AssetDisplayScreen(
     viewModel: AssetViewModel,
     navigateToDropDown: (String) -> Unit,
@@ -160,7 +158,6 @@ private fun DisplayBottomBar(viewModel: AssetViewModel, onPicked: (List<AssetInf
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun AssetTab(tabs: List<TabItem>, pagerState: PagerState) {
     val scope = rememberCoroutineScope()

diff --git a/compose_image_picker/src/main/java/com/huhx/picker/view/AssetPreviewScreen.kt b/compose_image_picker/src/main/java/com/huhx/picker/view/AssetPreviewScreen.kt
@@ -1,7 +1,6 @@
 package com.huhx.picker.view
 
 import android.os.Build
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -57,7 +56,6 @@ import com.huhx.picker.R
 import com.huhx.picker.model.AssetInfo
 
 @UnstableApi
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 internal fun AssetPreviewScreen(
     index: Int,
@@ -139,7 +137,6 @@ private fun SelectorBottomBar(
 }
 
 @UnstableApi
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun AssetPreview(assets: List<AssetInfo>, pagerState: PagerState) {
     Box {

diff --git a/compose_image_picker/src/main/java/com/huhx/picker/viewmodel/AssetViewModel.kt b/compose_image_picker/src/main/java/com/huhx/picker/viewmodel/AssetViewModel.kt
@@ -15,6 +15,8 @@ import com.huhx.picker.model.RequestType
 import com.huhx.picker.provider.AssetPickerRepository
 import kotlinx.coroutines.launch
 
+const val init_directory = "Photos/Videos"
+
 internal class AssetViewModel(
     private val assetPickerRepository: AssetPickerRepository,
     private val navController: NavController,
@@ -27,7 +29,7 @@ internal class AssetViewModel(
         get() = _directoryGroup
 
     val selectedList = mutableStateListOf<AssetInfo>()
-    var directory by mutableStateOf("Photos/Videos")
+    var directory by mutableStateOf(init_directory)
 
     fun initDirectories() {
         viewModelScope.launch {
@@ -38,7 +40,7 @@ internal class AssetViewModel(
                 AssetDirectory(directory = it.key, assets = it.value)
             }
             _directoryGroup.clear()
-            _directoryGroup.add(AssetDirectory(directory = "Photos/Videos", assets = assets))
+            _directoryGroup.add(AssetDirectory(directory = init_directory, assets = assets))
             _directoryGroup.addAll(directoryList)
         }
     }