some more missed

jobobby04 · Aug 22, 2024 · 47679f2 · 47679f2
1 parent 4ec3e81
commit 47679f2
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 23 deletions.
diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt
@@ -107,8 +107,10 @@ internal fun LazyListScope.updatesUiItems(
                     readProgress = updatesItem.update.lastPageRead
                         .takeIf {
                             /* SY --> */(
-                                !updatesItem.update.read || (preserveReadingPosition && updatesItem.isEhBasedUpdate())
-                                )/* SY <-- */ && it > 0L
+                                !updatesItem.update.read ||
+                                    (preserveReadingPosition && updatesItem.isEhBasedUpdate())
+                                )/* SY <-- */ &&
+                                it > 0L
                         }
                         ?.let {
                             stringResource(

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
@@ -121,7 +121,8 @@ class DownloadProvider(
                 getValidChapterDirNames(chp.name, chp.scanlator).any { dir ->
                     mangaDir.findFile(dir) != null
                 }
-            } == null || it.name?.endsWith(Downloader.TMP_DIR_SUFFIX) == true
+            } == null ||
+                it.name?.endsWith(Downloader.TMP_DIR_SUFFIX) == true
         }
     }
     // SY <--

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt
@@ -73,16 +73,17 @@ interface SecureActivityDelegate {
             }
 
             val lockedDays = preferences.authenticatorDays().get()
-            val canLockToday = lockedDays == LOCK_ALL_DAYS || when (today.get(Calendar.DAY_OF_WEEK)) {
-                Calendar.SUNDAY -> (lockedDays and LOCK_SUNDAY) == LOCK_SUNDAY
-                Calendar.MONDAY -> (lockedDays and LOCK_MONDAY) == LOCK_MONDAY
-                Calendar.TUESDAY -> (lockedDays and LOCK_TUESDAY) == LOCK_TUESDAY
-                Calendar.WEDNESDAY -> (lockedDays and LOCK_WEDNESDAY) == LOCK_WEDNESDAY
-                Calendar.THURSDAY -> (lockedDays and LOCK_THURSDAY) == LOCK_THURSDAY
-                Calendar.FRIDAY -> (lockedDays and LOCK_FRIDAY) == LOCK_FRIDAY
-                Calendar.SATURDAY -> (lockedDays and LOCK_SATURDAY) == LOCK_SATURDAY
-                else -> false
-            }
+            val canLockToday = lockedDays == LOCK_ALL_DAYS ||
+                when (today.get(Calendar.DAY_OF_WEEK)) {
+                    Calendar.SUNDAY -> (lockedDays and LOCK_SUNDAY) == LOCK_SUNDAY
+                    Calendar.MONDAY -> (lockedDays and LOCK_MONDAY) == LOCK_MONDAY
+                    Calendar.TUESDAY -> (lockedDays and LOCK_TUESDAY) == LOCK_TUESDAY
+                    Calendar.WEDNESDAY -> (lockedDays and LOCK_WEDNESDAY) == LOCK_WEDNESDAY
+                    Calendar.THURSDAY -> (lockedDays and LOCK_THURSDAY) == LOCK_THURSDAY
+                    Calendar.FRIDAY -> (lockedDays and LOCK_FRIDAY) == LOCK_FRIDAY
+                    Calendar.SATURDAY -> (lockedDays and LOCK_SATURDAY) == LOCK_SATURDAY
+                    else -> false
+                }
 
             return canLockNow && canLockToday
         }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt
@@ -32,15 +32,16 @@ class ReaderTransitionView @JvmOverloads constructor(context: Context, attrs: At
             Data(
                 transition = transition,
                 currChapterDownloaded = transition.from.pageLoader?.isLocal == true,
-                goingToChapterDownloaded = manga.isLocal() || transition.to?.chapter?.let { goingToChapter ->
-                    downloadManager.isChapterDownloaded(
-                        chapterName = goingToChapter.name,
-                        chapterScanlator = goingToChapter.scanlator,
-                        mangaTitle = /* SY --> */ manga.ogTitle, /* SY <-- */
-                        sourceId = manga.source,
-                        skipCache = true,
-                    )
-                } ?: false,
+                goingToChapterDownloaded = manga.isLocal() ||
+                    transition.to?.chapter?.let { goingToChapter ->
+                        downloadManager.isChapterDownloaded(
+                            chapterName = goingToChapter.name,
+                            chapterScanlator = goingToChapter.scanlator,
+                            mangaTitle = /* SY --> */ manga.ogTitle, /* SY <-- */
+                            sourceId = manga.source,
+                            skipCache = true,
+                        )
+                    } ?: false,
             )
         } else {
             null

diff --git a/domain/src/main/java/tachiyomi/domain/chapter/interactor/GetMergedChaptersByMangaId.kt b/domain/src/main/java/tachiyomi/domain/chapter/interactor/GetMergedChaptersByMangaId.kt
@@ -112,7 +112,8 @@ class GetMergedChaptersByMangaId(
                     if (chapter.isRecognizedNumber) {
                         existingChapterIndex = sortedChapterList.indexOfFirst {
                             // check if the chapter is not already there
-                            it.isRecognizedNumber && it.chapterNumber == chapter.chapterNumber &&
+                            it.isRecognizedNumber &&
+                                it.chapterNumber == chapter.chapterNumber &&
                                 // allow multiple chapters of the same number from the same source
                                 it.mangaId != chapter.mangaId
                         }