From e24f4b2a71d50fce844cfa30e731f2977fa83e75 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Sat, 7 Sep 2024 14:14:42 +0600 Subject: [PATCH] Reduce ChapterNavigator horizontal padding on small ui (mihonapp/mihon#1202) Co-authored-by: p (cherry picked from commit 6f422745ba6db135514ac4959216923932565760) --- .../reader/components/ChapterNavigator.kt | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt b/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt index 24890d080..a4497db46 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt @@ -25,7 +25,9 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -36,9 +38,11 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.layout.layout import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.platform.LocalLayoutDirection +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp +import eu.kanade.presentation.theme.TachiyomiPreviewTheme import eu.kanade.presentation.util.isTabletUi import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -75,7 +79,7 @@ fun ChapterNavigator( } // SY <-- val isTabletUi = isTabletUi() - val horizontalPadding = if (isTabletUi) 24.dp else 16.dp + val horizontalPadding = if (isTabletUi) 24.dp else 8.dp val layoutDirection = if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr val haptic = LocalHapticFeedback.current @@ -194,7 +198,7 @@ fun ChapterNavigatorVert( onSliderValueChange: (Int) -> Unit, ) { val isTabletUi = isTabletUi() - val verticalPadding = if (isTabletUi) 24.dp else 16.dp + val verticalPadding = if (isTabletUi) 24.dp else 8.dp val haptic = LocalHapticFeedback.current @@ -297,3 +301,23 @@ fun ChapterNavigatorVert( } } } + +@Preview +@Composable +private fun ChapterNavigatorPreview() { + var currentPage by remember { mutableIntStateOf(1) } + TachiyomiPreviewTheme { + ChapterNavigator( + isRtl = false, + onNextChapter = {}, + enabledNext = true, + onPreviousChapter = {}, + enabledPrevious = true, + currentPage = currentPage, + totalPages = 10, + onSliderValueChange = { currentPage = it }, + isVerticalSlider = false, + currentPageText = "currentPageText", + ) + } +}