Extract source api from app module (#8014)

* Extract source api from app module

* Extract source online api from app module

(cherry picked from commit 86fe850794)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
#	source-api/src/main/java/eu/kanade/tachiyomi/source/Source.kt
#	source-api/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt

app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt

@@ -12,8 +12,8 @@ import eu.kanade.tachiyomi.databinding.DescriptionAdapterEhBinding
 import eu.kanade.tachiyomi.ui.manga.MangaScreenState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import exh.metadata.MetadataUtil
-import exh.metadata.bindDrawable
 import exh.metadata.metadata.EHentaiSearchMetadata
+import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
 
 @Composable
 fun EHentaiDescription(state: MangaScreenState.Success, openMetadataViewer: () -> Unit, search: (String) -> Unit) {
@@ -29,7 +29,7 @@ fun EHentaiDescription(state: MangaScreenState.Success, openMetadataViewer: () -
             val binding = DescriptionAdapterEhBinding.bind(it)
 
             binding.genre.text =
-                meta.genre?.let { MetadataUtil.getGenreAndColour(context, it) }
+                meta.genre?.let { MetadataUIUtil.getGenreAndColour(context, it) }
                     ?.let {
                         binding.genre.setBackgroundColor(it.first)
                         it.second
@@ -61,7 +61,7 @@ fun EHentaiDescription(state: MangaScreenState.Success, openMetadataViewer: () -
             val ratingFloat = meta.averageRating?.toFloat()
             binding.ratingBar.rating = ratingFloat ?: 0F
             @SuppressLint("SetTextI18n")
-            binding.rating.text = (ratingFloat ?: 0F).toString() + " - " + MetadataUtil.getRatingString(context, ratingFloat?.times(2))
+            binding.rating.text = (ratingFloat ?: 0F).toString() + " - " + MetadataUIUtil.getRatingString(context, ratingFloat?.times(2))
 
             binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp)
 

app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt

@@ -10,8 +10,8 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapter8mBinding
 import eu.kanade.tachiyomi.ui.manga.MangaScreenState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import exh.metadata.bindDrawable
 import exh.metadata.metadata.EightMusesSearchMetadata
+import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
 
 @Composable
 fun EightMusesDescription(state: MangaScreenState.Success, openMetadataViewer: () -> Unit) {

app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt

@@ -10,8 +10,8 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterHbBinding
 import eu.kanade.tachiyomi.ui.manga.MangaScreenState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import exh.metadata.bindDrawable
 import exh.metadata.metadata.HBrowseSearchMetadata
+import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
 
 @Composable
 fun HBrowseDescription(state: MangaScreenState.Success, openMetadataViewer: () -> Unit) {

app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt

@@ -11,8 +11,8 @@ import eu.kanade.tachiyomi.databinding.DescriptionAdapterHiBinding
 import eu.kanade.tachiyomi.ui.manga.MangaScreenState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import exh.metadata.MetadataUtil
-import exh.metadata.bindDrawable
 import exh.metadata.metadata.HitomiSearchMetadata
+import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
 import java.util.Date
 
 @Composable
@@ -28,7 +28,7 @@ fun HitomiDescription(state: MangaScreenState.Success, openMetadataViewer: () ->
             if (meta == null || meta !is HitomiSearchMetadata) return@AndroidView
             val binding = DescriptionAdapterHiBinding.bind(it)
 
-            binding.genre.text = meta.genre?.let { MetadataUtil.getGenreAndColour(context, it) }?.let {
+            binding.genre.text = meta.genre?.let { MetadataUIUtil.getGenreAndColour(context, it) }?.let {
                 binding.genre.setBackgroundColor(it.first)
                 it.second
             } ?: meta.genre ?: context.getString(R.string.unknown)

app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt

@@ -12,9 +12,9 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterMdBinding
 import eu.kanade.tachiyomi.ui.manga.MangaScreenState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import exh.metadata.MetadataUtil.getRatingString
-import exh.metadata.bindDrawable
 import exh.metadata.metadata.MangaDexSearchMetadata
+import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
+import exh.ui.metadata.adapters.MetadataUIUtil.getRatingString
 import kotlin.math.round
 
 @Composable

app/src/main/java/exh/ui/metadata/adapters/MetadataUIUtil.kt

@@ -0,0 +1,59 @@
+package exh.ui.metadata.adapters
+
+import android.content.Context
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.annotation.FloatRange
+import androidx.core.content.ContextCompat
+import eu.kanade.tachiyomi.source.R
+import eu.kanade.tachiyomi.util.system.dpToPx
+import eu.kanade.tachiyomi.util.system.getResourceColor
+import exh.util.SourceTagsUtil
+import kotlin.math.roundToInt
+
+object MetadataUIUtil {
+    fun getRatingString(context: Context, @FloatRange(from = 0.0, to = 10.0) rating: Float? = null) = when (rating?.roundToInt()) {
+        0 -> R.string.rating0
+        1 -> R.string.rating1
+        2 -> R.string.rating2
+        3 -> R.string.rating3
+        4 -> R.string.rating4
+        5 -> R.string.rating5
+        6 -> R.string.rating6
+        7 -> R.string.rating7
+        8 -> R.string.rating8
+        9 -> R.string.rating9
+        10 -> R.string.rating10
+        else -> R.string.no_rating
+    }.let { context.getString(it) }
+
+    fun getGenreAndColour(context: Context, genre: String) = when (genre) {
+        "doujinshi", "Doujinshi" -> SourceTagsUtil.GenreColor.DOUJINSHI_COLOR to R.string.doujinshi
+        "manga", "Japanese Manga", "Manga" -> SourceTagsUtil.GenreColor.MANGA_COLOR to R.string.manga
+        "artistcg", "artist CG", "artist-cg", "Artist CG" -> SourceTagsUtil.GenreColor.ARTIST_CG_COLOR to R.string.artist_cg
+        "gamecg", "game CG", "game-cg", "Game CG" -> SourceTagsUtil.GenreColor.GAME_CG_COLOR to R.string.game_cg
+        "western" -> SourceTagsUtil.GenreColor.WESTERN_COLOR to R.string.western
+        "non-h", "non-H" -> SourceTagsUtil.GenreColor.NON_H_COLOR to R.string.non_h
+        "imageset", "image Set" -> SourceTagsUtil.GenreColor.IMAGE_SET_COLOR to R.string.image_set
+        "cosplay" -> SourceTagsUtil.GenreColor.COSPLAY_COLOR to R.string.cosplay
+        "asianporn", "asian Porn" -> SourceTagsUtil.GenreColor.ASIAN_PORN_COLOR to R.string.asian_porn
+        "misc" -> SourceTagsUtil.GenreColor.MISC_COLOR to R.string.misc
+        "Korean Manhwa" -> SourceTagsUtil.GenreColor.ARTIST_CG_COLOR to R.string.manhwa
+        "Chinese Manhua" -> SourceTagsUtil.GenreColor.GAME_CG_COLOR to R.string.manhua
+        "Comic" -> SourceTagsUtil.GenreColor.WESTERN_COLOR to R.string.comic
+        "artbook" -> SourceTagsUtil.GenreColor.IMAGE_SET_COLOR to R.string.artbook
+        "webtoon" -> SourceTagsUtil.GenreColor.NON_H_COLOR to R.string.webtoon
+        "Video" -> SourceTagsUtil.GenreColor.WESTERN_COLOR to R.string.video
+        else -> null
+    }?.let { (genreColor, stringId) ->
+        genreColor.color to context.getString(stringId)
+    }
+
+    fun TextView.bindDrawable(context: Context, @DrawableRes drawable: Int) {
+        ContextCompat.getDrawable(context, drawable)?.apply {
+            setTint(context.getResourceColor(R.attr.colorAccent))
+            setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            setCompoundDrawables(this, null, null, null)
+        }
+    }
+}

app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt

@@ -12,8 +12,8 @@ import eu.kanade.tachiyomi.databinding.DescriptionAdapterNhBinding
 import eu.kanade.tachiyomi.ui.manga.MangaScreenState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import exh.metadata.MetadataUtil
-import exh.metadata.bindDrawable
 import exh.metadata.metadata.NHentaiSearchMetadata
+import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
 import java.util.Date
 
 @Composable
@@ -32,7 +32,7 @@ fun NHentaiDescription(state: MangaScreenState.Success, openMetadataViewer: () -
             binding.genre.text = meta.tags.filter { it.namespace == NHentaiSearchMetadata.NHENTAI_CATEGORIES_NAMESPACE }.let { tags ->
                 if (tags.isNotEmpty()) tags.joinToString(transform = { it.name }) else null
             }.let { categoriesString ->
-                categoriesString?.let { MetadataUtil.getGenreAndColour(context, it) }?.let {
+                categoriesString?.let { MetadataUIUtil.getGenreAndColour(context, it) }?.let {
                     binding.genre.setBackgroundColor(it.first)
                     it.second
                 } ?: categoriesString ?: context.getString(R.string.unknown)

app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt

@@ -11,9 +11,8 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterPeBinding
 import eu.kanade.tachiyomi.ui.manga.MangaScreenState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import exh.metadata.MetadataUtil
-import exh.metadata.bindDrawable
 import exh.metadata.metadata.PervEdenSearchMetadata
+import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
 import java.util.Locale
 import kotlin.math.round
 
@@ -30,7 +29,7 @@ fun PervEdenDescription(state: MangaScreenState.Success, openMetadataViewer: ()
             if (meta == null || meta !is PervEdenSearchMetadata) return@AndroidView
             val binding = DescriptionAdapterPeBinding.bind(it)
 
-            binding.genre.text = meta.genre?.let { MetadataUtil.getGenreAndColour(context, it) }?.let {
+            binding.genre.text = meta.genre?.let { MetadataUIUtil.getGenreAndColour(context, it) }?.let {
                 binding.genre.setBackgroundColor(it.first)
                 it.second
             } ?: meta.genre ?: context.getString(R.string.unknown)
@@ -45,7 +44,7 @@ fun PervEdenDescription(state: MangaScreenState.Success, openMetadataViewer: ()
 
             binding.ratingBar.rating = meta.rating ?: 0F
             @SuppressLint("SetTextI18n")
-            binding.rating.text = (round((meta.rating ?: 0F) * 100.0) / 100.0).toString() + " - " + MetadataUtil.getRatingString(context, meta.rating?.times(2))
+            binding.rating.text = (round((meta.rating ?: 0F) * 100.0) / 100.0).toString() + " - " + MetadataUIUtil.getRatingString(context, meta.rating?.times(2))
 
             binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp)
 

app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt

@@ -11,9 +11,8 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterPuBinding
 import eu.kanade.tachiyomi.ui.manga.MangaScreenState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import exh.metadata.MetadataUtil
-import exh.metadata.bindDrawable
 import exh.metadata.metadata.PururinSearchMetadata
+import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
 import kotlin.math.round
 
 @Composable
@@ -30,7 +29,7 @@ fun PururinDescription(state: MangaScreenState.Success, openMetadataViewer: () -
             val binding = DescriptionAdapterPuBinding.bind(it)
 
             binding.genre.text = meta.tags.find { it.namespace == PururinSearchMetadata.TAG_NAMESPACE_CATEGORY }.let { genre ->
-                genre?.let { MetadataUtil.getGenreAndColour(context, it.name) }?.let {
+                genre?.let { MetadataUIUtil.getGenreAndColour(context, it.name) }?.let {
                     binding.genre.setBackgroundColor(it.first)
                     it.second
                 } ?: genre?.name ?: context.getString(R.string.unknown)
@@ -47,7 +46,7 @@ fun PururinDescription(state: MangaScreenState.Success, openMetadataViewer: () -
             val ratingFloat = meta.averageRating?.toFloat()
             binding.ratingBar.rating = ratingFloat ?: 0F
             @SuppressLint("SetTextI18n")
-            binding.rating.text = (round((ratingFloat ?: 0F) * 100.0) / 100.0).toString() + " - " + MetadataUtil.getRatingString(context, ratingFloat?.times(2))
+            binding.rating.text = (round((ratingFloat ?: 0F) * 100.0) / 100.0).toString() + " - " + MetadataUIUtil.getRatingString(context, ratingFloat?.times(2))
 
             binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp)
 

app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt

@@ -11,9 +11,8 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterTsBinding
 import eu.kanade.tachiyomi.ui.manga.MangaScreenState
 import eu.kanade.tachiyomi.util.system.copyToClipboard
-import exh.metadata.MetadataUtil
-import exh.metadata.bindDrawable
 import exh.metadata.metadata.TsuminoSearchMetadata
+import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
 import java.util.Date
 import kotlin.math.round
 
@@ -30,7 +29,7 @@ fun TsuminoDescription(state: MangaScreenState.Success, openMetadataViewer: () -
             if (meta == null || meta !is TsuminoSearchMetadata) return@AndroidView
             val binding = DescriptionAdapterTsBinding.bind(it)
 
-            binding.genre.text = meta.category?.let { MetadataUtil.getGenreAndColour(context, it) }?.let {
+            binding.genre.text = meta.category?.let { MetadataUIUtil.getGenreAndColour(context, it) }?.let {
                 binding.genre.setBackgroundColor(it.first)
                 it.second
             } ?: meta.category ?: context.getString(R.string.unknown)
@@ -47,7 +46,7 @@ fun TsuminoDescription(state: MangaScreenState.Success, openMetadataViewer: () -
 
             binding.ratingBar.rating = meta.averageRating ?: 0F
             @SuppressLint("SetTextI18n")
-            binding.rating.text = (round((meta.averageRating ?: 0F) * 100.0) / 100.0).toString() + " - " + MetadataUtil.getRatingString(context, meta.averageRating?.times(2))
+            binding.rating.text = (round((meta.averageRating ?: 0F) * 100.0) / 100.0).toString() + " - " + MetadataUIUtil.getRatingString(context, meta.averageRating?.times(2))
 
             binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp)