SystemCleaner: Show dates and allow preview for trashed files and screenshots

Author: d4rken

app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/filtercontent/FilterContentViewModel.kt

@@ -1,22 +1,31 @@
 package eu.darken.sdmse.systemcleaner.ui.details.filtercontent
 
+import android.os.Bundle
 import androidx.lifecycle.SavedStateHandle
+import androidx.navigation.NavDirections
 import dagger.hilt.android.lifecycle.HiltViewModel
+import eu.darken.sdmse.R
 import eu.darken.sdmse.common.SingleLiveEvent
 import eu.darken.sdmse.common.coroutine.DispatcherProvider
 import eu.darken.sdmse.common.debug.logging.Logging.Priority.INFO
 import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.debug.logging.logTag
+import eu.darken.sdmse.common.previews.PreviewFragmentArgs
+import eu.darken.sdmse.common.previews.PreviewOptions
 import eu.darken.sdmse.common.progress.Progress
 import eu.darken.sdmse.common.uix.ViewModel3
 import eu.darken.sdmse.main.core.taskmanager.TaskManager
 import eu.darken.sdmse.systemcleaner.core.SystemCleaner
 import eu.darken.sdmse.systemcleaner.core.filter.filterIdentifier
 import eu.darken.sdmse.systemcleaner.core.filter.stock.EmptyDirectoryFilter
+import eu.darken.sdmse.systemcleaner.core.filter.stock.ScreenshotsFilter
+import eu.darken.sdmse.systemcleaner.core.filter.stock.TrashedFilter
 import eu.darken.sdmse.systemcleaner.core.tasks.SystemCleanerProcessingTask
 import eu.darken.sdmse.systemcleaner.ui.details.filtercontent.elements.FilterContentElementFileVH
 import eu.darken.sdmse.systemcleaner.ui.details.filtercontent.elements.FilterContentElementHeaderVH
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 @HiltViewModel
@@ -51,6 +60,8 @@ class FilterContentViewModel @Inject constructor(
 
         val sorted = when (filterContent.identifier) {
             EmptyDirectoryFilter::class.filterIdentifier -> filterContent.items.sortedBy { it.path.path }
+            TrashedFilter::class.filterIdentifier -> filterContent.items.sortedByDescending { it.lookup.modifiedAt }
+            ScreenshotsFilter::class.filterIdentifier -> filterContent.items.sortedBy { it.lookup.modifiedAt }
             else -> filterContent.items.sortedByDescending { it.expectedGain }
         }
 
@@ -59,6 +70,26 @@ class FilterContentViewModel @Inject constructor(
                 filterContent = filterContent,
                 match = item,
                 onItemClick = { delete(setOf(it)) },
+                onThumbnailClick = when (filterContent.identifier) {
+                    TrashedFilter::class.filterIdentifier, ScreenshotsFilter::class.filterIdentifier -> {
+                        {
+                            object : NavDirections {
+                                override val actionId: Int = R.id.goToPreview
+                                override val arguments: Bundle = PreviewFragmentArgs(
+                                    PreviewOptions(item.path)
+                                ).toBundle()
+
+                            }.navigate()
+                        }
+                    }
+
+                    else -> null
+                },
+                showDate = when (filterContent.identifier) {
+                    TrashedFilter::class.filterIdentifier -> true
+                    ScreenshotsFilter::class.filterIdentifier -> true
+                    else -> false
+                }
             )
         }.run { elements.addAll(this) }
 

app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/filtercontent/elements/FilterContentElementFileVH.kt

@@ -3,15 +3,19 @@ package eu.darken.sdmse.systemcleaner.ui.details.filtercontent.elements
 import android.text.format.Formatter
 import android.view.ViewGroup
 import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import eu.darken.sdmse.R
 import eu.darken.sdmse.common.coil.loadFilePreview
 import eu.darken.sdmse.common.files.FileType
 import eu.darken.sdmse.common.lists.binding
 import eu.darken.sdmse.common.lists.selection.SelectableVH
+import eu.darken.sdmse.common.toSystemTimezone
 import eu.darken.sdmse.databinding.SystemcleanerFiltercontentElementFileBinding
 import eu.darken.sdmse.systemcleaner.core.FilterContent
 import eu.darken.sdmse.systemcleaner.core.filter.SystemCleanerFilter
 import eu.darken.sdmse.systemcleaner.ui.details.filtercontent.FilterContentElementsAdapter
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
 
 
 class FilterContentElementFileVH(parent: ViewGroup) :
@@ -35,10 +39,23 @@ class FilterContentElementFileVH(parent: ViewGroup) :
         payloads: List<Any>
     ) -> Unit = binding { item ->
         lastItem = item
-        icon.loadFilePreview(item.match.lookup)
+        icon.apply {
+            loadFilePreview(item.match.lookup)
+            if (item.onThumbnailClick != null) {
+                setOnClickListener { item.onThumbnailClick.invoke(item) }
+            } else {
+                setOnClickListener(null)
+            }
+        }
 
         primary.text = item.match.lookup.userReadablePath.get(context)
 
+        secondary.apply {
+            isVisible = item.showDate
+            val formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)
+            text = item.match.lookup.modifiedAt.toSystemTimezone().format(formatter)
+        }
+
         size.apply {
             text = Formatter.formatShortFileSize(context, item.match.expectedGain)
             isGone = item.match.lookup.fileType != FileType.FILE
@@ -51,6 +68,8 @@ class FilterContentElementFileVH(parent: ViewGroup) :
         val filterContent: FilterContent,
         val match: SystemCleanerFilter.Match,
         val onItemClick: (Item) -> Unit,
+        val onThumbnailClick: ((Item) -> Unit)? = null,
+        val showDate: Boolean,
     ) : FilterContentElementsAdapter.Item {
 
         override val itemSelectionKey: String

app/src/main/res/layout/systemcleaner_filtercontent_element_file.xml

@@ -26,13 +26,31 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/icon"
+        app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginBottom="8dp"
         tools:text=".../some/happy/little/file" />
 
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/secondary"
+        style="@style/TextAppearance.Material3.LabelSmall"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_marginBottom="8dp"
+        android:gravity="end"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/icon"
+        app:layout_constraintTop_toBottomOf="@id/primary"
+        tools:text="00:00 00.00.0000" />
+
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/size"
         style="@style/TextAppearance.Material3.LabelSmall"
@@ -44,7 +62,7 @@
         android:ellipsize="end"
         android:gravity="center"
         android:singleLine="true"
-        app:layout_constraintBottom_toBottomOf="@id/primary"
+        app:layout_constraintBottom_toBottomOf="@id/secondary"
         app:layout_constraintEnd_toStartOf="@id/primary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/icon"