From 70b83e106172974063cd556a471863e692f84d0f Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 5 Mar 2023 15:05:54 -0500 Subject: [PATCH] Minor cleanup --- .../components/MangaBottomActionMenu.kt | 38 +++++++++---------- .../settings/screen/SettingsBrowseScreen.kt | 2 - core/src/main/java/exh/log/EHLogLevel.kt | 2 +- .../exh/metadata/sql/models/SearchMetadata.kt | 7 +--- 4 files changed, 19 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt b/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt index beb3be4b4..3f4ab359b 100644 --- a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt +++ b/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt @@ -260,7 +260,7 @@ fun LibraryBottomActionMenu( // SY --> val showOverflow = onClickCleanTitles != null || onClickAddToMangaDex != null val configuration = LocalConfiguration.current - val moveMarkPrev = onDeleteClicked != null && remember { !configuration.isTabletUi() } + val moveMarkPrev = remember { !configuration.isTabletUi() } var overFlowOpen by remember { mutableStateOf(false) } // SY <-- Row( @@ -304,17 +304,15 @@ fun LibraryBottomActionMenu( onClick = onDeleteClicked, ) // SY --> - if (onMarkAsReadClicked != null) { - Button( - title = stringResource(R.string.action_mark_as_read), - icon = Icons.Outlined.DoneAll, - toConfirm = confirm[1], - onLongClick = { onLongClickItem(1) }, - onClick = onMarkAsReadClicked, - ) - } + Button( + title = stringResource(R.string.action_mark_as_read), + icon = Icons.Outlined.DoneAll, + toConfirm = confirm[1], + onLongClick = { onLongClickItem(1) }, + onClick = onMarkAsReadClicked, + ) if (showOverflow) { - if (!moveMarkPrev && onMarkAsUnreadClicked != null) { + if (!moveMarkPrev) { Button( title = stringResource(R.string.action_mark_as_unread), icon = Icons.Outlined.RemoveDone, @@ -334,7 +332,7 @@ fun LibraryBottomActionMenu( expanded = overFlowOpen, onDismissRequest = { overFlowOpen = false }, ) { - if (onMarkAsUnreadClicked != null && moveMarkPrev) { + if (moveMarkPrev) { DropdownMenuItem( text = { Text(stringResource(R.string.action_mark_as_unread)) }, onClick = onMarkAsUnreadClicked, @@ -360,15 +358,13 @@ fun LibraryBottomActionMenu( } } } else { - if (onMarkAsUnreadClicked != null) { - Button( - title = stringResource(R.string.action_mark_as_unread), - icon = Icons.Outlined.RemoveDone, - toConfirm = confirm[2], - onLongClick = { onLongClickItem(2) }, - onClick = onMarkAsUnreadClicked, - ) - } + Button( + title = stringResource(R.string.action_mark_as_unread), + icon = Icons.Outlined.RemoveDone, + toConfirm = confirm[2], + onLongClick = { onLongClickItem(2) }, + onClick = onMarkAsUnreadClicked, + ) if (onClickMigrate != null) { Button( title = stringResource(R.string.migrate), diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt index 0e915f11e..4cb649d08 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt @@ -12,7 +12,6 @@ import androidx.fragment.app.FragmentActivity import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.domain.UnsortedPreferences -import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.more.settings.Preference @@ -35,7 +34,6 @@ object SettingsBrowseScreen : SearchableSettings { override fun getPreferences(): List { val context = LocalContext.current val sourcePreferences = remember { Injekt.get() } - val preferences = remember { Injekt.get() } // SY --> val uiPreferences = remember { Injekt.get() } val unsortedPreferences = remember { Injekt.get() } diff --git a/core/src/main/java/exh/log/EHLogLevel.kt b/core/src/main/java/exh/log/EHLogLevel.kt index 3f591b838..bb593f6f1 100644 --- a/core/src/main/java/exh/log/EHLogLevel.kt +++ b/core/src/main/java/exh/log/EHLogLevel.kt @@ -18,7 +18,7 @@ enum class EHLogLevel(@StringRes val nameRes: Int, @StringRes val description: I fun init(context: Context) { curLogLevel = PreferenceManager.getDefaultSharedPreferences(context) - .getInt("eh_log_level", 0) // todo + .getInt("eh_log_level", MINIMAL.ordinal) // todo } fun shouldLog(requiredLogLevel: EHLogLevel): Boolean { diff --git a/source-api/src/main/java/exh/metadata/sql/models/SearchMetadata.kt b/source-api/src/main/java/exh/metadata/sql/models/SearchMetadata.kt index 63a64b5c5..90df5c5fb 100644 --- a/source-api/src/main/java/exh/metadata/sql/models/SearchMetadata.kt +++ b/source-api/src/main/java/exh/metadata/sql/models/SearchMetadata.kt @@ -1,6 +1,5 @@ package exh.metadata.sql.models -import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable @Serializable @@ -19,8 +18,4 @@ data class SearchMetadata( // The version of this metadata's extra. Used to track changes to the 'extra' field's schema val extraVersion: Int, -) { - // Transient information attached to this piece of metadata, useful for caching - - var transientCache: Map? = null -} +)