Minor cleanup
This commit is contained in:
@@ -130,7 +130,8 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor
|
|||||||
// SY <--
|
// SY <--
|
||||||
|
|
||||||
setupExhLogging() // EXH logging
|
setupExhLogging() // EXH logging
|
||||||
LogcatLogger.install(XLogLogcatLogger()) // SY Redirect Logcat to XLog
|
LogcatLogger.install()
|
||||||
|
LogcatLogger.loggers += XLogLogcatLogger() // SY Redirect Logcat to XLog
|
||||||
|
|
||||||
setupNotificationChannels()
|
setupNotificationChannels()
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package exh.util
|
package exh.util
|
||||||
|
|
||||||
import android.graphics.Color
|
import androidx.core.graphics.toColorInt
|
||||||
import exh.metadata.metadata.base.RaisedTag
|
import exh.metadata.metadata.base.RaisedTag
|
||||||
import exh.source.EH_SOURCE_ID
|
import exh.source.EH_SOURCE_ID
|
||||||
import exh.source.EXH_SOURCE_ID
|
import exh.source.EXH_SOURCE_ID
|
||||||
@@ -101,24 +101,24 @@ object SourceTagsUtil {
|
|||||||
MISC_COLOR("#f06292"),
|
MISC_COLOR("#f06292"),
|
||||||
;
|
;
|
||||||
|
|
||||||
constructor(color: String) : this(Color.parseColor(color))
|
constructor(color: String) : this(color.toColorInt())
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getLocaleSourceUtil(language: String?) = when (language) {
|
fun getLocaleSourceUtil(language: String?) = when (language) {
|
||||||
"english", "eng" -> Locale("en")
|
"english", "eng" -> Locale.forLanguageTag("en")
|
||||||
"chinese" -> Locale("zh")
|
"chinese" -> Locale.forLanguageTag("zh")
|
||||||
"spanish" -> Locale("es")
|
"spanish" -> Locale.forLanguageTag("es")
|
||||||
"korean" -> Locale("ko")
|
"korean" -> Locale.forLanguageTag("ko")
|
||||||
"russian" -> Locale("ru")
|
"russian" -> Locale.forLanguageTag("ru")
|
||||||
"french" -> Locale("fr")
|
"french" -> Locale.forLanguageTag("fr")
|
||||||
"portuguese" -> Locale("pt")
|
"portuguese" -> Locale.forLanguageTag("pt")
|
||||||
"thai" -> Locale("th")
|
"thai" -> Locale.forLanguageTag("th")
|
||||||
"german" -> Locale("de")
|
"german" -> Locale.forLanguageTag("de")
|
||||||
"italian" -> Locale("it")
|
"italian" -> Locale.forLanguageTag("it")
|
||||||
"vietnamese" -> Locale("vi")
|
"vietnamese" -> Locale.forLanguageTag("vi")
|
||||||
"polish" -> Locale("pl")
|
"polish" -> Locale.forLanguageTag("pl")
|
||||||
"hungarian" -> Locale("hu")
|
"hungarian" -> Locale.forLanguageTag("hu")
|
||||||
"dutch" -> Locale("nl")
|
"dutch" -> Locale.forLanguageTag("nl")
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ class LibraryQuery(
|
|||||||
coalesce(C.bookmarkCount, 0) AS bookmarkCount,
|
coalesce(C.bookmarkCount, 0) AS bookmarkCount,
|
||||||
coalesce(MC.categories, '0') AS categories
|
coalesce(MC.categories, '0') AS categories
|
||||||
FROM mangas M
|
FROM mangas M
|
||||||
LEFT JOIN(
|
LEFT JOIN (
|
||||||
SELECT
|
SELECT
|
||||||
chapters.manga_id,
|
chapters.manga_id,
|
||||||
count(*) AS total,
|
count(*) AS total,
|
||||||
@@ -107,7 +107,7 @@ class LibraryQuery(
|
|||||||
GROUP BY merged.merge_id
|
GROUP BY merged.merge_id
|
||||||
) as ME
|
) as ME
|
||||||
ON ME.merge_id = M._id
|
ON ME.merge_id = M._id
|
||||||
LEFT JOIN(
|
LEFT JOIN (
|
||||||
SELECT
|
SELECT
|
||||||
ME.merge_id,
|
ME.merge_id,
|
||||||
count(*) AS total,
|
count(*) AS total,
|
||||||
|
|||||||
Reference in New Issue
Block a user