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

Some linting

Browse Source
This commit is contained in:
Jobobby04 2023-12-23 18:23:58 -05:00
parent 9ab01ec20c
commit 19746904e1
31 changed files with 137 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
View File

@ -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 <--

7
app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt
View File

@ -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
}

3
app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt
View File

@ -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) },
) {

7
app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt
View File

@ -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 {

6
app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
View File

@ -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) {

3
app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt
View File

@ -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,
)
}

3
app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt
View File

@ -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,

3
app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt
View File

@ -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,

3
app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt
View File

@ -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,
)

3
app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt
View File

@ -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,
)
}

20
app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
View File

@ -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 },
)
},
) {

6
app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesListItem.kt
View File

@ -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 = "")

6
app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagListItem.kt
View File

@ -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 = "")

6
app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoListItem.kt
View File

@ -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 = "")

6
app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryListItem.kt
View File

@ -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 = "")

6
app/src/main/java/eu/kanade/presentation/components/AppBar.kt
View File

@ -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),

3
app/src/main/java/eu/kanade/presentation/components/AroundLayout.kt
View File

@ -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

6
app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
View File

@ -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)

5
app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesWarningDialog.kt
View File

@ -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,

6
app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt
View File

@ -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(

7
app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt
View File

@ -45,9 +45,12 @@ fun PagePreviews(
) {
when (pagePreviewState) {
PagePreviewState.Loading -> {
Box(modifier = Modifier
Box(
modifier = Modifier
.height(60.dp)
.fillMaxWidth(), contentAlignment = Alignment.Center) {
.fillMaxWidth(),
contentAlignment = Alignment.Center,
) {
CircularProgressIndicator()
}
}

7
app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt
View File

@ -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()
)
)
},
)
}

23
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
View File

@ -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()) },
),

7
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
View File

@ -55,7 +55,9 @@ object SettingsLibraryScreen : SearchableSettings {
override fun getPreferences(): List<Preference> {
val getCategories = remember { Injekt.get<GetCategories>() }
val libraryPreferences = remember { Injekt.get<LibraryPreferences>() }
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<UnsortedPreferences>() }
// 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),
),
),

3
app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt
View File

@ -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,

1
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateFlags.kt
View File

@ -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

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
View File

@ -159,13 +159,13 @@ class MangaScreen(
openMangaInWebView(
navigator,
screenModel.manga,
screenModel.source
screenModel.source,
)
} else {
openMergedMangaWebview(
context,
navigator,
successState.mergedData
successState.mergedData,
)
}
}.takeIf { isHttpSource },

3
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
View File

@ -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

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -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() &&

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

@ -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