feat: fix the resource type issue in AssetInfo

huhx · Jan 3, 2024 · 957a7c5 · 957a7c5
1 parent 31a5029
commit 957a7c5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/compose_image_picker/src/main/java/com/huhx/picker/model/AssetInfo.kt b/compose_image_picker/src/main/java/com/huhx/picker/model/AssetInfo.kt
@@ -34,7 +34,7 @@ data class AssetInfo(
         return BitmapFactory.decodeFile(uriString)
     }
 
-    val resourceType: AssetResourceType = AssetResourceType.fromFileName(uriString)
+    val resourceType: AssetResourceType = AssetResourceType.fromFileName(filename)
 
     // todo: 这种方式还是存在问题
     val randomName: String = run {

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
@@ -163,7 +163,7 @@ private fun DisplayBottomBar(viewModel: AssetViewModel, onPicked: (List<AssetInf
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun AssetTab(tabs: List<TabItem>, pagerState: PagerState) {
-    val coroutineScope = rememberCoroutineScope()
+    val scope = rememberCoroutineScope()
 
     TabRow(selectedTabIndex = pagerState.currentPage, indicator = {}) {
         tabs.forEachIndexed { index, tab ->
@@ -172,9 +172,7 @@ private fun AssetTab(tabs: List<TabItem>, pagerState: PagerState) {
                 text = { Text(text = stringResource(tab.resourceId)) },
                 selectedContentColor = MaterialTheme.colorScheme.onSurface,
                 unselectedContentColor = Color.Gray,
-                onClick = {
-                    coroutineScope.launch { pagerState.animateScrollToPage(index) }
-                }
+                onClick = { scope.launch { pagerState.animateScrollToPage(index) } }
             )
         }
     }
@@ -228,7 +226,7 @@ private fun AssetImage(
 
 private sealed class TabItem(
     @StringRes val resourceId: Int,
-    val screen: @Composable (AssetViewModel) -> Unit
+    val screen: @Composable (AssetViewModel) -> Unit,
 ) {
     data object All : TabItem(R.string.tab_item_all, { viewModel -> AssetContent(viewModel, RequestType.COMMON) })
 

diff --git a/compose_image_picker/src/main/java/com/huhx/picker/view/CommonView.kt b/compose_image_picker/src/main/java/com/huhx/picker/view/CommonView.kt
@@ -73,11 +73,7 @@ internal fun AssetImageIndicator(
                 Toast.makeText(context, errorMessage, Toast.LENGTH_SHORT).show()
                 return@Surface
             }
-            if (isSelected) {
-                assetSelected.add(assetInfo)
-            } else {
-                assetSelected.remove(assetInfo)
-            }
+            if (isSelected) assetSelected.add(assetInfo) else assetSelected.remove(assetInfo)
         },
         modifier = Modifier
             .padding(6.dp)

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
@@ -51,10 +51,12 @@ internal class AssetViewModel(
     fun getAssets(requestType: RequestType): List<AssetInfo> {
         val assetList = _directoryGroup.first { it.directory == directory }.assets
 
-        return when (requestType) {
-            RequestType.COMMON -> assetList
-            RequestType.IMAGE -> assetList.filter(AssetInfo::isImage)
-            RequestType.VIDEO -> assetList.filter(AssetInfo::isVideo)
+        return assetList.filter {
+            when (requestType) {
+                RequestType.COMMON -> true
+                RequestType.IMAGE -> it.isImage()
+                RequestType.VIDEO -> it.isVideo()
+            }
         }
     }