diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt index 3510318dc..e4f97f1f5 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt @@ -58,6 +58,7 @@ import org.koitharu.kotatsu.utils.ext.isReportable import org.koitharu.kotatsu.utils.ext.observeWithPrevious import org.koitharu.kotatsu.utils.ext.postDelayed import org.koitharu.kotatsu.utils.ext.report +import org.koitharu.kotatsu.utils.ext.setValueRounded import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -388,7 +389,7 @@ class ReaderActivity : } if (uiState.isSliderAvailable()) { binding.slider.valueTo = uiState.totalPages.toFloat() - 1 - binding.slider.value = uiState.currentPage.toFloat() + binding.slider.setValueRounded(uiState.currentPage.toFloat()) binding.slider.isVisible = true } else { binding.slider.isVisible = false diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt index 437e9b230..ee94a4f87 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigActivity.kt @@ -103,8 +103,8 @@ class ColorFilterConfigActivity : } private fun onColorFilterChanged(readerColorFilter: ReaderColorFilter?) { - binding.sliderBrightness.value = readerColorFilter?.brightness ?: 0f - binding.sliderContrast.value = readerColorFilter?.contrast ?: 0f + binding.sliderBrightness.setValueRounded(readerColorFilter?.brightness ?: 0f) + binding.sliderContrast.setValueRounded(readerColorFilter?.contrast ?: 0f) binding.imageViewAfter.colorFilter = readerColorFilter?.toColorFilter() } diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/config/ReaderConfigBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/config/ReaderConfigBottomSheet.kt index 0eb155935..51b33d0b3 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/config/ReaderConfigBottomSheet.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/config/ReaderConfigBottomSheet.kt @@ -23,6 +23,7 @@ import org.koitharu.kotatsu.reader.ui.ReaderViewModel import org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity import org.koitharu.kotatsu.settings.SettingsActivity import org.koitharu.kotatsu.utils.ScreenOrientationHelper +import org.koitharu.kotatsu.utils.ext.setValueRounded import org.koitharu.kotatsu.utils.ext.viewLifecycleScope import org.koitharu.kotatsu.utils.ext.withArgs @@ -65,7 +66,7 @@ class ReaderConfigBottomSheet : binding.sliderTimer.setLabelFormatter(PageSwitchTimer.DelayLabelFormatter(view.resources)) findCallback()?.run { - binding.sliderTimer.value = pageSwitchDelay + binding.sliderTimer.setValueRounded(pageSwitchDelay) } } @@ -75,13 +76,16 @@ class ReaderConfigBottomSheet : startActivity(SettingsActivity.newReaderSettingsIntent(v.context)) dismissAllowingStateLoss() } + R.id.button_save_page -> { val page = viewModel.getCurrentPage() ?: return viewModel.saveCurrentPage(page, savePageRequest) } + R.id.button_screen_rotate -> { orientationHelper?.toggleOrientation() } + R.id.button_color_filter -> { val page = viewModel.getCurrentPage() ?: return val manga = viewModel.manga ?: return diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/size/ShelfSizeBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/size/ShelfSizeBottomSheet.kt index dd84a891b..9677f8d4e 100644 --- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/size/ShelfSizeBottomSheet.kt +++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/size/ShelfSizeBottomSheet.kt @@ -8,13 +8,13 @@ import androidx.fragment.app.FragmentManager import com.google.android.material.slider.LabelFormatter import com.google.android.material.slider.Slider import dagger.hilt.android.AndroidEntryPoint -import javax.inject.Inject import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.BaseBottomSheet import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.databinding.SheetShelfSizeBinding import org.koitharu.kotatsu.utils.ext.setValueRounded import org.koitharu.kotatsu.utils.progress.IntPercentLabelFormatter +import javax.inject.Inject @AndroidEntryPoint class ShelfSizeBottomSheet : @@ -51,9 +51,10 @@ class ShelfSizeBottomSheet : } override fun onClick(v: View) { + val slider = binding.sliderGrid when (v.id) { - R.id.button_small -> binding.sliderGrid.value -= binding.sliderGrid.stepSize - R.id.button_large -> binding.sliderGrid.value += binding.sliderGrid.stepSize + R.id.button_small -> slider.setValueRounded(slider.value - slider.stepSize) + R.id.button_large -> slider.setValueRounded(slider.value + slider.stepSize) } }