[FEAT] Added destination Trash

- Implemented MediaProvider.restore functionality.
- Introduced TrashViewModel.
- Added trash screen for managing deleted items.

[REFACTOR] Extracted common functionality to MainViewModel
- Moved FileActions and SelectionTracker from TimelineViewModel to a new superclass called MainViewModel.
- This refactor was necessary to centralize shared functionalities among various view models.

[FEAT] Added rudimentary implementation of Viewer Destination
- Basic implementation to support viewing files in the new destination.

api/src/main/java/com/zs/api/store/MediaProviderImpl.kt

@@ -39,6 +39,7 @@ import com.zs.api.store.MediaProvider.Companion.COLUMN_DATE_ADDED
 import com.zs.api.store.MediaProvider.Companion.COLUMN_DATE_EXPIRES
 import com.zs.api.store.MediaProvider.Companion.COLUMN_DATE_MODIFIED
 import com.zs.api.store.MediaProvider.Companion.COLUMN_DATE_TAKEN
+import com.zs.api.store.MediaProvider.Companion.COLUMN_DURATION
 import com.zs.api.store.MediaProvider.Companion.COLUMN_HEIGHT
 import com.zs.api.store.MediaProvider.Companion.COLUMN_ID
 import com.zs.api.store.MediaProvider.Companion.COLUMN_IS_TRASHED
@@ -89,7 +90,8 @@ private val Cursor.toTrashedFile: Trashed
  expires = getLong(2) * 1000,
  path = getString(3),
  size = getLong(4),
- mimeType = getString(5)
+ mimeType = getString(5),
+ duration = getInt(6)
  )
 
 private val MEDIA_PROJECTION =
@@ -117,6 +119,7 @@ private val TRASHED_PROJECTION =
  COLUMN_PATH, // 3
  COLUMN_SIZE, // 4
  COLUMN_MIME_TYPE, // 5
+ COLUMN_DURATION // 6
  )
 
 /**
@@ -284,8 +287,24 @@ internal class MediaProviderImpl(
  }
  }
 
- override suspend fun fetchTrashedFiles(offset: Int, limit: Int): List<Trashed> {
- TODO("Not yet implemented")
+ override suspend fun fetchTrashedFiles(
+ offset: Int, limit: Int
+ ): List<Trashed> {
+ return resolver.query2(
+ EXTERNAL_CONTENT_URI,
+ TRASHED_PROJECTION,
+ selection = "$COLUMN_IS_TRASHED = 1",
+ offset = offset,
+ limit = limit,
+ order = MediaProvider.COLUMN_DATE_EXPIRES,
+ ascending = false,
+ transform = { c ->
+ List(c.count) { index ->
+ c.moveToPosition(index)
+ c.toTrashedFile
+ }
+ }
+ )
  }
 
  override suspend fun fetchFilesFromDirectory(
@@ -450,7 +469,7 @@ internal class MediaProviderImpl(
  // Count items after deletion (including trashed)
  val after = count(true)
  // Return the number of deleted items
- if (Activity.RESULT_OK == result.resultCode) return before - after
+ if (Activity.RESULT_OK == result.resultCode) return after - before
  // Log for debugging if result is unexpected
  Log.d(TAG, "delete: before: $before, after: $after")
  // Deletion failed for an unknown reason

api/src/main/java/com/zs/api/store/Trashed.kt

@@ -22,7 +22,7 @@ package com.zs.api.store
  * Represents a trashed file.
  *
  * @property id The unique identifier of the trashed file.
- * @propertyname The name of the trashed file.
+ * @property name The name of the trashed file.
  * @property expires The timestamp (in milliseconds) when the trashed file will be permanently deleted.
  * @property path The absolute path to the trashed file.
  * @property size The size of the trashed file in bytes.
@@ -35,6 +35,7 @@ data class Trashed(
  val path: String,
  val size: Long,
  val mimeType: String,
+ val duration: Int,
 )
 
 val Trashed.isImage get() = mimeType.startsWith("image/")

app/build.gradle.kts

@@ -14,8 +14,8 @@ android {
  applicationId = "com.googol.android.apps.photos"
  minSdk = 21
  targetSdk = 34
- versionCode = 4
- versionName = "0.1.0-dev04"
+ versionCode = 5
+ versionName = "0.1.0-dev05"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
  vectorDrawables {

app/src/main/java/com/zs/gallery/Home.kt

@@ -68,6 +68,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
@@ -85,6 +86,8 @@ import com.zs.compose_ktx.navigation.NavRailItem
 import com.zs.compose_ktx.navigation.NavigationItemDefaults
 import com.zs.compose_ktx.navigation.NavigationSuiteScaffold
 import com.zs.compose_ktx.toast.ToastHostState
+import com.zs.gallery.bin.RouteTrash
+import com.zs.gallery.bin.Trash
 import com.zs.gallery.common.LocalNavController
 import com.zs.gallery.common.LocalSystemFacade
 import com.zs.gallery.common.NightMode
@@ -106,6 +109,7 @@ import com.zs.gallery.impl.FolderViewModel
 import com.zs.gallery.impl.FoldersViewModel
 import com.zs.gallery.impl.SettingsViewModel
 import com.zs.gallery.impl.TimelineViewModel
+import com.zs.gallery.impl.TrashViewModel
 import com.zs.gallery.impl.ViewerViewModel
 import com.zs.gallery.preview.RouteViewer
 import com.zs.gallery.preview.Viewer
@@ -391,6 +395,12 @@ private val NavGraphBuilder: NavGraphBuilder.() -> Unit = {
  val state = koinViewModel<AlbumViewModel>()
  Album(viewState = state)
  }
+
+ // Trash
+ composable(RouteTrash){
+ val state = koinViewModel<TrashViewModel>()
+ Trash(viewState = state)
+ }
 }
 
 // Default Enter/Exit Transitions.