From fe82cdb9c85274e0c9b904ec6b37fac97d01ea37 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 24 Jun 2023 12:51:10 -0400 Subject: [PATCH] Migrate ReaderColorFilterSettings to Compose It'll eventually be a tab with the other settings again once the other tabs are also migrated over so it's just a single Compose sheet. --- .../library/LibrarySettingsDialog.kt | 1 - .../more/settings/PreferenceItem.kt | 18 ++ .../more/settings/PreferenceModel.kt | 15 + .../settings/widget/BasePreferenceWidget.kt | 4 +- .../tachiyomi/ui/reader/ReaderActivity.kt | 26 +- .../tachiyomi/ui/reader/ReaderViewModel.kt | 7 +- .../reader/setting/ReaderColorFilterDialog.kt | 164 +++++++++++ .../setting/ReaderColorFilterSettings.kt | 202 ------------- .../ui/reader/setting/ReaderSettingsSheet.kt | 45 --- .../listener/SimpleTabSelectedListener.kt | 14 - app/src/main/res/layout/reader_activity.xml | 15 +- .../layout/reader_color_filter_settings.xml | 269 ------------------ app/src/main/res/values-v28/arrays.xml | 15 - app/src/main/res/values/arrays.xml | 6 - .../core/components/SettingsItems.kt | 2 +- 15 files changed, 241 insertions(+), 562 deletions(-) create mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterDialog.kt delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/widget/listener/SimpleTabSelectedListener.kt delete mode 100644 app/src/main/res/layout/reader_color_filter_settings.xml delete mode 100644 app/src/main/res/values-v28/arrays.xml 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 ce1adbe75a..8e2531544f 100644 --- a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt @@ -199,7 +199,6 @@ private fun ColumnScope.DisplayPage( val columns by columnPreference.collectAsState() SliderItem( label = stringResource(R.string.pref_library_columns), - min = 0, max = 10, value = columns, valueText = if (columns > 0) { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt index f9d76535ee..0625cc3e7a 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt @@ -11,6 +11,7 @@ import androidx.compose.runtime.compositionLocalOf import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.structuralEqualityPolicy +import androidx.compose.ui.unit.dp import eu.kanade.domain.track.service.TrackPreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.more.settings.widget.AppThemePreferenceWidget @@ -24,10 +25,12 @@ import eu.kanade.presentation.more.settings.widget.TrackingPreferenceWidget import eu.kanade.presentation.util.collectAsState import kotlinx.coroutines.launch import tachiyomi.core.preference.PreferenceStore +import tachiyomi.presentation.core.components.SliderItem import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get val LocalPreferenceHighlighted = compositionLocalOf(structuralEqualityPolicy()) { false } +val LocalPreferenceMinHeight = compositionLocalOf(structuralEqualityPolicy()) { 56.dp } @Composable fun StatusWrapper( @@ -77,6 +80,21 @@ internal fun PreferenceItem( }, ) } + is Preference.PreferenceItem.SliderPreference -> { + // TODO: use different composable? + SliderItem( + label = item.title, + min = item.min, + max = item.max, + value = item.value, + valueText = item.value.toString(), + onChange = { + scope.launch { + item.onValueChanged(it) + } + }, + ) + } is Preference.PreferenceItem.ListPreference<*> -> { val value by item.pref.collectAsState() ListPreferenceWidget( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceModel.kt b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceModel.kt index b5672f37cf..2ba3eb9a01 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceModel.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceModel.kt @@ -5,6 +5,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import eu.kanade.domain.ui.model.AppTheme +import eu.kanade.presentation.more.settings.Preference.PreferenceItem import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.TrackService import tachiyomi.core.preference.Preference as PreferenceData @@ -43,6 +44,20 @@ sealed class Preference { override val onValueChanged: suspend (newValue: Boolean) -> Boolean = { true }, ) : PreferenceItem() + /** + * A [PreferenceItem] that provides a slider to select an integer number. + */ + data class SliderPreference( + val value: Int, + val min: Int = 0, + val max: Int, + override val title: String = "", + override val subtitle: String? = null, + override val icon: ImageVector? = null, + override val enabled: Boolean = true, + override val onValueChanged: suspend (newValue: Int) -> Boolean = { true }, + ) : PreferenceItem() + /** * A [PreferenceItem] that displays a list of entries as a dialog. */ diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt index aeb4f85702..4af36dc033 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import eu.kanade.presentation.more.settings.LocalPreferenceHighlighted +import eu.kanade.presentation.more.settings.LocalPreferenceMinHeight import kotlinx.coroutines.delay import kotlin.time.Duration.Companion.seconds @@ -44,10 +45,11 @@ internal fun BasePreferenceWidget( widget: @Composable (() -> Unit)? = null, ) { val highlighted = LocalPreferenceHighlighted.current + val minHeight = LocalPreferenceMinHeight.current Row( modifier = modifier .highlightBackground(highlighted) - .sizeIn(minHeight = 56.dp) + .sizeIn(minHeight = minHeight) .clickable(enabled = onClick != null, onClick = { onClick?.invoke() }) .fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, 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 3e9fc10d75..e476f07b1f 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 @@ -58,6 +58,7 @@ import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter import eu.kanade.tachiyomi.ui.reader.model.ReaderPage import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters import eu.kanade.tachiyomi.ui.reader.setting.OrientationType +import eu.kanade.tachiyomi.ui.reader.setting.ReaderColorFilterDialog import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsSheet import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType @@ -409,10 +410,20 @@ class ReaderActivity : BaseActivity() { binding.dialogRoot.setComposeContent { val state by viewModel.state.collectAsState() - + val onDismissRequest = viewModel::closeDialog when (state.dialog) { + is ReaderViewModel.Dialog.ColorFilter -> { + setMenuVisibility(false) + ReaderColorFilterDialog( + onDismissRequest = { + onDismissRequest() + setMenuVisibility(true) + }, + readerPreferences = viewModel.readerPreferences, + ) + } is ReaderViewModel.Dialog.Page -> ReaderPageDialog( - onDismissRequest = viewModel::closeDialog, + onDismissRequest = onDismissRequest, onSetAsCover = viewModel::setAsCover, onShare = viewModel::shareImage, onSave = viewModel::saveImage, @@ -548,11 +559,14 @@ class ReaderActivity : BaseActivity() { if (readerSettingSheet?.isShowing == true) return@setOnClickListener readerSettingSheet = ReaderSettingsSheet(this@ReaderActivity).apply { show() } } + } - setOnLongClickListener { - if (readerSettingSheet?.isShowing == true) return@setOnLongClickListener false - readerSettingSheet = ReaderSettingsSheet(this@ReaderActivity, showColorFilterSettings = true).apply { show() } - true + // Color filter sheet + with(binding.actionColorSettings) { + setTooltip(R.string.custom_filter) + + setOnClickListener { + viewModel.openColorFilterDialog() } } } 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 cbe527e472..1aa7068119 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 @@ -92,9 +92,9 @@ class ReaderViewModel( private val downloadProvider: DownloadProvider = Injekt.get(), private val imageSaver: ImageSaver = Injekt.get(), preferences: BasePreferences = Injekt.get(), + val readerPreferences: ReaderPreferences = Injekt.get(), private val basePreferences: BasePreferences = Injekt.get(), private val downloadPreferences: DownloadPreferences = Injekt.get(), - private val readerPreferences: ReaderPreferences = Injekt.get(), private val trackPreferences: TrackPreferences = Injekt.get(), private val delayedTrackingStore: DelayedTrackingStore = Injekt.get(), private val getManga: GetManga = Injekt.get(), @@ -723,6 +723,10 @@ class ReaderViewModel( mutableState.update { it.copy(dialog = Dialog.Page(page)) } } + fun openColorFilterDialog() { + mutableState.update { it.copy(dialog = Dialog.ColorFilter) } + } + fun closeDialog() { mutableState.update { it.copy(dialog = null) } } @@ -925,6 +929,7 @@ class ReaderViewModel( } sealed class Dialog { + object ColorFilter : Dialog() data class Page(val page: ReaderPage) : Dialog() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterDialog.kt new file mode 100644 index 0000000000..db7a901d48 --- /dev/null +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterDialog.kt @@ -0,0 +1,164 @@ +package eu.kanade.tachiyomi.ui.reader.setting + +import android.os.Build +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.DialogWindowProvider +import androidx.core.graphics.alpha +import androidx.core.graphics.blue +import androidx.core.graphics.green +import androidx.core.graphics.red +import eu.kanade.presentation.components.AdaptiveSheet +import eu.kanade.presentation.more.settings.LocalPreferenceMinHeight +import eu.kanade.presentation.more.settings.Preference +import eu.kanade.presentation.more.settings.PreferenceScreen +import eu.kanade.presentation.util.collectAsState +import eu.kanade.tachiyomi.R +import tachiyomi.core.preference.getAndSet + +@Composable +fun ReaderColorFilterDialog( + onDismissRequest: () -> Unit, + readerPreferences: ReaderPreferences, +) { + val colorFilterModes = buildList { + addAll( + listOf( + R.string.label_default, + R.string.filter_mode_multiply, + R.string.filter_mode_screen, + ), + ) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + addAll( + listOf( + R.string.filter_mode_overlay, + R.string.filter_mode_lighten, + R.string.filter_mode_darken, + ), + ) + } + }.map { stringResource(it) } + + val customBrightness by readerPreferences.customBrightness().collectAsState() + val customBrightnessValue by readerPreferences.customBrightnessValue().collectAsState() + val colorFilter by readerPreferences.colorFilter().collectAsState() + val colorFilterValue by readerPreferences.colorFilterValue().collectAsState() + val colorFilterMode by readerPreferences.colorFilterMode().collectAsState() + + AdaptiveSheet( + onDismissRequest = onDismissRequest, + ) { + (LocalView.current.parent as? DialogWindowProvider)?.window?.setDimAmount(0f) + + CompositionLocalProvider( + LocalPreferenceMinHeight provides 48.dp, + ) { + PreferenceScreen( + items = listOfNotNull( + Preference.PreferenceItem.SwitchPreference( + pref = readerPreferences.customBrightness(), + title = stringResource(R.string.pref_custom_brightness), + ), + /** + * Sets the brightness of the screen. Range is [-75, 100]. + * From -75 to -1 a semi-transparent black view is shown at the top with the minimum brightness. + * From 1 to 100 it sets that value as brightness. + * 0 sets system brightness and hides the overlay. + */ + Preference.PreferenceItem.SliderPreference( + value = customBrightnessValue, + title = stringResource(R.string.pref_custom_brightness), + min = -75, + max = 100, + onValueChanged = { + readerPreferences.customBrightnessValue().set(it) + true + }, + ).takeIf { customBrightness }, + + Preference.PreferenceItem.SwitchPreference( + pref = readerPreferences.colorFilter(), + title = stringResource(R.string.pref_custom_color_filter), + ), + Preference.PreferenceItem.SliderPreference( + value = colorFilterValue.red, + title = stringResource(R.string.color_filter_r_value), + max = 255, + onValueChanged = { newRValue -> + readerPreferences.colorFilterValue().getAndSet { + getColorValue(it, newRValue, RED_MASK, 16) + } + true + }, + ).takeIf { colorFilter }, + Preference.PreferenceItem.SliderPreference( + value = colorFilterValue.green, + title = stringResource(R.string.color_filter_g_value), + max = 255, + onValueChanged = { newRValue -> + readerPreferences.colorFilterValue().getAndSet { + getColorValue(it, newRValue, GREEN_MASK, 8) + } + true + }, + ).takeIf { colorFilter }, + Preference.PreferenceItem.SliderPreference( + value = colorFilterValue.blue, + title = stringResource(R.string.color_filter_b_value), + max = 255, + onValueChanged = { newRValue -> + readerPreferences.colorFilterValue().getAndSet { + getColorValue(it, newRValue, BLUE_MASK, 0) + } + true + }, + ).takeIf { colorFilter }, + Preference.PreferenceItem.SliderPreference( + value = colorFilterValue.alpha, + title = stringResource(R.string.color_filter_a_value), + max = 255, + onValueChanged = { newRValue -> + readerPreferences.colorFilterValue().getAndSet { + getColorValue(it, newRValue, ALPHA_MASK, 24) + } + true + }, + ).takeIf { colorFilter }, + Preference.PreferenceItem.BasicListPreference( + value = colorFilterMode.toString(), + title = stringResource(R.string.pref_color_filter_mode), + entries = colorFilterModes + .mapIndexed { index, mode -> index.toString() to mode } + .toMap(), + onValueChanged = { newValue -> + readerPreferences.colorFilterMode().set(newValue.toInt()) + true + }, + ).takeIf { colorFilter }, + + Preference.PreferenceItem.SwitchPreference( + pref = readerPreferences.grayscale(), + title = stringResource(R.string.pref_grayscale), + ), + Preference.PreferenceItem.SwitchPreference( + pref = readerPreferences.invertedColors(), + title = stringResource(R.string.pref_inverted_colors), + ), + ), + ) + } + } +} + +private fun getColorValue(currentColor: Int, color: Int, mask: Long, bitShift: Int): Int { + return (color shl bitShift) or (currentColor and mask.inv().toInt()) +} +private const val ALPHA_MASK: Long = 0xFF000000 +private const val RED_MASK: Long = 0x00FF0000 +private const val GREEN_MASK: Long = 0x0000FF00 +private const val BLUE_MASK: Long = 0x000000FF diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt deleted file mode 100644 index 7f76dbb764..0000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt +++ /dev/null @@ -1,202 +0,0 @@ -package eu.kanade.tachiyomi.ui.reader.setting - -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import androidx.annotation.ColorInt -import androidx.core.graphics.alpha -import androidx.core.graphics.blue -import androidx.core.graphics.green -import androidx.core.graphics.red -import androidx.core.widget.NestedScrollView -import androidx.lifecycle.lifecycleScope -import eu.kanade.tachiyomi.databinding.ReaderColorFilterSettingsBinding -import eu.kanade.tachiyomi.ui.reader.ReaderActivity -import eu.kanade.tachiyomi.util.preference.bindToPreference -import kotlinx.coroutines.flow.launchIn -import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.flow.sample -import tachiyomi.core.preference.getAndSet -import uy.kohesive.injekt.injectLazy - -/** - * Color filter sheet to toggle custom filter and brightness overlay. - */ -class ReaderColorFilterSettings @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : - NestedScrollView(context, attrs) { - - private val readerPreferences: ReaderPreferences by injectLazy() - - private val binding = ReaderColorFilterSettingsBinding.inflate(LayoutInflater.from(context), this, false) - - init { - addView(binding.root) - - readerPreferences.colorFilter().changes() - .onEach(::setColorFilter) - .launchIn((context as ReaderActivity).lifecycleScope) - - readerPreferences.colorFilterMode().changes() - .onEach { setColorFilter(readerPreferences.colorFilter().get()) } - .launchIn(context.lifecycleScope) - - readerPreferences.customBrightness().changes() - .onEach(::setCustomBrightness) - .launchIn(context.lifecycleScope) - - // Get color and update values - val color = readerPreferences.colorFilterValue().get() - val brightness = readerPreferences.customBrightnessValue().get() - - val argb = setValues(color) - - // Set brightness value - binding.txtBrightnessSeekbarValue.text = brightness.toString() - binding.sliderBrightness.value = brightness.toFloat() - - // Initialize seekBar progress - binding.sliderColorFilterAlpha.value = argb[0].toFloat() - binding.sliderColorFilterRed.value = argb[1].toFloat() - binding.sliderColorFilterGreen.value = argb[2].toFloat() - binding.sliderColorFilterBlue.value = argb[3].toFloat() - - // Set listeners - binding.switchColorFilter.bindToPreference(readerPreferences.colorFilter()) - binding.customBrightness.bindToPreference(readerPreferences.customBrightness()) - binding.colorFilterMode.bindToPreference(readerPreferences.colorFilterMode()) - binding.grayscale.bindToPreference(readerPreferences.grayscale()) - binding.invertedColors.bindToPreference(readerPreferences.invertedColors()) - - binding.sliderColorFilterAlpha.addOnChangeListener { _, value, fromUser -> - if (fromUser) { - setColorValue(value.toInt(), ALPHA_MASK, 24) - } - } - binding.sliderColorFilterRed.addOnChangeListener { _, value, fromUser -> - if (fromUser) { - setColorValue(value.toInt(), RED_MASK, 16) - } - } - binding.sliderColorFilterGreen.addOnChangeListener { _, value, fromUser -> - if (fromUser) { - setColorValue(value.toInt(), GREEN_MASK, 8) - } - } - binding.sliderColorFilterBlue.addOnChangeListener { _, value, fromUser -> - if (fromUser) { - setColorValue(value.toInt(), BLUE_MASK, 0) - } - } - - binding.sliderBrightness.addOnChangeListener { _, value, fromUser -> - if (fromUser) { - readerPreferences.customBrightnessValue().set(value.toInt()) - } - } - } - - /** - * Set enabled status of seekBars belonging to color filter - * @param enabled determines if seekBar gets enabled - */ - private fun setColorFilterSeekBar(enabled: Boolean) { - binding.sliderColorFilterRed.isEnabled = enabled - binding.sliderColorFilterGreen.isEnabled = enabled - binding.sliderColorFilterBlue.isEnabled = enabled - binding.sliderColorFilterAlpha.isEnabled = enabled - } - - /** - * Set enabled status of seekBars belonging to custom brightness - * @param enabled value which determines if seekBar gets enabled - */ - private fun setCustomBrightnessSeekBar(enabled: Boolean) { - binding.sliderBrightness.isEnabled = enabled - } - - /** - * Set the text value's of color filter - * @param color integer containing color information - */ - private fun setValues(color: Int): Array { - val alpha = color.alpha - val red = color.red - val green = color.green - val blue = color.blue - - // Initialize values - binding.txtColorFilterAlphaValue.text = "$alpha" - binding.txtColorFilterRedValue.text = "$red" - binding.txtColorFilterGreenValue.text = "$green" - binding.txtColorFilterBlueValue.text = "$blue" - - return arrayOf(alpha, red, green, blue) - } - - /** - * Manages the custom brightness value subscription - * @param enabled determines if the subscription get (un)subscribed - */ - private fun setCustomBrightness(enabled: Boolean) { - if (enabled) { - readerPreferences.customBrightnessValue().changes() - .sample(100) - .onEach(::setCustomBrightnessValue) - .launchIn((context as ReaderActivity).lifecycleScope) - } else { - setCustomBrightnessValue(0, true) - } - setCustomBrightnessSeekBar(enabled) - } - - /** - * Sets the brightness of the screen. Range is [-75, 100]. - * From -75 to -1 a semi-transparent black view is shown at the top with the minimum brightness. - * From 1 to 100 it sets that value as brightness. - * 0 sets system brightness and hides the overlay. - */ - private fun setCustomBrightnessValue(value: Int, isDisabled: Boolean = false) { - if (!isDisabled) { - binding.txtBrightnessSeekbarValue.text = value.toString() - } - } - - /** - * Manages the color filter value subscription - * @param enabled determines if the subscription get (un)subscribed - */ - private fun setColorFilter(enabled: Boolean) { - if (enabled) { - readerPreferences.colorFilterValue().changes() - .sample(100) - .onEach(::setColorFilterValue) - .launchIn((context as ReaderActivity).lifecycleScope) - } - setColorFilterSeekBar(enabled) - } - - /** - * Sets the color filter overlay of the screen. Determined by HEX of integer - * @param color hex of color. - */ - private fun setColorFilterValue(@ColorInt color: Int) { - setValues(color) - } - - /** - * Updates the color value in preference - * @param color value of color range [0,255] - * @param mask contains hex mask of chosen color - * @param bitShift amounts of bits that gets shifted to receive value - */ - private fun setColorValue(color: Int, mask: Long, bitShift: Int) { - readerPreferences.colorFilterValue().getAndSet { currentColor -> - (color shl bitShift) or (currentColor and mask.inv().toInt()) - } - } -} - -private const val ALPHA_MASK: Long = 0xFF000000 -private const val RED_MASK: Long = 0x00FF0000 -private const val GREEN_MASK: Long = 0x0000FF00 -private const val BLUE_MASK: Long = 0x000000FF diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt index 0f684736a8..ff432320f8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt @@ -1,46 +1,30 @@ package eu.kanade.tachiyomi.ui.reader.setting -import android.animation.ValueAnimator import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.google.android.material.tabs.TabLayout import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.CommonTabbedSheetBinding import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.widget.ViewPagerAdapter -import eu.kanade.tachiyomi.widget.listener.SimpleTabSelectedListener import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog class ReaderSettingsSheet( private val activity: ReaderActivity, - private val showColorFilterSettings: Boolean = false, ) : BaseBottomSheetDialog(activity) { private val tabs = listOf( ReaderReadingModeSettings(activity) to R.string.pref_category_reading_mode, ReaderGeneralSettings(activity) to R.string.pref_category_general, - ReaderColorFilterSettings(activity) to R.string.custom_filter, ) - private val backgroundDimAnimator by lazy { - val sheetBackgroundDim = window?.attributes?.dimAmount ?: 0.25f - ValueAnimator.ofFloat(sheetBackgroundDim, 0f).also { valueAnimator -> - valueAnimator.duration = 250 - valueAnimator.addUpdateListener { - window?.setDimAmount(it.animatedValue as Float) - } - } - } - private lateinit var binding: CommonTabbedSheetBinding override fun createView(inflater: LayoutInflater): View { binding = CommonTabbedSheetBinding.inflate(activity.layoutInflater) val adapter = Adapter() - binding.pager.offscreenPageLimit = 2 binding.pager.adapter = adapter binding.tabs.setupWithViewPager(binding.pager) @@ -52,35 +36,6 @@ class ReaderSettingsSheet( behavior.isFitToContents = false behavior.halfExpandedRatio = 0.25f - - val filterTabIndex = tabs.indexOfFirst { it.first is ReaderColorFilterSettings } - binding.tabs.addOnTabSelectedListener( - object : SimpleTabSelectedListener() { - override fun onTabSelected(tab: TabLayout.Tab?) { - val isFilterTab = tab?.position == filterTabIndex - - // Remove dimmed backdrop so color filter changes can be previewed - backgroundDimAnimator.run { - if (isFilterTab) { - if (animatedFraction < 1f) { - start() - } - } else if (animatedFraction > 0f) { - reverse() - } - } - - // Hide toolbars - if (activity.menuVisible != !isFilterTab) { - activity.setMenuVisibility(!isFilterTab) - } - } - }, - ) - - if (showColorFilterSettings) { - binding.tabs.getTabAt(filterTabIndex)?.select() - } } private inner class Adapter : ViewPagerAdapter() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/listener/SimpleTabSelectedListener.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/listener/SimpleTabSelectedListener.kt deleted file mode 100644 index 68a226466a..0000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/listener/SimpleTabSelectedListener.kt +++ /dev/null @@ -1,14 +0,0 @@ -package eu.kanade.tachiyomi.widget.listener - -import com.google.android.material.tabs.TabLayout - -open class SimpleTabSelectedListener : TabLayout.OnTabSelectedListener { - override fun onTabSelected(tab: TabLayout.Tab?) { - } - - override fun onTabUnselected(tab: TabLayout.Tab?) { - } - - override fun onTabReselected(tab: TabLayout.Tab?) { - } -} diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml index 1ddf49c3dc..9c83588b5e 100644 --- a/app/src/main/res/layout/reader_activity.xml +++ b/app/src/main/res/layout/reader_activity.xml @@ -119,12 +119,25 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_settings" android:padding="@dimen/screen_edge_margin" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/action_color_settings" app:layout_constraintStart_toEndOf="@id/action_rotation" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_settings_24dp" app:tint="?attr/colorOnSurface" /> + + diff --git a/app/src/main/res/layout/reader_color_filter_settings.xml b/app/src/main/res/layout/reader_color_filter_settings.xml deleted file mode 100644 index f851e8cadf..0000000000 --- a/app/src/main/res/layout/reader_color_filter_settings.xml +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values-v28/arrays.xml b/app/src/main/res/values-v28/arrays.xml deleted file mode 100644 index 9718e45110..0000000000 --- a/app/src/main/res/values-v28/arrays.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - @string/label_default - @string/filter_mode_multiply - @string/filter_mode_screen - - - @string/filter_mode_overlay - @string/filter_mode_lighten - @string/filter_mode_darken - - - diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index d6d9f81351..941c8d8725 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -67,12 +67,6 @@ @string/rotation_reverse_portrait - - @string/label_default - @string/filter_mode_multiply - @string/filter_mode_screen - - @string/tapping_inverted_none @string/tapping_inverted_horizontal diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt index bc8a50fe41..fae6c83829 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt @@ -140,7 +140,7 @@ fun RadioItem( @Composable fun SliderItem( label: String, - min: Int, + min: Int = 0, max: Int, value: Int, valueText: String,