Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spotless

Browse Source
This commit is contained in:
Jobobby04 2024-12-08 15:22:57 -05:00
parent 1b3d76398b
commit 4abadea4f9
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt
View File

@ -75,7 +75,7 @@ fun SyncFavoritesProgressDialog(
FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote -> FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote ->
context.stringResource(SYMR.strings.favorites_sync_unable_to_delete) context.stringResource(SYMR.strings.favorites_sync_unable_to_delete)
} }
} },
), ),
positiveButtonText = context.stringResource(MR.strings.action_ok), positiveButtonText = context.stringResource(MR.strings.action_ok),
positiveButton = setStatusIdle, positiveButton = setStatusIdle,
@ -112,7 +112,7 @@ fun SyncFavoritesProgressDialog(
context.stringResource(SYMR.strings.favorites_sync_unable_to_add_to_remote, status.title, status.gid) context.stringResource(SYMR.strings.favorites_sync_unable_to_add_to_remote, status.title, status.gid)
FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote -> FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote ->
context.stringResource(SYMR.strings.favorites_sync_unable_to_delete) context.stringResource(SYMR.strings.favorites_sync_unable_to_delete)
} },
), ),
positiveButtonText = context.stringResource(MR.strings.action_ok), positiveButtonText = context.stringResource(MR.strings.action_ok),
positiveButton = setStatusIdle, positiveButton = setStatusIdle,
@ -137,7 +137,7 @@ fun SyncFavoritesProgressDialog(
if (status.isThrottling) { if (status.isThrottling) {
context.stringResource( context.stringResource(
SYMR.strings.favorites_sync_processing_throttle, 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 { } else {
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)
@ -148,7 +148,7 @@ fun SyncFavoritesProgressDialog(
if (status.isThrottling) { if (status.isThrottling) {
context.stringResource( context.stringResource(
SYMR.strings.favorites_sync_processing_throttle, 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 { } else {
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)

2
app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt
View File

@ -176,7 +176,7 @@ object Notifications {
setGroup(GROUP_LIBRARY) setGroup(GROUP_LIBRARY)
setShowBadge(false) setShowBadge(false)
}, },
//SY <-- // SY <--
), ),
) )
} }

1
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
View File

@ -23,7 +23,6 @@ import eu.kanade.tachiyomi.ui.manga.MangaScreen
import eu.kanade.tachiyomi.ui.webview.WebViewScreen import eu.kanade.tachiyomi.ui.webview.WebViewScreen
import exh.ui.ifSourcesLoaded import exh.ui.ifSourcesLoaded
import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.launch
import mihon.presentation.core.util.collectAsLazyPagingItems import mihon.presentation.core.util.collectAsLazyPagingItems
import tachiyomi.core.common.Constants import tachiyomi.core.common.Constants
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga

1
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt
View File

@ -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.EASE_OUT_QUAD
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE
import com.github.chrisbanes.photoview.PhotoView 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.cropBorders
import eu.kanade.tachiyomi.data.coil.customDecoder import eu.kanade.tachiyomi.data.coil.customDecoder
import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonSubsamplingImageView import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonSubsamplingImageView

19
app/src/main/java/exh/favorites/FavoritesSyncHelper.kt
View File

@ -254,7 +254,7 @@ class FavoritesSyncHelper(val context: Context) {
if (!explicitlyRetryExhRequest(10, request)) { if (!explicitlyRetryExhRequest(10, request)) {
val error = FavoritesSyncStatus.SyncError.GallerySyncError.UnableToAddGalleryToRemote( val error = FavoritesSyncStatus.SyncError.GallerySyncError.UnableToAddGalleryToRemote(
gallery.title, gallery.title,
gallery.gid gallery.gid,
) )
if (prefs.exhLenientSync().get()) { if (prefs.exhLenientSync().get()) {
@ -444,24 +444,32 @@ sealed class FavoritesSyncStatus {
sealed class SyncError : FavoritesSyncStatus() { sealed class SyncError : FavoritesSyncStatus() {
@Serializable @Serializable
data object NotLoggedInSyncError : SyncError() data object NotLoggedInSyncError : SyncError()
@Serializable @Serializable
data object FailedToFetchFavorites : SyncError() data object FailedToFetchFavorites : SyncError()
@Serializable @Serializable
data class UnknownSyncError(val message: String) : SyncError() data class UnknownSyncError(val message: String) : SyncError()
@Serializable @Serializable
sealed class GallerySyncError : SyncError() { sealed class GallerySyncError : SyncError() {
@Serializable @Serializable
data class UnableToAddGalleryToRemote(val title: String, val gid: String): GallerySyncError() data class UnableToAddGalleryToRemote(val title: String, val gid: String) : GallerySyncError()
@Serializable @Serializable
data object UnableToDeleteFromRemote : GallerySyncError() data object UnableToDeleteFromRemote : GallerySyncError()
@Serializable @Serializable
data class GalleryAddFail(val title: String, val reason: String): GallerySyncError() data class GalleryAddFail(val title: String, val reason: String) : GallerySyncError()
@Serializable @Serializable
data class InvalidGalleryFail(val title: String, val url: String): GallerySyncError() data class InvalidGalleryFail(val title: String, val url: String) : GallerySyncError()
} }
} }
@Serializable @Serializable
data object Idle : FavoritesSyncStatus() data object Idle : FavoritesSyncStatus()
@Serializable @Serializable
sealed class BadLibraryState : FavoritesSyncStatus() { sealed class BadLibraryState : FavoritesSyncStatus() {
@Serializable @Serializable
@ -471,8 +479,10 @@ sealed class FavoritesSyncStatus {
val categories: List<String>, val categories: List<String>,
) : BadLibraryState() ) : BadLibraryState()
} }
@Serializable @Serializable
data object Initializing : FavoritesSyncStatus() data object Initializing : FavoritesSyncStatus()
@Serializable @Serializable
sealed class Processing : FavoritesSyncStatus() { sealed class Processing : FavoritesSyncStatus() {
data object VerifyingLibrary : Processing() data object VerifyingLibrary : Processing()
@ -499,6 +509,7 @@ sealed class FavoritesSyncStatus {
) : Processing() ) : Processing()
data object CleaningUp : Processing() data object CleaningUp : Processing()
} }
@Serializable @Serializable
data class CompleteWithErrors(val messages: List<SyncError.GallerySyncError>) : FavoritesSyncStatus() data class CompleteWithErrors(val messages: List<SyncError.GallerySyncError>) : FavoritesSyncStatus()
} }