From 27d49401ae1a5d42b592c856b0e4fcd498936963 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sun, 18 Apr 2021 00:53:37 -0400
Subject: [PATCH] Using withsubtitle helper method in more places

2 commits back also added a helper method for combining text with a subtitle
---
 .../tachiyomi/ui/library/display/LibraryDisplayView.kt | 10 ++--------
 .../kanade/tachiyomi/ui/recents/RecentsOptionsSheet.kt | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt
index 97b0b444f5..01bbdf6df4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt
@@ -13,6 +13,7 @@ import androidx.core.view.isVisible
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.LibraryDisplayLayoutBinding
 import eu.kanade.tachiyomi.util.bindToPreference
+import eu.kanade.tachiyomi.util.lang.withSubtitle
 import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.view.rowsForValue
@@ -96,14 +97,7 @@ class LibraryDisplayView @JvmOverloads constructor(context: Context, attrs: Attr
             val rows = this@LibraryDisplayView.rowsForValue(progress)
             val titleText = context.getString(R.string.grid_size)
             val subtitleText = context.getString(R.string._per_row, rows)
-            val spannable = SpannableStringBuilder(titleText + "\n" + subtitleText)
-            spannable.setSpan(
-                ForegroundColorSpan(context.getResourceColor(android.R.attr.textColorSecondary)),
-                titleText.length + 1,
-                spannable.length,
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
-            text = spannable
+            text = titleText.withSubtitle(context, subtitleText)
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsOptionsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsOptionsSheet.kt
index 5bb3754b01..342a4e5fe3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsOptionsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsOptionsSheet.kt
@@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.RecentsOptionsSheetBinding
 import eu.kanade.tachiyomi.util.bindToPreference
+import eu.kanade.tachiyomi.util.lang.withSubtitle
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.view.RecyclerWindowInsetsListener
 import eu.kanade.tachiyomi.util.view.setEdgeToEdge
@@ -36,14 +37,7 @@ class RecentsOptionsSheet(activity: Activity) :
 
         val titleText = context.getString(R.string.show_reset_history_button)
         val subtitleText = context.getString(R.string.press_and_hold_to_also_reset)
-        val spannable = SpannableStringBuilder(titleText + "\n" + subtitleText)
-        spannable.setSpan(
-            ForegroundColorSpan(binding.showRemoveHistory.context.getResourceColor(android.R.attr.textColorSecondary)),
-            titleText.length + 1,
-            spannable.length,
-            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-        )
-        binding.showRemoveHistory.text = spannable
+        binding.showRemoveHistory.text = titleText.withSubtitle(context, subtitleText)
     }
 
     private fun initGeneralPreferences() {