feat: sort by recently #83

oxyroid · Jan 24, 2024 · d8b64bc · d8b64bc
1 parent 7aae69b
commit d8b64bc
Show file tree

Hide file tree

Showing 14 changed files with 241 additions and 50 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -44,4 +44,6 @@ dependencies {
     implementation(libs.androidx.media3.media3.session)
     implementation(libs.com.google.dagger.hilt.android)
     ksp(libs.com.google.dagger.hilt.compiler)
+
+    api(libs.kotlinx.datetime)
 }
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -55,8 +55,6 @@ dependencies {
     implementation(libs.kotlinx.serialization.yaml)
     implementation(libs.kotlinx.serialization.coverter.retrofit)
 
-    implementation(libs.kotlinx.datetime)
-
     implementation(libs.io.coil.kt.coil)
 
     implementation(libs.com.google.dagger.hilt.android)

diff --git a/features/favorite/src/main/java/com/m3u/features/favorite/FavoriteScreen.kt b/features/favorite/src/main/java/com/m3u/features/favorite/FavoriteScreen.kt
@@ -34,6 +34,7 @@ import com.m3u.ui.helper.Action
 import com.m3u.ui.EventHandler
 import com.m3u.ui.helper.LocalHelper
 import com.m3u.ui.ResumeEvent
+import com.m3u.ui.Sort
 import com.m3u.ui.SortBottomSheet
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -83,6 +84,7 @@ fun FavouriteRoute(
             zapping = zapping,
             navigateToStream = navigateToStream,
             onMenu = { dialogStatus = DialogStatus.Selections(it) },
+            sort = sort,
             modifier = Modifier
                 .fillMaxSize()
                 .thenIf(!tv && pref.godMode) {
@@ -122,6 +124,7 @@ private fun FavoriteScreen(
     streams: ImmutableList<Stream>,
     zapping: Stream?,
     navigateToStream: () -> Unit,
+    sort: Sort,
     onMenu: (Stream) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -136,6 +139,7 @@ private fun FavoriteScreen(
         streams = streams,
         zapping = zapping,
         rowCount = actualRowCount,
+        sort = sort,
         navigateToStream = navigateToStream,
         onMenu = onMenu,
         modifier = modifier

diff --git a/features/favorite/src/main/java/com/m3u/features/favorite/FavouriteViewModel.kt b/features/favorite/src/main/java/com/m3u/features/favorite/FavouriteViewModel.kt
@@ -89,6 +89,7 @@ class FavouriteViewModel @Inject constructor(
                 Sort.DESC -> all.sortedWith(
                     compareByDescending(String.CASE_INSENSITIVE_ORDER) { it.title }
                 )
+                Sort.RECENTLY -> all.sortedByDescending { it.seen }
             }
                 .toPersistentList()
         }

diff --git a/features/favorite/src/main/java/com/m3u/features/favorite/components/FavoriteGallery.kt b/features/favorite/src/main/java/com/m3u/features/favorite/components/FavoriteGallery.kt
@@ -17,6 +17,7 @@ import com.m3u.data.database.model.Stream
 import com.m3u.material.ktx.isTelevision
 import com.m3u.material.ktx.plus
 import com.m3u.material.model.LocalSpacing
+import com.m3u.ui.Sort
 import com.m3u.ui.helper.LocalHelper
 import kotlinx.collections.immutable.ImmutableList
 
@@ -26,6 +27,7 @@ internal fun FavouriteGallery(
     streams: ImmutableList<Stream>,
     zapping: Stream?,
     rowCount: Int,
+    sort: Sort,
     navigateToStream: () -> Unit,
     onMenu: (Stream) -> Unit,
     modifier: Modifier = Modifier
@@ -39,6 +41,7 @@ internal fun FavouriteGallery(
             streams = streams,
             zapping = zapping,
             rowCount = rowCount,
+            sort = sort,
             navigateToStream = navigateToStream,
             onMenu = onMenu,
             modifier = modifier
@@ -49,6 +52,7 @@ internal fun FavouriteGallery(
             streams = streams,
             zapping = zapping,
             rowCount = rowCount,
+            sort = sort,
             navigateToStream = navigateToStream,
             onMenu = onMenu,
             modifier = modifier
@@ -62,6 +66,7 @@ private fun FavouriteGalleryImpl(
     streams: ImmutableList<Stream>,
     zapping: Stream?,
     rowCount: Int,
+    sort: Sort,
     navigateToStream: () -> Unit,
     onMenu: (Stream) -> Unit,
     modifier: Modifier = Modifier
@@ -87,6 +92,7 @@ private fun FavouriteGalleryImpl(
                     stream = stream,
                     noPictureMode = pref.noPictureMode,
                     zapping = zapping == stream,
+                    sort = sort,
                     onClick = {
                         helper.play(stream.id)
                         navigateToStream()
@@ -118,6 +124,7 @@ private fun FavouriteGalleryImpl(
                     stream = stream,
                     noPictureMode = pref.noPictureMode,
                     zapping = zapping == stream,
+                    sort = sort,
                     onClick = {
                         helper.play(stream.id)
                         navigateToStream()
@@ -138,6 +145,7 @@ private fun CompactFavouriteGalleryImpl(
     streams: ImmutableList<Stream>,
     zapping: Stream?,
     rowCount: Int,
+    sort: Sort,
     navigateToStream: () -> Unit,
     onMenu: (Stream) -> Unit,
     modifier: Modifier = Modifier
@@ -162,6 +170,7 @@ private fun CompactFavouriteGalleryImpl(
                     stream = stream,
                     noPictureMode = pref.noPictureMode,
                     zapping = zapping == stream,
+                    sort = sort,
                     onClick = {
                         helper.play(stream.id)
                         navigateToStream()
@@ -189,6 +198,7 @@ private fun CompactFavouriteGalleryImpl(
                     stream = stream,
                     noPictureMode = pref.noPictureMode,
                     zapping = zapping == stream,
+                    sort = sort,
                     onClick = {
                         helper.play(stream.id)
                         navigateToStream()