feat(swiper): Implement media skip functionality

This commit introduces the ability for users to skip a media item during a sorting session, allowing them to bypass an item without making a keep/delete/move decision.

Key changes include:

- **New "Skip" Button:** An icon button has been added to the central control bar on the Swiper screen.

- **User Setting:** The button's visibility is governed by a new toggle in "Settings -> Behavior" named "Hide Skip Button". This setting is enabled by default to maintain a clean UI for users who do not need this feature.

- **Session Tracking:** The `SwiperViewModel` now tracks skipped items for the duration of the session, ensuring they are not presented again until the session is reset.

- **End-of-Session Summary:** The "All media has been organized" dialog now displays a count of any items that were skipped during the session, providing useful feedback to the user.

Author: loopotto

app/src/main/java/com/cleansweep/data/repository/PreferencesRepository.kt

@@ -105,6 +105,7 @@ class PreferencesRepository @Inject constructor(
         val SCREENSHOT_DELETES_VIDEO = booleanPreferencesKey("screenshot_deletes_video")
         val SCREENSHOT_JPEG_QUALITY = stringPreferencesKey("screenshot_jpeg_quality")
         val SIMILARITY_THRESHOLD_LEVEL = stringPreferencesKey("similarity_threshold_level")
+        val HIDE_SWIPER_SKIP_BUTTON = booleanPreferencesKey("hide_swiper_skip_button")
 
         val DEFAULT_VIDEO_SPEED = floatPreferencesKey("default_video_speed")
 
@@ -192,6 +193,11 @@ class PreferencesRepository @Inject constructor(
             preferences[PreferencesKeys.UNFAVORITE_REMOVES_FROM_BAR] ?: false
         }
 
+    val hideSkipButtonFlow: Flow<Boolean> = context.dataStore.data
+        .map { preferences ->
+            preferences[PreferencesKeys.HIDE_SWIPER_SKIP_BUTTON] ?: false
+        }
+
     val processedMediaPathsFlow: Flow<Set<String>> = context.dataStore.data
         .map { preferences ->
             val pathsString = preferences[PreferencesKeys.PROCESSED_MEDIA_PATHS] ?: ""
@@ -433,6 +439,12 @@ class PreferencesRepository @Inject constructor(
         }
     }
 
+    suspend fun setHideSkipButton(enabled: Boolean) {
+        context.dataStore.edit { preferences ->
+            preferences[PreferencesKeys.HIDE_SWIPER_SKIP_BUTTON] = enabled
+        }
+    }
+
     suspend fun addProcessedMediaPaths(mediaPaths: Set<String>) {
         if (mediaPaths.isEmpty()) return
         context.dataStore.edit { preferences ->

app/src/main/java/com/cleansweep/ui/screens/settings/SettingsScreen.kt

@@ -90,6 +90,7 @@ fun SettingsScreen(
     val folderSelectionMode by viewModel.folderSelectionMode.collectAsState()
     val rememberProcessedMedia by viewModel.rememberProcessedMedia.collectAsState()
     val unfavoriteRemovesFromBar by viewModel.unfavoriteRemovesFromBar.collectAsState()
+    val hideSkipButton by viewModel.hideSkipButton.collectAsState()
     val defaultPath by viewModel.defaultAlbumCreationPath.collectAsState()
     val showFavoritesInSetup by viewModel.showFavoritesInSetup.collectAsState()
     val searchAutofocusEnabled by viewModel.searchAutofocusEnabled.collectAsState()
@@ -375,6 +376,14 @@ fun SettingsScreen(
                                 checked = invertSwipe,
                                 onCheckedChange = { viewModel.setInvertSwipe(it) })
                         },
+                        SettingItem(keywords = listOf("hide skip button")) {
+                            SettingSwitch(
+                                title = "Hide Skip Button",
+                                description = "If enabled, the 'Skip' button will be hidden from the bottom bar.",
+                                checked = hideSkipButton,
+                                onCheckedChange = { viewModel.setHideSkipButton(it) }
+                            )
+                        },
                         SettingItem(keywords = listOf("add to favorites by default", "target folder")) {
                             SettingSwitch(
                                 title = "Add to Favorites by Default",

app/src/main/java/com/cleansweep/ui/screens/settings/SettingsViewModel.kt

@@ -147,6 +147,14 @@ class SettingsViewModel @Inject constructor(
                 initialValue = true
             )
 
+    val hideSkipButton: StateFlow<Boolean> =
+        preferencesRepository.hideSkipButtonFlow
+            .stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.WhileSubscribed(5000),
+                initialValue = true
+            )
+
     val defaultAlbumCreationPath: StateFlow<String> =
         preferencesRepository.defaultAlbumCreationPathFlow
             .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), "")
@@ -486,6 +494,12 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
+    fun setHideSkipButton(enabled: Boolean) {
+        viewModelScope.launch {
+            preferencesRepository.setHideSkipButton(enabled)
+        }
+    }
+
     fun setShowFavoritesInSetup(enabled: Boolean) {
         viewModelScope.launch {
             preferencesRepository.setShowFavoritesFirstInSetup(enabled)

app/src/main/java/com/cleansweep/ui/screens/swiper/SwiperScreen.kt

@@ -32,6 +32,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.OpenInNew
+import androidx.compose.material.icons.automirrored.filled.Redo
 import androidx.compose.material.icons.automirrored.filled.Undo
 import androidx.compose.material.icons.automirrored.filled.VolumeOff
 import androidx.compose.material.icons.automirrored.filled.VolumeUp
@@ -94,6 +95,8 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.material.icons.automirrored.filled.ArrowForward
+import androidx.compose.material.icons.automirrored.filled.ArrowForwardIos
 import androidx.compose.material3.ButtonDefaults
 import com.cleansweep.ui.components.FastScrollbar
 import java.text.DecimalFormat
@@ -312,12 +315,14 @@ fun SwiperScreen(
                                     pendingChangesCount = uiState.pendingChanges.size,
                                     currentItem = uiState.currentItem,
                                     targetFavorites = uiState.targetFavorites,
+                                    isSkipButtonHidden = uiState.isSkipButtonHidden,
                                     onSelectFolder = viewModel::moveToFolder,
                                     onLongPressFolder = viewModel::showFolderMenu,
                                     onCreateNewAlbum = viewModel::showAddTargetFolderDialog,
                                     onToggleExpansion = viewModel::toggleFolderBarExpansion,
                                     onShowSummary = viewModel::showSummarySheet,
                                     onUndo = viewModel::revertLastChange,
+                                    onSkip = viewModel::handleSkip,
                                     layout = FolderBarLayout.VERTICAL,
                                     folderName = if (folderNameLayout == FolderNameLayout.BELOW) uiState.currentItem!!.bucketName else null
                                 )
@@ -363,12 +368,14 @@ fun SwiperScreen(
                                 pendingChangesCount = uiState.pendingChanges.size,
                                 currentItem = uiState.currentItem,
                                 targetFavorites = uiState.targetFavorites,
+                                isSkipButtonHidden = uiState.isSkipButtonHidden,
                                 onSelectFolder = viewModel::moveToFolder,
                                 onLongPressFolder = viewModel::showFolderMenu,
                                 onCreateNewAlbum = viewModel::showAddTargetFolderDialog,
                                 onToggleExpansion = viewModel::toggleFolderBarExpansion,
                                 onShowSummary = viewModel::showSummarySheet,
                                 onUndo = viewModel::revertLastChange,
+                                onSkip = viewModel::handleSkip,
                                 layout = folderBarLayout,
                                 folderName = if (folderNameLayout == FolderNameLayout.BELOW) uiState.currentItem!!.bucketName else null
                             )
@@ -382,6 +389,7 @@ fun SwiperScreen(
                         showResetHistoryButton = rememberProcessedMedia,
                         onResetHistory = viewModel::resetProcessedMedia,
                         onResetSingleFolderHistory = viewModel::showForgetMediaInFolderDialog,
+                        skippedCount = uiState.sessionSkippedCount,
                         onClose = { (appContext as? Activity)?.finish() }
                     )
                 }
@@ -735,10 +743,12 @@ private fun ControlBar(
     isExpanded: Boolean,
     showExpandButton: Boolean,
     hasPendingChanges: Boolean,
+    isSkipButtonHidden: Boolean,
     onToggleExpansion: () -> Unit,
     onCreateNewAlbum: () -> Unit,
     onShowSummary: () -> Unit,
-    onUndo: () -> Unit
+    onUndo: () -> Unit,
+    onSkip: () -> Unit
 ) {
     Box(
         modifier = Modifier
@@ -764,6 +774,12 @@ private fun ControlBar(
                 }
             }
             Spacer(modifier = Modifier.width(8.dp))
+            AnimatedVisibility(visible = !isSkipButtonHidden) {
+                IconButton(onClick = onSkip) {
+                    Icon(Icons.AutoMirrored.Filled.ArrowForwardIos , "Skip Item")
+                }
+            }
+            Spacer(modifier = Modifier.width(8.dp))
             AnimatedVisibility(visible = hasPendingChanges) {
                 IconButton(onClick = onUndo) {
                     Icon(Icons.AutoMirrored.Filled.Undo, "Undo Last Action")
@@ -802,12 +818,14 @@ private fun BottomFolderBar(
     pendingChangesCount: Int,
     currentItem: MediaItem?,
     targetFavorites: Set<String>,
+    isSkipButtonHidden: Boolean,
     onSelectFolder: (String) -> Unit,
     onLongPressFolder: (String, DpOffset) -> Unit,
     onCreateNewAlbum: () -> Unit,
     onToggleExpansion: () -> Unit,
     onShowSummary: () -> Unit,
     onUndo: () -> Unit,
+    onSkip: () -> Unit,
     layout: FolderBarLayout,
     folderName: String?
 ) {
@@ -856,10 +874,12 @@ private fun BottomFolderBar(
                     isExpanded = isFolderBarExpanded,
                     showExpandButton = showExpandButton,
                     hasPendingChanges = pendingChangesCount > 0,
+                    isSkipButtonHidden = isSkipButtonHidden,
                     onToggleExpansion = onToggleExpansion,
                     onCreateNewAlbum = onCreateNewAlbum,
                     onShowSummary = onShowSummary,
-                    onUndo = onUndo
+                    onUndo = onUndo,
+                    onSkip = onSkip
                 )
 
                 if (targetFolders.isNotEmpty()) {
@@ -1443,6 +1463,7 @@ private fun AlreadyOrganizedDialog(
     showResetHistoryButton: Boolean,
     onResetHistory: () -> Unit,
     onResetSingleFolderHistory: () -> Unit,
+    skippedCount: Int,
     onClose: () -> Unit
 ) {
     Column(
@@ -1464,6 +1485,15 @@ private fun AlreadyOrganizedDialog(
             style = MaterialTheme.typography.headlineSmall,
             textAlign = TextAlign.Center
         )
+        if (skippedCount > 0) {
+            Spacer(modifier = Modifier.height(8.dp))
+            val itemText = if (skippedCount == 1) "item" else "items"
+            Text(
+                "You skipped $skippedCount $itemText this session.",
+                style = MaterialTheme.typography.bodyLarge,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        }
         Spacer(modifier = Modifier.height(32.dp))
         Button(
             onClick = onSelectNewFolders,
@@ -1524,4 +1554,4 @@ private fun AlreadyOrganizedDialog(
             Text("Close App")
         }
     }
-}
+}

app/src/main/java/com/cleansweep/ui/screens/swiper/SwiperViewModel.kt

@@ -108,6 +108,8 @@ data class SwiperUiState(
     val showConfirmExitDialog: Boolean = false,
     val currentTheme: AppTheme = AppTheme.SYSTEM,
     val isCurrentItemPendingConversion: Boolean = false,
+    val isSkipButtonHidden: Boolean = true,
+    val sessionSkippedCount: Int = 0,
 
     // Pre-processed lists for Summary Sheet performance
     val toDelete: List<PendingChange> = emptyList(),
@@ -141,6 +143,7 @@ class SwiperViewModel @Inject constructor(
 
     private val newlyAddedTargetFolders = MutableStateFlow<Map<String, String>>(emptyMap())
     private val sessionHiddenTargetFolders = MutableStateFlow<Set<String>>(emptySet())
+    private val sessionSkippedMediaIds = mutableSetOf<String>()
 
     val invertSwipe: StateFlow<Boolean> = preferencesRepository.invertSwipeFlow
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)
@@ -332,6 +335,11 @@ class SwiperViewModel @Inject constructor(
                 _uiState.update { it.copy(currentTheme = theme) }
             }
         }
+        viewModelScope.launch {
+            preferencesRepository.hideSkipButtonFlow.collectLatest { isHidden ->
+                _uiState.update { it.copy(isSkipButtonHidden = isHidden) }
+            }
+        }
         viewModelScope.launch {
             val initialExpandedState = preferencesRepository.bottomBarExpandedFlow.first()
             _uiState.update { it.copy(isFolderBarExpanded = initialExpandedState) }
@@ -438,7 +446,7 @@ class SwiperViewModel @Inject constructor(
                         allItems.addAll(newBatch)
 
                         if (!initialItemFound) {
-                            val allProcessedIds = sessionProcessedMediaIds + processedMediaIds
+                            val allProcessedIds = sessionProcessedMediaIds + processedMediaIds + sessionSkippedMediaIds
                             val firstUnprocessedIndex = allItems.indexOfFirst { it.id !in allProcessedIds }
                             if (firstUnprocessedIndex != -1) {
                                 initialItemFound = true
@@ -506,7 +514,8 @@ class SwiperViewModel @Inject constructor(
         val currentState = _uiState.value
         val allProcessedIds = sessionProcessedMediaIds +
                 (if (_rememberProcessedMediaEnabled) processedMediaIds else emptySet()) +
-                currentState.pendingChanges.map { it.item.id }.toSet()
+                currentState.pendingChanges.map { it.item.id }.toSet() +
+                sessionSkippedMediaIds
 
         val searchStartIndex = if (isDeletion) currentState.currentIndex else currentState.currentIndex + 1
 
@@ -528,7 +537,7 @@ class SwiperViewModel @Inject constructor(
                     )
                 }
             } else {
-                _uiState.update { it.copy(currentItem = null, isSortingComplete = true, showSummarySheet = it.pendingChanges.isNotEmpty(), isCurrentItemPendingConversion = false) }
+                _uiState.update { it.copy(currentItem = null, isSortingComplete = true, showSummarySheet = it.pendingChanges.isNotEmpty(), isCurrentItemPendingConversion = false, sessionSkippedCount = sessionSkippedMediaIds.size) }
             }
         } else {
             val hasPendingChanges = currentState.pendingChanges.isNotEmpty()
@@ -537,7 +546,8 @@ class SwiperViewModel @Inject constructor(
                 isSortingComplete = true,
                 showSummarySheet = hasPendingChanges,
                 videoPlaybackPosition = 0L,
-                isCurrentItemPendingConversion = false
+                isCurrentItemPendingConversion = false,
+                sessionSkippedCount = sessionSkippedMediaIds.size
             ) }
         }
     }
@@ -554,6 +564,12 @@ class SwiperViewModel @Inject constructor(
         advanceState()
     }
 
+    fun handleSkip() {
+        val currentItem = _uiState.value.currentItem ?: return
+        sessionSkippedMediaIds.add(currentItem.id)
+        advanceState()
+    }
+
     fun moveToFolder(folderPath: String) {
         val currentItem = _uiState.value.currentItem ?: return
         addPendingChange(PendingChange(currentItem, SwiperAction.Move(currentItem, folderPath)))
@@ -1061,6 +1077,7 @@ class SwiperViewModel @Inject constructor(
             _uiState.update { it.copy(showConfirmExitDialog = true) }
         } else {
             sessionHiddenTargetFolders.value = emptySet()
+            sessionSkippedMediaIds.clear()
             viewModelScope.launch {
                 _navigationEvent.emit(NavigationEvent.NavigateUp)
             }
@@ -1071,6 +1088,7 @@ class SwiperViewModel @Inject constructor(
         viewModelScope.launch {
             logJitSummary()
             sessionHiddenTargetFolders.value = emptySet()
+            sessionSkippedMediaIds.clear()
             _uiState.update { it.copy(showConfirmExitDialog = false) }
             _navigationEvent.emit(NavigationEvent.NavigateUp)
         }
@@ -1157,10 +1175,12 @@ class SwiperViewModel @Inject constructor(
 
     fun resetPendingChanges() {
         val emptyChanges = emptyList<PendingChange>()
+        sessionSkippedMediaIds.clear()
         _uiState.update { it.copy(
             pendingChanges = emptyChanges,
             showSummarySheet = false,
-            isCurrentItemPendingConversion = false // Reset conversion state
+            isCurrentItemPendingConversion = false, // Reset conversion state
+            sessionSkippedCount = 0
         ) }
         processPendingChangesForSummary(emptyChanges)
         savedStateHandle["pendingChanges"] = null
@@ -1188,7 +1208,8 @@ class SwiperViewModel @Inject constructor(
             preferencesRepository.clearProcessedMediaPaths()
             preferencesRepository.clearPermanentlySortedFolders()
             sessionProcessedMediaIds.clear()
-            _uiState.update { it.copy(toastMessage = "Sorted media history has been reset.") }
+            sessionSkippedMediaIds.clear()
+            _uiState.update { it.copy(toastMessage = "Sorted media history has been reset.", sessionSkippedCount = 0) }
             initializeMedia(bucketIds)
         }
     }