[fix]page indicator start counts on 1 not 0

[improvement] index != -1, multi selection icon background
Steve-Mr · Oct 4, 2024 · e51aa69 · e51aa69
1 parent ec65321
commit e51aa69
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/src/main/java/top/maary/oblivionis/ui/ActionComponents.kt b/app/src/main/java/top/maary/oblivionis/ui/ActionComponents.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.Circle
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.RadioButtonUnchecked
 import androidx.compose.material3.AlertDialog
@@ -113,6 +114,8 @@ fun MediaPlayer(
 
         if (isMultiSelectionState) {
             // 显示选择框的图标
+            Icon(imageVector = Icons.Default.Circle, contentDescription = null, tint = if (isSelected) MaterialTheme.colorScheme.primaryContainer else Color.Transparent,
+                modifier = Modifier.align(Alignment.TopEnd).size(48.dp).padding(8.dp))
             Icon(
                 imageVector = if (isSelected) Icons.Default.CheckCircle else Icons.Default.RadioButtonUnchecked,
                 contentDescription = if (isSelected) "Selected" else "Not Selected",

diff --git a/app/src/main/java/top/maary/oblivionis/ui/screen/ActionScreen.kt b/app/src/main/java/top/maary/oblivionis/ui/screen/ActionScreen.kt
@@ -179,7 +179,7 @@ fun ActionScreen(
                     context.startActivity(shareIntent)
                 },
                 showRestore = (lastMarked.value.isNotEmpty()),
-                currentPage = pagerState.currentPage,
+                currentPage = pagerState.currentPage +1,
                 pagesCount = images.value.size
             )
         }

diff --git a/app/src/main/java/top/maary/oblivionis/viewmodel/ActionViewModel.kt b/app/src/main/java/top/maary/oblivionis/viewmodel/ActionViewModel.kt
@@ -279,17 +279,19 @@ class ActionViewModel(
 
     fun unMarkImage(target: MediaStoreImage) {
         val updatedList = _images.value.toMutableList()
-        updatedList[updatedList.indexOf(target.copy(isMarked = true))] =
-            target.copy(isMarked = false)
+        val index = updatedList.indexOf(target.copy(isMarked = true))
+        if (index == -1) return
+        updatedList[index] = target.copy(isMarked = false)
         databaseUnmark(target.copy(isMarked = true))
         _lastMarked.value = _lastMarked.value.filterNot { it == target }
         _images.value = updatedList
     }
 
     fun includeMedia(target: MediaStoreImage) {
         val updatedList = _images.value.toMutableList()
-        updatedList[updatedList.indexOf(target.copy(isExcluded = true))] =
-            target.copy(isExcluded = false)
+        val index = updatedList.indexOf(target.copy(isExcluded = true))
+        if (index == -1) return
+        updatedList[index] = target.copy(isExcluded = false)
         databaseUnmark(target.copy(isExcluded = true))
         _images.value = updatedList
     }