Merge pull request #4 from Steve-Mr/dev

[fix]disable page indicator in ActionRow when no pages
Steve-Mr · Oct 4, 2024 · eadbdba · eadbdba
2 parents 75bb440 + 6c4dd88
commit eadbdba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/java/top/maary/oblivionis/ui/ActionComponents.kt b/app/src/main/java/top/maary/oblivionis/ui/ActionComponents.kt
@@ -2,6 +2,7 @@ package top.maary.oblivionis.ui
 
 import android.net.Uri
 import android.provider.MediaStore
+import android.util.Log
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
@@ -221,14 +222,14 @@ fun ActionRow(
         ) {
             OutlinedButton(
                 onClick = {},
-                modifier = Modifier
-                    .height(48.dp)
+                modifier = Modifier.height(48.dp),
+                enabled = (pagesCount != 0)
             ) {
                 Text(
                     modifier = Modifier.padding(start = 8.dp, end = 32.dp),
-                    text = stringResource(R.string.pager_count, currentPage, pagesCount)
+                    text = stringResource(R.string.pager_count,
+                        if (pagesCount == 0) 0 else currentPage, pagesCount)
                 )
-
             }
             if (loading) {
                 LinearProgressIndicator(

diff --git a/app/src/main/java/top/maary/oblivionis/viewmodel/ActionViewModel.kt b/app/src/main/java/top/maary/oblivionis/viewmodel/ActionViewModel.kt
@@ -465,7 +465,7 @@ class ActionViewModel(
     private fun databaseMarkAll(images: List<MediaStoreImage>) = viewModelScope.launch {
         images.forEach {
             if (it.isExcluded) return@forEach
-            imageRepository.mark(it.copy(isMarked = false))
+            imageRepository.mark(it.copy(isMarked = true))
         }
     }