admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extra info updates

Browse Source
This commit is contained in:
Jobobby04
2020-10-25 20:00:48 -04:00
parent 112bbdfcf7
commit 32232c80aa
21 changed files with 179 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt
+9 -2
View File
@@ -4,12 +4,14 @@ import android.graphics.Color
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapterEhBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.EX_DATE_FORMAT
import exh.metadata.humanReadableByteCount
@@ -75,7 +77,7 @@ class EHentaiDescriptionAdapter(
binding.visible.text = itemView.context.getString(R.string.is_visible, meta.visible ?: itemView.context.getString(R.string.unknown))
binding.favorites.text = (meta.favorites ?: 0).toString()
val drawable = itemView.context.getDrawable(R.drawable.ic_book_24dp)
val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_book_24dp)
drawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
binding.favorites.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
@@ -85,7 +87,7 @@ class EHentaiDescriptionAdapter(
binding.size.text = humanReadableByteCount(meta.size ?: 0, true)
binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.length ?: 0, meta.length ?: 0)
val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
@@ -118,6 +120,11 @@ class EHentaiDescriptionAdapter(
itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (ratingFloat ?: 0F).toString())
}
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
listOf(
binding.favorites,
binding.genre,
app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt
+8
View File
@@ -3,12 +3,15 @@ package exh.ui.metadata.adapters
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapter8mBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.metadata.EightMusesSearchMetadata
import exh.ui.metadata.MetadataViewController
import kotlinx.coroutines.CoroutineScope
@@ -45,6 +48,11 @@ class EightMusesDescriptionAdapter(
binding.title.text = meta.title ?: itemView.context.getString(R.string.unknown)
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
binding.title.longClicks()
.onEach {
itemView.context.copyToClipboard(
app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt
+8 -1
View File
@@ -3,12 +3,14 @@ package exh.ui.metadata.adapters
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapterHbBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.metadata.HBrowseSearchMetadata
import exh.ui.metadata.MetadataViewController
@@ -45,10 +47,15 @@ class HBrowseDescriptionAdapter(
if (meta == null || meta !is HBrowseSearchMetadata) return
binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.length ?: 0, meta.length ?: 0)
val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
binding.pages.longClicks()
.onEach {
itemView.context.copyToClipboard(
app/src/main/java/exh/ui/metadata/adapters/HentaiCafeDescriptionAdapter.kt
+8
View File
@@ -3,12 +3,15 @@ package exh.ui.metadata.adapters
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapterHcBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.metadata.HentaiCafeSearchMetadata
import exh.ui.metadata.MetadataViewController
import kotlinx.coroutines.CoroutineScope
@@ -45,6 +48,11 @@ class HentaiCafeDescriptionAdapter(
binding.artist.text = meta.artist ?: itemView.context.getString(R.string.unknown)
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
binding.artist.longClicks()
.onEach {
itemView.context.copyToClipboard(
app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt
+8
View File
@@ -4,12 +4,15 @@ import android.graphics.Color
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapterHiBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.EX_DATE_FORMAT
import exh.metadata.metadata.HitomiSearchMetadata
import exh.ui.metadata.MetadataViewController
@@ -73,6 +76,11 @@ class HitomiDescriptionAdapter(
binding.group.text = meta.group ?: itemView.context.getString(R.string.unknown)
binding.language.text = meta.language ?: itemView.context.getString(R.string.unknown)
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
listOf(
binding.genre,
binding.group,
app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt
+16 -17
View File
@@ -1,15 +1,17 @@
package exh.ui.metadata.adapters
import android.annotation.SuppressLint
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapterMdBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.metadata.MangaDexSearchMetadata
import exh.ui.metadata.MetadataViewController
import kotlinx.coroutines.CoroutineScope
@@ -46,9 +48,6 @@ class MangaDexDescriptionAdapter(
val meta = controller.presenter.meta
if (meta == null || meta !is MangaDexSearchMetadata) return
@SuppressLint("SetTextI18n")
binding.mdId.text = "#" + (meta.mdId ?: 0)
val ratingFloat = meta.rating?.toFloatOrNull()?.div(2F)
val name = when (((ratingFloat ?: 100F) * 2).roundToInt()) {
0 -> R.string.rating0
@@ -71,19 +70,19 @@ class MangaDexDescriptionAdapter(
itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (meta.rating?.toFloatOrNull() ?: 0F).toString())
}
listOf(
binding.mdId,
binding.rating
).forEach { textView ->
textView.longClicks()
.onEach {
itemView.context.copyToClipboard(
textView.text.toString(),
textView.text.toString()
)
}
.launchIn(scope)
}
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
binding.rating.longClicks()
.onEach {
itemView.context.copyToClipboard(
binding.rating.text.toString(),
binding.rating.text.toString()
)
}
.launchIn(scope)
binding.moreInfo.clicks()
.onEach {
app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt
+11 -4
View File
@@ -5,12 +5,14 @@ import android.graphics.Color
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapterNhBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.EX_DATE_FORMAT
import exh.metadata.metadata.NHentaiSearchMetadata
@@ -51,8 +53,8 @@ class NHentaiDescriptionAdapter(
if (meta == null || meta !is NHentaiSearchMetadata) return
var category: String? = null
meta.tags.filter { it.namespace == NHentaiSearchMetadata.NHENTAI_CATEGORIES_NAMESPACE }.let {
if (it.isNotEmpty()) category = it.joinToString(transform = { it.name })
meta.tags.filter { it.namespace == NHentaiSearchMetadata.NHENTAI_CATEGORIES_NAMESPACE }.let { tags ->
if (tags.isNotEmpty()) category = tags.joinToString(transform = { it.name })
}
if (category != null) {
@@ -80,7 +82,7 @@ class NHentaiDescriptionAdapter(
if (it == 0L) return@let
binding.favorites.text = it.toString()
val drawable = itemView.context.getDrawable(R.drawable.ic_favorite_24dp)
val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_favorite_24dp)
drawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
binding.favorites.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
@@ -89,13 +91,18 @@ class NHentaiDescriptionAdapter(
binding.whenPosted.text = EX_DATE_FORMAT.format(Date((meta.uploadDate ?: 0) * 1000))
binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.pageImageTypes.size, meta.pageImageTypes.size)
val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
@SuppressLint("SetTextI18n")
binding.id.text = "#" + (meta.nhId ?: 0)
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
listOf(
binding.favorites,
binding.genre,
app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt
+8
View File
@@ -4,12 +4,15 @@ import android.graphics.Color
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapterPeBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.metadata.PervEdenSearchMetadata
import exh.ui.metadata.MetadataViewController
import exh.util.SourceTagsUtil
@@ -87,6 +90,11 @@ class PervEdenDescriptionAdapter(
binding.ratingBar.rating = meta.rating ?: 0F
binding.rating.text = itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (meta.rating ?: 0F).toString())
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
listOf(
binding.genre,
binding.language,
app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt
+8 -1
View File
@@ -4,12 +4,14 @@ import android.graphics.Color
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapterPuBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.metadata.PururinSearchMetadata
import exh.metadata.metadata.PururinSearchMetadata.Companion.TAG_NAMESPACE_CATEGORY
@@ -70,7 +72,7 @@ class PururinDescriptionAdapter(
binding.size.text = meta.fileSize ?: itemView.context.getString(R.string.unknown)
binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.pages ?: 0, meta.pages ?: 0)
val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
@@ -96,6 +98,11 @@ class PururinDescriptionAdapter(
itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (ratingFloat ?: 0F).toString())
}
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
listOf(
binding.genre,
binding.pages,
app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt
+9 -2
View File
@@ -4,12 +4,14 @@ import android.graphics.Color
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.DescriptionAdapterTsBinding
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.copyToClipboard
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.metadata.metadata.TsuminoSearchMetadata
import exh.ui.metadata.MetadataViewController
@@ -66,7 +68,7 @@ class TsuminoDescriptionAdapter(
} else binding.genre.setText(R.string.unknown)
binding.favorites.text = (meta.favorites ?: 0).toString()
val drawable = itemView.context.getDrawable(R.drawable.ic_favorite_24dp)
val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_favorite_24dp)
drawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
binding.favorites.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
@@ -75,7 +77,7 @@ class TsuminoDescriptionAdapter(
binding.uploader.text = meta.uploader ?: itemView.context.getString(R.string.unknown)
binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.length ?: 0, meta.length ?: 0)
val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
@@ -100,6 +102,11 @@ class TsuminoDescriptionAdapter(
itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (meta.averageRating ?: 0F).toString())
}
val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
listOf(
binding.favorites,
binding.genre,