From 19746904e179f9a4bd88d1efc8292f0346611aa2 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 23 Dec 2023 18:23:58 -0500 Subject: [PATCH] Some linting --- .../domain/chapter/model/ChapterFilter.kt | 2 +- .../source/interactor/GetEnabledSources.kt | 12 ++++++++-- .../domain/track/interactor/TrackChapter.kt | 7 +++++- .../presentation/browse/GlobalSearchScreen.kt | 3 ++- .../components/BrowseSourceEHentaiList.kt | 7 +++++- .../browse/components/BrowseSourceToolbar.kt | 6 ++++- .../category/BiometricTimesScreen.kt | 3 ++- .../presentation/category/CategoryScreen.kt | 3 ++- .../presentation/category/SortTagScreen.kt | 3 ++- .../category/SourceCategoryScreen.kt | 3 ++- .../presentation/category/SourceRepoScreen.kt | 3 ++- .../category/components/CategoryDialogs.kt | 20 ++++++++++++---- .../biometric/BiometricTimesListItem.kt | 6 ++++- .../components/genre/SortTagListItem.kt | 6 ++++- .../components/repo/SourceRepoListItem.kt | 6 ++++- .../sources/SourceCategoryListItem.kt | 6 ++++- .../kanade/presentation/components/AppBar.kt | 6 ++++- .../presentation/components/AroundLayout.kt | 3 ++- .../library/LibrarySettingsDialog.kt | 6 ++++- .../components/SyncFavoritesWarningDialog.kt | 5 +++- .../manga/components/MangaChapterListItem.kt | 6 ++++- .../manga/components/PagePreviews.kt | 9 +++++--- .../settings/screen/ConfigureExhDialog.kt | 7 +++++- .../settings/screen/SettingsAdvancedScreen.kt | 23 +++++++++++++------ .../settings/screen/SettingsLibraryScreen.kt | 7 ++++-- .../settings/screen/debug/DebugInfoScreen.kt | 3 ++- .../data/backup/BackupCreateFlags.kt | 1 + .../kanade/tachiyomi/ui/manga/MangaScreen.kt | 4 ++-- .../tachiyomi/ui/manga/MangaScreenModel.kt | 3 +-- .../tachiyomi/ui/reader/ReaderActivity.kt | 2 +- .../tachiyomi/ui/reader/ReaderViewModel.kt | 1 - 31 files changed, 137 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt b/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt index 864eb2836..5cdb82673 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt @@ -15,7 +15,7 @@ import tachiyomi.source.local.isLocal */ fun List.applyFilters( manga: Manga, - downloadManager: DownloadManager,/* SY --> */ + downloadManager: DownloadManager, /* SY --> */ mergedManga: Map, /* SY <-- */ ): List { val isLocalManga = manga.isLocal() diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt index 211764de3..34ad27236 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt @@ -32,7 +32,11 @@ class GetEnabledSources( ) { a, b, c -> Triple(a, b, c) }, // SY <-- repository.getSources(), - ) { pinnedSourceIds, (enabledLanguages, disabledSources, lastUsedSource), (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter), sources -> + ) { pinnedSourceIds, + (enabledLanguages, disabledSources, lastUsedSource), + (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter), + sources -> + val sourcesAndCategories = sourcesInCategories.map { it.split('|').let { (source, test) -> source.toLong() to test } } @@ -61,7 +65,11 @@ class GetEnabledSources( categories.forEach { category -> toFlatten.add(source.copy(category = category, pin = source.pin - Pin.Actual)) } - if (sourceCategoriesFilter && Pin.Actual !in toFlatten[0].pin && source.id in sourcesInSourceCategories) { + if ( + sourceCategoriesFilter && + Pin.Actual !in toFlatten[0].pin && + source.id in sourcesInSourceCategories + ) { toFlatten.removeAt(0) } // SY <-- diff --git a/app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt b/app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt index ee33c382b..bf0655823 100644 --- a/app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt +++ b/app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt @@ -30,7 +30,12 @@ class TrackChapter( tracks.mapNotNull { track -> val service = trackerManager.get(track.syncId) - if (service == null || !service.isLoggedIn || chapterNumber <= track.lastChapterRead /* SY --> */ || (service is MdList && track.status == FollowStatus.UNFOLLOWED.int.toLong())/* SY <-- */) { + if ( + service == null || + !service.isLoggedIn || + chapterNumber <= track.lastChapterRead /* SY --> */ || + (service is MdList && track.status == FollowStatus.UNFOLLOWED.int.toLong())/* SY <-- */ + ) { return@mapNotNull null } diff --git a/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt index 4df4179fe..216697bd0 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt @@ -74,7 +74,8 @@ internal fun GlobalSearchContent( items.forEach { (source, result) -> item(key = source.id) { GlobalSearchResultItem( - title = fromSourceId?.let { "▶ ${source.name}".takeIf { source.id == fromSourceId } } ?: source.name, + title = fromSourceId?.let { "▶ ${source.name}".takeIf { source.id == fromSourceId } } + ?: source.name, subtitle = LocaleHelper.getDisplayName(source.lang), onClick = { onClickSource(source) }, ) { diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt index 65f785bc1..25fb703e2 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt @@ -110,7 +110,12 @@ fun BrowseSourceEHentaiListItem( ) val pageCount = metadata.length if (locale != null && pageCount != null) { - resources.getQuantityString(R.plurals.browse_language_and_pages, pageCount, pageCount, locale.toLanguageTag().uppercase()) + resources.getQuantityString( + R.plurals.browse_language_and_pages, + pageCount, + pageCount, + locale.toLanguageTag().uppercase() + ) } else if (pageCount != null) { resources.getQuantityString(R.plurals.num_pages, pageCount, pageCount) } else { diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt index 9bc1737a2..4b4c2172b 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt @@ -59,7 +59,11 @@ fun BrowseSourceToolbar( actions = listOfNotNull( AppBar.Action( title = stringResource(R.string.action_display_mode), - icon = if (displayMode == LibraryDisplayMode.List) Icons.Filled.ViewList else Icons.Filled.ViewModule, + icon = if (displayMode == LibraryDisplayMode.List) { + Icons.Filled.ViewList + } else { + Icons.Filled.ViewModule + }, onClick = { selectingDisplayMode = true }, ).takeIf { displayMode != null }, if (isLocalSource) { diff --git a/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt b/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt index 667ca4ffb..8d2e43ae1 100644 --- a/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt @@ -53,7 +53,8 @@ fun BiometricTimesScreen( BiometricTimesContent( timeRanges = state.timeRanges, lazyListState = lazyListState, - paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium), + paddingValues = paddingValues + topSmallPaddingValues + + PaddingValues(horizontal = MaterialTheme.padding.medium), onClickDelete = onClickDelete, ) } diff --git a/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt b/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt index 485d3e4ff..2d2e15559 100644 --- a/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt @@ -75,7 +75,8 @@ fun CategoryScreen( CategoryContent( categories = state.categories, lazyListState = lazyListState, - paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium), + paddingValues = paddingValues + topSmallPaddingValues + + PaddingValues(horizontal = MaterialTheme.padding.medium), onClickRename = onClickRename, onClickDelete = onClickDelete, onMoveUp = onClickMoveUp, diff --git a/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt b/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt index de7d0aa6f..2c0f1de92 100644 --- a/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt @@ -54,7 +54,8 @@ fun SortTagScreen( SortTagContent( tags = state.tags, lazyListState = lazyListState, - paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium), + paddingValues = paddingValues + topSmallPaddingValues + + PaddingValues(horizontal = MaterialTheme.padding.medium), onClickDelete = onClickDelete, onMoveUp = onClickMoveUp, onMoveDown = onClickMoveDown, diff --git a/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt b/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt index 6750cde6b..7e5920288 100644 --- a/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt @@ -53,7 +53,8 @@ fun SourceCategoryScreen( SourceCategoryContent( categories = state.categories, lazyListState = lazyListState, - paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium), + paddingValues = paddingValues + topSmallPaddingValues + + PaddingValues(horizontal = MaterialTheme.padding.medium), onClickRename = onClickRename, onClickDelete = onClickDelete, ) diff --git a/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt b/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt index 2dc62cabc..3252d9cf7 100644 --- a/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt @@ -52,7 +52,8 @@ fun SourceRepoScreen( SourceRepoContent( repos = state.repos, lazyListState = lazyListState, - paddingValues = paddingValues + topSmallPaddingValues + PaddingValues(horizontal = MaterialTheme.padding.medium), + paddingValues = paddingValues + topSmallPaddingValues + + PaddingValues(horizontal = MaterialTheme.padding.medium), onClickDelete = onClickDelete, ) } diff --git a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt index 3b21ccefa..642fdf992 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt @@ -88,7 +88,11 @@ fun CategoryCreateDialog( Text(text = stringResource(R.string.name)) }, supportingText = { - val msgRes = if (name.isNotEmpty() && nameAlreadyExists) alreadyExistsError else R.string.information_required_plain + val msgRes = if (name.isNotEmpty() && nameAlreadyExists) { + alreadyExistsError + } else { + R.string.information_required_plain + } Text(text = stringResource(msgRes)) }, isError = name.isNotEmpty() && nameAlreadyExists, @@ -153,7 +157,11 @@ fun CategoryRenameDialog( }, label = { Text(text = stringResource(R.string.name)) }, supportingText = { - val msgRes = if (valueHasChanged && nameAlreadyExists) alreadyExistsError else R.string.information_required_plain + val msgRes = if (valueHasChanged && nameAlreadyExists) { + alreadyExistsError + } else { + R.string.information_required_plain + } Text(text = stringResource(msgRes)) }, isError = valueHasChanged && nameAlreadyExists, @@ -279,8 +287,12 @@ fun ChangeCategoryDialog( onClick = { onDismissRequest() onConfirm( - selection.filter { it is CheckboxState.State.Checked || it is CheckboxState.TriState.Include }.map { it.value.id }, - selection.filter { it is CheckboxState.State.None || it is CheckboxState.TriState.None }.map { it.value.id }, + selection.filter { + it is CheckboxState.State.Checked || it is CheckboxState.TriState.Include + }.map { it.value.id }, + selection.filter { + it is CheckboxState.State.None || it is CheckboxState.TriState.None + }.map { it.value.id }, ) }, ) { diff --git a/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt b/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt index aa6041fda..57d1c1ee6 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt @@ -30,7 +30,11 @@ fun BiometricTimesListItem( Row( modifier = Modifier .fillMaxWidth() - .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium), + .padding( + start = MaterialTheme.padding.medium, + top = MaterialTheme.padding.medium, + end = MaterialTheme.padding.medium + ), verticalAlignment = Alignment.CenterVertically, ) { Icon(imageVector = Icons.Outlined.Label, contentDescription = "") diff --git a/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt b/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt index 2b8c4017d..581bb18ec 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt @@ -35,7 +35,11 @@ fun SortTagListItem( Row( modifier = Modifier .fillMaxWidth() - .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium), + .padding( + start = MaterialTheme.padding.medium, + top = MaterialTheme.padding.medium, + end = MaterialTheme.padding.medium + ), verticalAlignment = Alignment.CenterVertically, ) { Icon(imageVector = Icons.Outlined.Label, contentDescription = "") diff --git a/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt b/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt index b15236608..08fd3ad78 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt @@ -29,7 +29,11 @@ fun SourceRepoListItem( Row( modifier = Modifier .fillMaxWidth() - .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium), + .padding( + start = MaterialTheme.padding.medium, + top = MaterialTheme.padding.medium, + end = MaterialTheme.padding.medium + ), verticalAlignment = Alignment.CenterVertically, ) { Icon(imageVector = Icons.Outlined.Label, contentDescription = "") diff --git a/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt b/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt index a22feb28e..b0b220ba3 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt @@ -33,7 +33,11 @@ fun SourceCategoryListItem( modifier = Modifier .fillMaxWidth() .clickable { onRename() } - .padding(start = MaterialTheme.padding.medium, top = MaterialTheme.padding.medium, end = MaterialTheme.padding.medium), + .padding( + start = MaterialTheme.padding.medium, + top = MaterialTheme.padding.medium, + end = MaterialTheme.padding.medium + ), verticalAlignment = Alignment.CenterVertically, ) { Icon(imageVector = Icons.Outlined.Label, contentDescription = "") diff --git a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt index 7ccfae0bd..96278f506 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt +++ b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt @@ -370,7 +370,11 @@ fun SearchToolbar( @Composable fun UpIcon(navigationIcon: ImageVector? = null) { val icon = navigationIcon - ?: if (LocalLayoutDirection.current == LayoutDirection.Ltr) Icons.Outlined.ArrowBack else Icons.Outlined.ArrowForward + ?: if (LocalLayoutDirection.current == LayoutDirection.Ltr) { + Icons.Outlined.ArrowBack + } else { + Icons.Outlined.ArrowForward + } Icon( imageVector = icon, contentDescription = stringResource(R.string.abc_action_bar_up_description), diff --git a/app/src/main/java/eu/kanade/presentation/components/AroundLayout.kt b/app/src/main/java/eu/kanade/presentation/components/AroundLayout.kt index cf5141263..dfd9388fc 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AroundLayout.kt +++ b/app/src/main/java/eu/kanade/presentation/components/AroundLayout.kt @@ -41,7 +41,8 @@ fun AroundLayout( } }.fastMap { it.measure(looseConstraints.copy(maxWidth = bodyContentWidth)) } - val height = (startLayoutPlaceables + endLayoutPlaceables + bodyContentPlaceables).maxOfOrNull { it.height } ?: 0 + val height = (startLayoutPlaceables + endLayoutPlaceables + bodyContentPlaceables) + .maxOfOrNull { it.height } ?: 0 layout(constraints.maxWidth, height) { // Placing to control drawing order to match default elevation of each placeable diff --git a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt index fba83e1a6..c3d41f620 100644 --- a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt @@ -215,7 +215,11 @@ private fun ColumnScope.SortPage( onClick = { val isTogglingDirection = sortingMode == mode val direction = when { - isTogglingDirection -> if (sortDescending) LibrarySort.Direction.Ascending else LibrarySort.Direction.Descending + isTogglingDirection -> if (sortDescending) { + LibrarySort.Direction.Ascending + } else { + LibrarySort.Direction.Descending + } else -> if (sortDescending) LibrarySort.Direction.Descending else LibrarySort.Direction.Ascending } screenModel.setSort(category, mode, direction) diff --git a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesWarningDialog.kt b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesWarningDialog.kt index 095e484d1..de8acb082 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesWarningDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesWarningDialog.kt @@ -23,7 +23,10 @@ fun SyncFavoritesWarningDialog( ) { val context = LocalContext.current val text = remember { - HtmlCompat.fromHtml(context.getString(R.string.favorites_sync_notes_message), HtmlCompat.FROM_HTML_MODE_LEGACY).toAnnotatedString() + HtmlCompat.fromHtml( + context.getString(R.string.favorites_sync_notes_message), + HtmlCompat.FROM_HTML_MODE_LEGACY + ).toAnnotatedString() } AlertDialog( onDismissRequest = onDismissRequest, diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt index 17bda6ab7..2f6ee66d9 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt @@ -185,7 +185,11 @@ fun MangaChapterListItem( maxLines = 1, overflow = TextOverflow.Ellipsis, ) - if (readProgress != null || scanlator != null/* SY --> */ || sourceName != null/* SY <-- */) DotSeparatorText() + if ( + readProgress != null || + scanlator != null/* SY --> */ || + sourceName != null/* SY <-- */ + ) DotSeparatorText() } if (readProgress != null) { Text( diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt b/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt index 3b448280c..ec3f35be9 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt @@ -45,9 +45,12 @@ fun PagePreviews( ) { when (pagePreviewState) { PagePreviewState.Loading -> { - Box(modifier = Modifier - .height(60.dp) - .fillMaxWidth(), contentAlignment = Alignment.Center) { + Box( + modifier = Modifier + .height(60.dp) + .fillMaxWidth(), + contentAlignment = Alignment.Center, + ) { CircularProgressIndicator() } } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt index 0d8cf76ae..225c64606 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt @@ -117,7 +117,12 @@ fun ConfigureExhDialog(run: Boolean, onRunning: () -> Unit) { Text(text = stringResource(R.string.eh_settings_configuration_failed)) }, text = { - Text(text = stringResource(R.string.eh_settings_configuration_failed_message, configureFailedDialogOpen?.message.orEmpty())) + Text( + text = stringResource( + R.string.eh_settings_configuration_failed_message, + configureFailedDialogOpen?.message.orEmpty() + ) + ) }, ) } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt index c25db7df8..490e6fb0b 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt @@ -262,7 +262,9 @@ object SettingsAdvancedScreen : SearchableSettings { clearSslPreferences() } WebStorage.getInstance().deleteAllData() - context.applicationInfo?.dataDir?.let { File("$it/app_webview/").deleteRecursively() } + context.applicationInfo?.dataDir?.let { + File("$it/app_webview/").deleteRecursively() + } context.toast(R.string.webview_data_deleted) } catch (e: Throwable) { logcat(LogPriority.ERROR, e) @@ -487,7 +489,9 @@ object SettingsAdvancedScreen : SearchableSettings { mangaFolders.forEach mangaFolder@{ mangaFolder -> val manga = - sourceManga.find { (_, folderName) -> folderName == mangaFolder.name }?.first + sourceManga.find { (_, folderName) -> + folderName == mangaFolder.name + }?.first if (manga == null) { // download is orphaned delete it foldersCleared += 1 + ( @@ -591,7 +595,8 @@ object SettingsAdvancedScreen : SearchableSettings { enabled = dataSaver != DataSaver.NONE, ), kotlin.run { - val dataSaverImageFormatJpeg by sourcePreferences.dataSaverImageFormatJpeg().collectAsState() + val dataSaverImageFormatJpeg by sourcePreferences.dataSaverImageFormatJpeg() + .collectAsState() Preference.PreferenceItem.SwitchPreference( pref = sourcePreferences.dataSaverImageFormatJpeg(), title = stringResource(R.string.data_saver_image_format), @@ -677,8 +682,10 @@ object SettingsAdvancedScreen : SearchableSettings { text = { Text( text = remember { - HtmlCompat.fromHtml(context.getString(R.string.encrypt_database_message), HtmlCompat.FROM_HTML_MODE_COMPACT) - .toAnnotatedString() + HtmlCompat.fromHtml( + context.getString(R.string.encrypt_database_message), + HtmlCompat.FROM_HTML_MODE_COMPACT + ).toAnnotatedString() }, ) }, @@ -716,8 +723,10 @@ object SettingsAdvancedScreen : SearchableSettings { Preference.PreferenceItem.TextPreference( title = stringResource(R.string.open_debug_menu), subtitle = remember { - HtmlCompat.fromHtml(context.getString(R.string.open_debug_menu_summary), HtmlCompat.FROM_HTML_MODE_COMPACT) - .toAnnotatedString() + HtmlCompat.fromHtml( + context.getString(R.string.open_debug_menu_summary), + HtmlCompat.FROM_HTML_MODE_COMPACT + ).toAnnotatedString() }, onClick = { navigator.push(SettingsDebugScreen()) }, ), diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt index 59c263f94..d4b19b282 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt @@ -55,7 +55,9 @@ object SettingsLibraryScreen : SearchableSettings { override fun getPreferences(): List { val getCategories = remember { Injekt.get() } val libraryPreferences = remember { Injekt.get() } - val allCategories by getCategories.subscribe().collectAsState(initial = runBlocking { getCategories.await() }) + val allCategories by getCategories.subscribe().collectAsState( + initial = runBlocking { getCategories.await() } + ) // SY --> val unsortedPreferences = remember { Injekt.get() } // SY <-- @@ -207,7 +209,8 @@ object SettingsLibraryScreen : SearchableSettings { title = stringResource(R.string.library_group_updates), entries = mapOf( GroupLibraryMode.GLOBAL to stringResource(R.string.library_group_updates_global), - GroupLibraryMode.ALL_BUT_UNGROUPED to stringResource(R.string.library_group_updates_all_but_ungrouped), + GroupLibraryMode.ALL_BUT_UNGROUPED to + stringResource(R.string.library_group_updates_all_but_ungrouped), GroupLibraryMode.ALL to stringResource(R.string.library_group_updates_all), ), ), diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt index 0e3bcde93..c37db1c6c 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt @@ -78,7 +78,8 @@ class DebugInfoScreen : Screen() { value = when (result) { ProfileVerifier.CompilationStatus.RESULT_CODE_NO_PROFILE -> "No profile installed" ProfileVerifier.CompilationStatus.RESULT_CODE_COMPILED_WITH_PROFILE -> "Compiled" - ProfileVerifier.CompilationStatus.RESULT_CODE_COMPILED_WITH_PROFILE_NON_MATCHING -> "Compiled non-matching" + ProfileVerifier.CompilationStatus.RESULT_CODE_COMPILED_WITH_PROFILE_NON_MATCHING -> + "Compiled non-matching" ProfileVerifier.CompilationStatus.RESULT_CODE_ERROR_CACHE_FILE_EXISTS_BUT_CANNOT_BE_READ, ProfileVerifier.CompilationStatus.RESULT_CODE_ERROR_CANT_WRITE_PROFILE_VERIFICATION_RESULT_CACHE_FILE, ProfileVerifier.CompilationStatus.RESULT_CODE_ERROR_PACKAGE_NAME_DOES_NOT_EXIST, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateFlags.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateFlags.kt index 1aad12db2..e91719a93 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateFlags.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateFlags.kt @@ -7,6 +7,7 @@ internal object BackupCreateFlags { const val BACKUP_TRACK = 0x8 const val BACKUP_APP_PREFS = 0x10 const val BACKUP_SOURCE_PREFS = 0x20 + // SY --> const val BACKUP_CUSTOM_INFO = 0x40 const val BACKUP_READ_MANGA = 0x80 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt index 979ba6d5e..073699f00 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt @@ -159,13 +159,13 @@ class MangaScreen( openMangaInWebView( navigator, screenModel.manga, - screenModel.source + screenModel.source, ) } else { openMergedMangaWebview( context, navigator, - successState.mergedData + successState.mergedData, ) } }.takeIf { isHttpSource }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt index f1d320460..27c7a3291 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt @@ -15,8 +15,8 @@ import eu.kanade.domain.chapter.interactor.GetAvailableScanlators import eu.kanade.domain.chapter.interactor.SetReadStatus import eu.kanade.domain.chapter.interactor.SyncChaptersWithSource import eu.kanade.domain.manga.interactor.GetExcludedScanlators -import eu.kanade.domain.manga.interactor.SetExcludedScanlators import eu.kanade.domain.manga.interactor.GetPagePreviews +import eu.kanade.domain.manga.interactor.SetExcludedScanlators import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.model.PagePreview import eu.kanade.domain.manga.model.chaptersFiltered @@ -52,7 +52,6 @@ import exh.debug.DebugToggles import exh.eh.EHentaiUpdateHelper import exh.log.xLogD import exh.md.utils.FollowStatus -import exh.md.utils.MdUtil import exh.metadata.metadata.RaisedSearchMetadata import exh.metadata.metadata.base.FlatMetadata import exh.source.MERGED_SOURCE_ID 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 92709582f..0713c21ca 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 @@ -818,7 +818,7 @@ class ReaderActivity : BaseActivity() { } val defaultReaderType = manga.defaultReaderType( - manga.mangaType(sourceName = sourceManager.get(manga.source)?.name) + manga.mangaType(sourceName = sourceManager.get(manga.source)?.name), ) if ( readerPreferences.useAutoWebtoon().get() && diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index e94ff80ce..e64e23be9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -48,7 +48,6 @@ import eu.kanade.tachiyomi.util.lang.takeBytes import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.storage.DiskUtil.MAX_FILE_NAME_BYTES import eu.kanade.tachiyomi.util.storage.cacheImageDir -import exh.md.utils.MdUtil import exh.metadata.metadata.RaisedSearchMetadata import exh.source.MERGED_SOURCE_ID import exh.source.getMainSource