From a88bcb0fa269ad67aadf02a6776afd17d60a144b Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Thu, 21 Apr 2022 22:47:51 -0400
Subject: [PATCH] Simplify history item description building

(cherry picked from commit 7c8e8317a8c24261b62645c477028fdd3717e4e8)
---
 .../presentation/history/HistoryScreen.kt     | 23 ++++++++-----------
 .../database/ClearDatabaseController.kt       |  2 --
 app/src/main/res/values/strings.xml           |  1 -
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
index 4996c5cec..4c130588c 100644
--- a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
@@ -39,7 +39,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.core.text.buildSpannedString
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.items
@@ -223,18 +222,16 @@ fun HistoryItem(
             )
             Row {
                 Text(
-                    text = buildSpannedString {
-                        if (history.chapterNumber > -1) {
-                            append(
-                                stringResource(
-                                    R.string.history_prefix,
-                                    chapterFormatter.format(history.chapterNumber)
-                                )
-                            )
-                        }
-                        append(history.readAt?.toTimestampString())
-                    }.toString(),
-                    modifier = Modifier.padding(top = 2.dp),
+                    text = if (history.chapterNumber > -1) {
+                        stringResource(
+                            R.string.recent_manga_time,
+                            chapterFormatter.format(history.chapterNumber),
+                            history.readAt?.toTimestampString() ?: "",
+                        )
+                    } else {
+                        history.readAt?.toTimestampString() ?: ""
+                    },
+                    modifier = Modifier.padding(top = 4.dp),
                     style = textStyle
                 )
             }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt
index e9d62c6b3..626a410ab 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt
@@ -37,7 +37,6 @@ class ClearDatabaseController :
     private var menu: Menu? = null
 
     private var actionFab: ExtendedFloatingActionButton? = null
-    private var actionFabScrollListener: RecyclerView.OnScrollListener? = null
 
     init {
         setHasOptionsMenu(true)
@@ -143,7 +142,6 @@ class ClearDatabaseController :
 
     override fun cleanupFab(fab: ExtendedFloatingActionButton) {
         actionFab?.setOnClickListener(null)
-        actionFabScrollListener?.let { recycler?.removeOnScrollListener(it) }
         actionFab = null
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f48d5863b..a66195873 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -703,7 +703,6 @@
     <string name="updating_library">Updating library</string>
 
     <!-- History fragment -->
-    <string name="history_prefix">Ch. %1$s - </string>
     <string name="recent_manga_time">Ch. %1$s - %2$s</string>
     <string name="pref_clear_history">Clear history</string>
     <string name="clear_history_completed">History deleted</string>