From 556b726349a50d535dbb80e7db5e2d93d13cf7b1 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Tue, 16 Apr 2024 09:50:49 +0800
Subject: [PATCH] Update to follow the latest material slider specs

Tick size is 4 dp now.
---
 app/src/main/kotlin/com/hippo/ehviewer/ui/reader/Widget.kt   | 5 ++---
 .../kotlin/eu/kanade/tachiyomi/ui/reader/ChapterNavigator.kt | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/Widget.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/Widget.kt
index aa3fa9798..43e6d09cc 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/Widget.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/Widget.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.unit.dp
+import kotlin.math.roundToInt
 
 @Composable
 fun SpinnerChoice(title: String, entries: Array<String>, values: Array<String>, field: MutableState<Int>) {
@@ -97,9 +98,7 @@ fun SliderChoice(
     ) {
         startSlot()
         val configuration = LocalConfiguration.current
-        // https://m3.material.io/components/sliders/specs
-        // Tick width is 2 dp
-        val maxTickCount = configuration.screenWidthDp / 6
+        val maxTickCount = configuration.screenWidthDp / (SliderDefaults.TickSize.value * 2.5f).roundToInt()
         val steps = range.last - range.first - 1
         val showTicks = steps < maxTickCount
         Slider(
diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ChapterNavigator.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ChapterNavigator.kt
index 492ece9b5..c6b2682a1 100644
--- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ChapterNavigator.kt
+++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ChapterNavigator.kt
@@ -43,9 +43,7 @@ fun ChapterNavigator(
     val layoutDirection = if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr
     val view = LocalView.current
     val configuration = LocalConfiguration.current
-    // https://m3.material.io/components/sliders/specs
-    // Tick width is 2 dp
-    val maxTickCount = configuration.screenWidthDp / 6
+    val maxTickCount = configuration.screenWidthDp / (SliderDefaults.TickSize.value * 2.5f).roundToInt()
     val showTicks = totalPages < maxTickCount
 
     // Match with toolbar background color set in ReaderActivity