Spotless apply
This commit is contained in:
@@ -95,7 +95,7 @@ class SourcePreferences(
|
|||||||
|
|
||||||
fun defaultMangaOrder() = preferenceStore.getString("default_manga_order", "")
|
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)
|
fun smartMigration() = preferenceStore.getBoolean("smart_migrate", false)
|
||||||
|
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ fun ReaderAppBars(
|
|||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.background(backgroundColor)
|
.background(backgroundColor)
|
||||||
.padding(horizontal = MaterialTheme.padding.small)
|
.padding(horizontal = MaterialTheme.padding.small)
|
||||||
.windowInsetsPadding(WindowInsets.navigationBars)
|
.windowInsetsPadding(WindowInsets.navigationBars),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -63,8 +63,8 @@ fun Screen.migrateSourceTab(): TabContent {
|
|||||||
withUIContext {
|
withUIContext {
|
||||||
navigator.push(
|
navigator.push(
|
||||||
MigrationConfigScreen(
|
MigrationConfigScreen(
|
||||||
sourceMangas
|
sourceMangas,
|
||||||
)
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ object HomeScreen : Screen() {
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun RowScope.NavigationBarItem(
|
private fun RowScope.NavigationBarItem(
|
||||||
tab: eu.kanade.presentation.util.Tab,/* SY --> */
|
tab: eu.kanade.presentation.util.Tab, /* SY --> */
|
||||||
alwaysShowLabel: Boolean, /* SY <-- */
|
alwaysShowLabel: Boolean, /* SY <-- */
|
||||||
) {
|
) {
|
||||||
val tabNavigator = LocalTabNavigator.current
|
val tabNavigator = LocalTabNavigator.current
|
||||||
|
|||||||
@@ -183,7 +183,7 @@ class LibraryScreenModel(
|
|||||||
),
|
),
|
||||||
// SY <--
|
// SY <--
|
||||||
getLibraryItemPreferencesFlow(),
|
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 showSystemCategory = favorites.any { it.libraryManga.categories.contains(0) }
|
||||||
val filteredFavorites = favorites
|
val filteredFavorites = favorites
|
||||||
.applyFilters(tracksMap, trackingFilters, itemPreferences)
|
.applyFilters(tracksMap, trackingFilters, itemPreferences)
|
||||||
|
|||||||
@@ -194,12 +194,13 @@ data object LibraryTab : Tab {
|
|||||||
.map { it.id }
|
.map { it.id }
|
||||||
// <-- SY
|
// <-- SY
|
||||||
screenModel.clearSelection()
|
screenModel.clearSelection()
|
||||||
/* SY --> */if (selection.isNotEmpty()) { /* <-- SY */
|
/* SY --> */if (selection.isNotEmpty()) {
|
||||||
navigator.push(MigrationConfigScreen(selection))
|
/* <-- SY */
|
||||||
// SY ->>
|
navigator.push(MigrationConfigScreen(selection))
|
||||||
} else {
|
// SY ->>
|
||||||
context.toast(SYMR.strings.no_valid_entry)
|
} else {
|
||||||
}
|
context.toast(SYMR.strings.no_valid_entry)
|
||||||
|
}
|
||||||
// <-- SY
|
// <-- SY
|
||||||
},
|
},
|
||||||
// SY -->
|
// SY -->
|
||||||
|
|||||||
@@ -51,8 +51,8 @@ import cafe.adriel.voyager.navigator.LocalNavigator
|
|||||||
import cafe.adriel.voyager.navigator.Navigator
|
import cafe.adriel.voyager.navigator.Navigator
|
||||||
import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior
|
import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior
|
||||||
import cafe.adriel.voyager.navigator.currentOrThrow
|
import cafe.adriel.voyager.navigator.currentOrThrow
|
||||||
import com.google.firebase.analytics.analytics
|
|
||||||
import com.google.firebase.Firebase
|
import com.google.firebase.Firebase
|
||||||
|
import com.google.firebase.analytics.analytics
|
||||||
import eu.kanade.domain.base.BasePreferences
|
import eu.kanade.domain.base.BasePreferences
|
||||||
import eu.kanade.domain.source.interactor.GetIncognitoState
|
import eu.kanade.domain.source.interactor.GetIncognitoState
|
||||||
import eu.kanade.presentation.components.AppStateBanners
|
import eu.kanade.presentation.components.AppStateBanners
|
||||||
|
|||||||
@@ -106,7 +106,6 @@ import kotlinx.collections.immutable.toImmutableList
|
|||||||
import kotlinx.collections.immutable.toImmutableSet
|
import kotlinx.collections.immutable.toImmutableSet
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.flow.combine
|
import kotlinx.coroutines.flow.combine
|
||||||
import kotlinx.coroutines.flow.combine
|
|
||||||
import kotlinx.coroutines.flow.distinctUntilChanged
|
import kotlinx.coroutines.flow.distinctUntilChanged
|
||||||
import kotlinx.coroutines.flow.drop
|
import kotlinx.coroutines.flow.drop
|
||||||
import kotlinx.coroutines.flow.filterNotNull
|
import kotlinx.coroutines.flow.filterNotNull
|
||||||
@@ -142,7 +141,8 @@ class ReaderActivity : BaseActivity() {
|
|||||||
context: Context,
|
context: Context,
|
||||||
mangaId: Long?,
|
mangaId: Long?,
|
||||||
chapterId: Long?,
|
chapterId: Long?,
|
||||||
/* SY --> */ page: Int? = null, /* SY <-- */
|
/* SY --> */
|
||||||
|
page: Int? = null, /* SY <-- */
|
||||||
): Intent {
|
): Intent {
|
||||||
return Intent(context, ReaderActivity::class.java).apply {
|
return Intent(context, ReaderActivity::class.java).apply {
|
||||||
putExtra("manga", mangaId)
|
putExtra("manga", mangaId)
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ class ChapterLoader(
|
|||||||
dbChapter.name,
|
dbChapter.name,
|
||||||
dbChapter.scanlator,
|
dbChapter.scanlator,
|
||||||
dbChapter.url,
|
dbChapter.url,
|
||||||
/* SY --> */ manga.ogTitle, /* SY <-- */
|
/* SY --> */ manga.ogTitle, /* SY <-- */
|
||||||
manga.source,
|
manga.source,
|
||||||
skipCache = true,
|
skipCache = true,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package exh.log
|
package exh.log
|
||||||
|
|
||||||
import com.elvishew.xlog.printer.Printer
|
import com.elvishew.xlog.printer.Printer
|
||||||
import com.google.firebase.crashlytics.crashlytics
|
|
||||||
import com.google.firebase.Firebase
|
import com.google.firebase.Firebase
|
||||||
|
import com.google.firebase.crashlytics.crashlytics
|
||||||
import eu.kanade.tachiyomi.BuildConfig
|
import eu.kanade.tachiyomi.BuildConfig
|
||||||
|
|
||||||
class CrashlyticsPrinter(private val logLevel: Int) : Printer {
|
class CrashlyticsPrinter(private val logLevel: Int) : Printer {
|
||||||
|
|||||||
@@ -96,9 +96,9 @@ actual class LocalSource(
|
|||||||
.filter {
|
.filter {
|
||||||
it.isDirectory &&
|
it.isDirectory &&
|
||||||
/* SY --> */ (
|
/* SY --> */ (
|
||||||
!it.name.orEmpty().startsWith('.') ||
|
!it.name.orEmpty().startsWith('.') ||
|
||||||
allowLocalSourceHiddenFolders
|
allowLocalSourceHiddenFolders
|
||||||
) /* SY <-- */
|
) /* SY <-- */
|
||||||
}
|
}
|
||||||
.distinctBy { it.name }
|
.distinctBy { it.name }
|
||||||
.filter {
|
.filter {
|
||||||
|
|||||||
Reference in New Issue
Block a user