diff --git a/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt b/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt index 91d93db70..00e63d38f 100644 --- a/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt +++ b/app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt @@ -95,7 +95,7 @@ class SourcePreferences( fun defaultMangaOrder() = preferenceStore.getString("default_manga_order", "") - //fun migrationSources() = preferenceStore.getString("migrate_sources", "") + // fun migrationSources() = preferenceStore.getString("migrate_sources", "") fun smartMigration() = preferenceStore.getBoolean("smart_migrate", false) diff --git a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt index 715c62712..1245df4b6 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt @@ -320,7 +320,7 @@ fun ReaderAppBars( .fillMaxWidth() .background(backgroundColor) .padding(horizontal = MaterialTheme.padding.small) - .windowInsetsPadding(WindowInsets.navigationBars) + .windowInsetsPadding(WindowInsets.navigationBars), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt index cca4bb67a..3ac5f8931 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt @@ -63,8 +63,8 @@ fun Screen.migrateSourceTab(): TabContent { withUIContext { navigator.push( MigrationConfigScreen( - sourceMangas - ) + sourceMangas, + ), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt index 6f6662019..482df57db 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt @@ -200,7 +200,7 @@ object HomeScreen : Screen() { @Composable private fun RowScope.NavigationBarItem( - tab: eu.kanade.presentation.util.Tab,/* SY --> */ + tab: eu.kanade.presentation.util.Tab, /* SY --> */ alwaysShowLabel: Boolean, /* SY <-- */ ) { val tabNavigator = LocalTabNavigator.current diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt index 2b481edc1..a28e329bf 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt @@ -183,7 +183,7 @@ class LibraryScreenModel( ), // SY <-- getLibraryItemPreferencesFlow(), - ) { (searchQuery, categories, favorites), (tracksMap, trackingFilters), /* SY --> */ (groupType, sortingMode) /* <-- SY */, itemPreferences -> + ) { (searchQuery, categories, favorites), (tracksMap, trackingFilters), /* SY --> */ (groupType, sortingMode)/* <-- SY */, itemPreferences -> val showSystemCategory = favorites.any { it.libraryManga.categories.contains(0) } val filteredFavorites = favorites .applyFilters(tracksMap, trackingFilters, itemPreferences) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt index 6b0755dfa..8c9221d5d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt @@ -194,12 +194,13 @@ data object LibraryTab : Tab { .map { it.id } // <-- SY screenModel.clearSelection() - /* SY --> */if (selection.isNotEmpty()) { /* <-- SY */ - navigator.push(MigrationConfigScreen(selection)) - // SY ->> - } else { - context.toast(SYMR.strings.no_valid_entry) - } + /* SY --> */if (selection.isNotEmpty()) { + /* <-- SY */ + navigator.push(MigrationConfigScreen(selection)) + // SY ->> + } else { + context.toast(SYMR.strings.no_valid_entry) + } // <-- SY }, // SY --> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 81fbe01f1..0ad7a2794 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -51,8 +51,8 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior import cafe.adriel.voyager.navigator.currentOrThrow -import com.google.firebase.analytics.analytics import com.google.firebase.Firebase +import com.google.firebase.analytics.analytics import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.source.interactor.GetIncognitoState import eu.kanade.presentation.components.AppStateBanners diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 3ab0d092f..4521cade7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -106,7 +106,6 @@ import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableSet import kotlinx.coroutines.delay import kotlinx.coroutines.flow.combine -import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.drop import kotlinx.coroutines.flow.filterNotNull @@ -142,7 +141,8 @@ class ReaderActivity : BaseActivity() { context: Context, mangaId: Long?, chapterId: Long?, - /* SY --> */ page: Int? = null, /* SY <-- */ + /* SY --> */ + page: Int? = null, /* SY <-- */ ): Intent { return Intent(context, ReaderActivity::class.java).apply { putExtra("manga", mangaId) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt index 47289433e..18333357e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt @@ -95,7 +95,7 @@ class ChapterLoader( dbChapter.name, dbChapter.scanlator, dbChapter.url, - /* SY --> */ manga.ogTitle, /* SY <-- */ + /* SY --> */ manga.ogTitle, /* SY <-- */ manga.source, skipCache = true, ) diff --git a/app/src/main/java/exh/log/CrashlyticsPrinter.kt b/app/src/main/java/exh/log/CrashlyticsPrinter.kt index 813436cc0..2b481ed75 100644 --- a/app/src/main/java/exh/log/CrashlyticsPrinter.kt +++ b/app/src/main/java/exh/log/CrashlyticsPrinter.kt @@ -1,8 +1,8 @@ package exh.log import com.elvishew.xlog.printer.Printer -import com.google.firebase.crashlytics.crashlytics import com.google.firebase.Firebase +import com.google.firebase.crashlytics.crashlytics import eu.kanade.tachiyomi.BuildConfig class CrashlyticsPrinter(private val logLevel: Int) : Printer { diff --git a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt index fc740fbc5..43553a00f 100755 --- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt +++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt @@ -96,9 +96,9 @@ actual class LocalSource( .filter { it.isDirectory && /* SY --> */ ( - !it.name.orEmpty().startsWith('.') || - allowLocalSourceHiddenFolders - ) /* SY <-- */ + !it.name.orEmpty().startsWith('.') || + allowLocalSourceHiddenFolders + ) /* SY <-- */ } .distinctBy { it.name } .filter {