From 4abadea4f9bd5d60a49f66340992ff11a2cc0b3a Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 8 Dec 2024 15:22:57 -0500 Subject: [PATCH] Spotless --- .../components/SyncFavoritesProgressDialog.kt | 8 ++++---- .../data/notification/Notifications.kt | 2 +- .../migration/search/SourceSearchScreen.kt | 1 - .../ui/reader/viewer/ReaderPageImageView.kt | 1 - .../java/exh/favorites/FavoritesSyncHelper.kt | 19 +++++++++++++++---- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt index 3b1b01724..747d706d5 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt @@ -75,7 +75,7 @@ fun SyncFavoritesProgressDialog( FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote -> context.stringResource(SYMR.strings.favorites_sync_unable_to_delete) } - } + }, ), positiveButtonText = context.stringResource(MR.strings.action_ok), positiveButton = setStatusIdle, @@ -112,7 +112,7 @@ fun SyncFavoritesProgressDialog( context.stringResource(SYMR.strings.favorites_sync_unable_to_add_to_remote, status.title, status.gid) FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote -> context.stringResource(SYMR.strings.favorites_sync_unable_to_delete) - } + }, ), positiveButtonText = context.stringResource(MR.strings.action_ok), positiveButton = setStatusIdle, @@ -137,7 +137,7 @@ fun SyncFavoritesProgressDialog( if (status.isThrottling) { context.stringResource( SYMR.strings.favorites_sync_processing_throttle, - context.stringResource(SYMR.strings.favorites_sync_adding_to_remote, status.index, status.total) + context.stringResource(SYMR.strings.favorites_sync_adding_to_remote, status.index, status.total), ) } else { context.stringResource(SYMR.strings.favorites_sync_adding_to_remote, status.index, status.total) @@ -148,7 +148,7 @@ fun SyncFavoritesProgressDialog( if (status.isThrottling) { context.stringResource( SYMR.strings.favorites_sync_processing_throttle, - context.stringResource(SYMR.strings.favorites_sync_add_to_local, status.index, status.total) + context.stringResource(SYMR.strings.favorites_sync_add_to_local, status.index, status.total), ) } else { context.stringResource(SYMR.strings.favorites_sync_add_to_local, status.index, status.total) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt index f215880db..b6a868eb1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt @@ -176,7 +176,7 @@ object Notifications { setGroup(GROUP_LIBRARY) setShowBadge(false) }, - //SY <-- + // SY <-- ), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt index 0a59de18c..814b1d003 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt @@ -23,7 +23,6 @@ import eu.kanade.tachiyomi.ui.manga.MangaScreen import eu.kanade.tachiyomi.ui.webview.WebViewScreen import exh.ui.ifSourcesLoaded import kotlinx.collections.immutable.persistentListOf -import kotlinx.coroutines.launch import mihon.presentation.core.util.collectAsLazyPagingItems import tachiyomi.core.common.Constants import tachiyomi.domain.manga.model.Manga diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt index ef195b117..b357a4dd0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt @@ -33,7 +33,6 @@ import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.EASE_IN_OUT import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.EASE_OUT_QUAD import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE import com.github.chrisbanes.photoview.PhotoView -import eu.kanade.domain.base.BasePreferences import eu.kanade.tachiyomi.data.coil.cropBorders import eu.kanade.tachiyomi.data.coil.customDecoder import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonSubsamplingImageView diff --git a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt index 6def9edd7..39238d2b5 100644 --- a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt +++ b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt @@ -254,7 +254,7 @@ class FavoritesSyncHelper(val context: Context) { if (!explicitlyRetryExhRequest(10, request)) { val error = FavoritesSyncStatus.SyncError.GallerySyncError.UnableToAddGalleryToRemote( gallery.title, - gallery.gid + gallery.gid, ) if (prefs.exhLenientSync().get()) { @@ -444,24 +444,32 @@ sealed class FavoritesSyncStatus { sealed class SyncError : FavoritesSyncStatus() { @Serializable data object NotLoggedInSyncError : SyncError() + @Serializable data object FailedToFetchFavorites : SyncError() + @Serializable data class UnknownSyncError(val message: String) : SyncError() + @Serializable sealed class GallerySyncError : SyncError() { @Serializable - data class UnableToAddGalleryToRemote(val title: String, val gid: String): GallerySyncError() + data class UnableToAddGalleryToRemote(val title: String, val gid: String) : GallerySyncError() + @Serializable data object UnableToDeleteFromRemote : GallerySyncError() + @Serializable - data class GalleryAddFail(val title: String, val reason: String): GallerySyncError() + data class GalleryAddFail(val title: String, val reason: String) : GallerySyncError() + @Serializable - data class InvalidGalleryFail(val title: String, val url: String): GallerySyncError() + data class InvalidGalleryFail(val title: String, val url: String) : GallerySyncError() } } + @Serializable data object Idle : FavoritesSyncStatus() + @Serializable sealed class BadLibraryState : FavoritesSyncStatus() { @Serializable @@ -471,8 +479,10 @@ sealed class FavoritesSyncStatus { val categories: List, ) : BadLibraryState() } + @Serializable data object Initializing : FavoritesSyncStatus() + @Serializable sealed class Processing : FavoritesSyncStatus() { data object VerifyingLibrary : Processing() @@ -499,6 +509,7 @@ sealed class FavoritesSyncStatus { ) : Processing() data object CleaningUp : Processing() } + @Serializable data class CompleteWithErrors(val messages: List) : FavoritesSyncStatus() }