From e7c1d4deefc16c444dac09f38e32b64ddc0bebb8 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Thu, 20 Nov 2025 12:38:09 -0500
Subject: [PATCH] Minor cleanup

---
 app/src/main/java/eu/kanade/tachiyomi/App.kt  |  3 +-
 app/src/main/java/exh/util/SourceTagsUtil.kt  | 32 +++++++++----------
 .../main/java/tachiyomi/data/LibraryQuery.kt  |  4 +--
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
index a0c015d23..75a5a1134 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -130,7 +130,8 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor
         // SY <--
 
         setupExhLogging() // EXH logging
-        LogcatLogger.install(XLogLogcatLogger()) // SY Redirect Logcat to XLog
+        LogcatLogger.install()
+        LogcatLogger.loggers += XLogLogcatLogger() // SY Redirect Logcat to XLog
 
         setupNotificationChannels()
 
diff --git a/app/src/main/java/exh/util/SourceTagsUtil.kt b/app/src/main/java/exh/util/SourceTagsUtil.kt
index d2941bfd8..2a61d9df2 100644
--- a/app/src/main/java/exh/util/SourceTagsUtil.kt
+++ b/app/src/main/java/exh/util/SourceTagsUtil.kt
@@ -1,6 +1,6 @@
 package exh.util
 
-import android.graphics.Color
+import androidx.core.graphics.toColorInt
 import exh.metadata.metadata.base.RaisedTag
 import exh.source.EH_SOURCE_ID
 import exh.source.EXH_SOURCE_ID
@@ -101,24 +101,24 @@ object SourceTagsUtil {
         MISC_COLOR("#f06292"),
         ;
 
-        constructor(color: String) : this(Color.parseColor(color))
+        constructor(color: String) : this(color.toColorInt())
     }
 
     fun getLocaleSourceUtil(language: String?) = when (language) {
-        "english", "eng" -> Locale("en")
-        "chinese" -> Locale("zh")
-        "spanish" -> Locale("es")
-        "korean" -> Locale("ko")
-        "russian" -> Locale("ru")
-        "french" -> Locale("fr")
-        "portuguese" -> Locale("pt")
-        "thai" -> Locale("th")
-        "german" -> Locale("de")
-        "italian" -> Locale("it")
-        "vietnamese" -> Locale("vi")
-        "polish" -> Locale("pl")
-        "hungarian" -> Locale("hu")
-        "dutch" -> Locale("nl")
+        "english", "eng" -> Locale.forLanguageTag("en")
+        "chinese" -> Locale.forLanguageTag("zh")
+        "spanish" -> Locale.forLanguageTag("es")
+        "korean" -> Locale.forLanguageTag("ko")
+        "russian" -> Locale.forLanguageTag("ru")
+        "french" -> Locale.forLanguageTag("fr")
+        "portuguese" -> Locale.forLanguageTag("pt")
+        "thai" -> Locale.forLanguageTag("th")
+        "german" -> Locale.forLanguageTag("de")
+        "italian" -> Locale.forLanguageTag("it")
+        "vietnamese" -> Locale.forLanguageTag("vi")
+        "polish" -> Locale.forLanguageTag("pl")
+        "hungarian" -> Locale.forLanguageTag("hu")
+        "dutch" -> Locale.forLanguageTag("nl")
         else -> null
     }
 
diff --git a/data/src/main/java/tachiyomi/data/LibraryQuery.kt b/data/src/main/java/tachiyomi/data/LibraryQuery.kt
index 05ea8f997..bd61f3c4e 100644
--- a/data/src/main/java/tachiyomi/data/LibraryQuery.kt
+++ b/data/src/main/java/tachiyomi/data/LibraryQuery.kt
@@ -64,7 +64,7 @@ class LibraryQuery(
                 coalesce(C.bookmarkCount, 0) AS bookmarkCount,
                 coalesce(MC.categories, '0') AS categories
             FROM mangas M
-            LEFT JOIN(
+            LEFT JOIN (
                 SELECT
                     chapters.manga_id,
                     count(*) AS total,
@@ -107,7 +107,7 @@ class LibraryQuery(
                 GROUP BY merged.merge_id
             ) as ME
             ON ME.merge_id = M._id
-            LEFT JOIN(
+            LEFT JOIN (
                 SELECT
                     ME.merge_id,
                     count(*) AS total,