fix: temporarily disable airing time sort (and lint)

quickdesh · Jul 7, 2024 · 9637c8c · 9637c8c
1 parent 8af7c9a
commit 9637c8c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/.../main/java/eu/kanade/tachiyomi/data/connection/syncmiru/service/GoogleDriveSyncService.kt b/.../main/java/eu/kanade/tachiyomi/data/connection/syncmiru/service/GoogleDriveSyncService.kt
@@ -20,11 +20,6 @@ import com.google.api.services.drive.model.File
 import eu.kanade.domain.connection.SyncPreferences
 import eu.kanade.tachiyomi.data.backup.models.Backup
 import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
-import java.io.IOException
-import java.io.PipedInputStream
-import java.io.PipedOutputStream
-import java.util.zip.GZIPInputStream
-import java.util.zip.GZIPOutputStream
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.protobuf.ProtoBuf
@@ -35,6 +30,11 @@ import tachiyomi.core.util.system.logcat
 import tachiyomi.i18n.MR
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.io.IOException
+import java.io.PipedInputStream
+import java.io.PipedOutputStream
+import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
 import logcat.logcat as log
 
 class GoogleDriveSyncService(context: Context, json: Json, syncPreferences: SyncPreferences) : SyncService(

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryScreenModel.kt
@@ -365,15 +365,16 @@ class AnimeLibraryScreenModel(
                     val item2Score = trackerScores[i2.libraryAnime.id] ?: defaultTrackerScoreSortValue
                     item1Score.compareTo(item2Score)
                 }
-                AnimeLibrarySort.Type.AiringTime -> when {
-                    i1.libraryAnime.anime.nextEpisodeAiringAt == 0L -> if (sort.isAscending) 1 else -1
-                    i2.libraryAnime.anime.nextEpisodeAiringAt == 0L -> if (sort.isAscending) -1 else 1
-                    i1.libraryAnime.unseenCount == i2.libraryAnime.unseenCount ->
-                        i1.libraryAnime.anime.nextEpisodeAiringAt.compareTo(
-                            i2.libraryAnime.anime.nextEpisodeAiringAt,
-                        )
-                    else -> i1.libraryAnime.unseenCount.compareTo(i2.libraryAnime.unseenCount)
-                }
+                AnimeLibrarySort.Type.AiringTime -> i1.libraryAnime.lastSeen.compareTo(i2.libraryAnime.lastSeen)
+                // when {
+                // i1.libraryAnime.anime.nextEpisodeAiringAt == 0L -> if (sort.isAscending) 1 else -1
+                // i2.libraryAnime.anime.nextEpisodeAiringAt == 0L -> if (sort.isAscending) -1 else 1
+                // i1.libraryAnime.unseenCount == i2.libraryAnime.unseenCount ->
+                // i1.libraryAnime.anime.nextEpisodeAiringAt.compareTo(
+                // i2.libraryAnime.anime.nextEpisodeAiringAt,
+                // )
+                // else -> i1.libraryAnime.unseenCount.compareTo(i2.libraryAnime.unseenCount)
+                // }
             }
         }
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/ReaderPageImageView.kt b/app/src/main/java/eu/kanade/tachiyomi/util/ReaderPageImageView.kt
@@ -146,7 +146,10 @@ open class ReaderPageImageView @JvmOverloads constructor(
 
         when (config?.zoomStartPosition) {
             ZoomStartPosition.LEFT -> scaleImageView.setScaleAndCenter(scaleImageView.scale, PointF(0F, 0F))
-            ZoomStartPosition.RIGHT -> scaleImageView.setScaleAndCenter(scaleImageView.scale, PointF(scaleImageView.sWidth.toFloat(), 0F))
+            ZoomStartPosition.RIGHT -> scaleImageView.setScaleAndCenter(
+                scaleImageView.scale,
+                PointF(scaleImageView.sWidth.toFloat(), 0F),
+            )
             ZoomStartPosition.CENTER -> scaleImageView.setScaleAndCenter(scaleImageView.scale, scaleImageView.center)
             null -> {}
         }