From 721229b90e16af004b941905a7e7d3a9d7a288e9 Mon Sep 17 00:00:00 2001
From: Cuong-Tran <cuongtran.tm@gmail.com>
Date: Fri, 18 Oct 2024 10:18:40 +0700
Subject: [PATCH] matching source with SY

---
 app/build.gradle.kts                                 |  4 ++--
 .../java/eu/kanade/presentation/browse/FeedScreen.kt |  2 +-
 .../reader/components/ChapterNavigator.kt            |  4 +++-
 .../java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt | 12 +++---------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a2c00111f..d69cd8b4d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,11 +8,11 @@ import java.util.Properties
 plugins {
     id("mihon.android.application")
     id("mihon.android.application.compose")
-    // id("com.github.zellius.shortcut-helper")
     kotlin("plugin.parcelize")
     kotlin("plugin.serialization")
-    id("com.github.ben-manes.versions")
+    // id("com.github.zellius.shortcut-helper")
     alias(libs.plugins.aboutLibraries)
+    id("com.github.ben-manes.versions")
 }
 
 if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
diff --git a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt
index 1ff9c4489..b017a6ba8 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt
@@ -117,7 +117,6 @@ fun FeedScreen(
                     ) { index, item ->
                         // KMK <--
                         GlobalSearchResultItem(
-                            modifier = Modifier.animateItem(),
                             title = item.title,
                             subtitle = item.subtitle,
                             onLongClick = {
@@ -136,6 +135,7 @@ fun FeedScreen(
                                     onClickSource(item.source)
                                 }
                             },
+                            modifier = Modifier.animateItem(),
                         ) {
                             FeedItem(
                                 item = item,
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 92f5af7fa..71d5463de 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
@@ -319,8 +319,10 @@ private fun ChapterNavigatorPreview() {
             currentPage = currentPage,
             totalPages = 10,
             onSliderValueChange = { currentPage = it },
+            // SY -->
+            currentPageText = "1",
             isVerticalSlider = false,
-            currentPageText = "currentPageText",
+            // SY <--
         )
     }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
index 18a663779..c6b15e058 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
@@ -137,15 +137,9 @@ class MangaScreen(
         val context = LocalContext.current
         val scope = rememberCoroutineScope()
         val lifecycleOwner = LocalLifecycleOwner.current
-        val screenModel =
-            rememberScreenModel {
-                MangaScreenModel(
-                    context, lifecycleOwner.lifecycle, mangaId, fromSource,
-                    // SY -->
-                    smartSearchConfig != null,
-                    // SY <--
-                )
-            }
+        val screenModel = rememberScreenModel {
+            MangaScreenModel(context, lifecycleOwner.lifecycle, mangaId, fromSource, smartSearchConfig != null)
+        }
 
         val state by screenModel.state.collectAsStateWithLifecycle()