Add padding between icon & pages text in delegated sources description (#752)
This commit is contained in:
parent
f9925b1d97
commit
e6a09bacdc
6 changed files with 14 additions and 5 deletions
|
|
@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.R
|
|||
import eu.kanade.tachiyomi.databinding.DescriptionAdapterEhBinding
|
||||
import eu.kanade.tachiyomi.ui.manga.MangaScreenModel.State
|
||||
import eu.kanade.tachiyomi.util.system.copyToClipboard
|
||||
import eu.kanade.tachiyomi.util.system.dpToPx
|
||||
import exh.metadata.MetadataUtil
|
||||
import exh.metadata.metadata.EHentaiSearchMetadata
|
||||
import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
|
||||
|
|
@ -92,7 +93,7 @@ fun EHentaiDescription(
|
|||
val length = meta.length ?: 0
|
||||
binding.pages.text = context.pluralStringResource(SYMR.plurals.num_pages, length, length)
|
||||
// KMK -->
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor)
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor, 4.dpToPx)
|
||||
binding.pages.setTextColor(textColor)
|
||||
// KMK <--
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.R
|
|||
import eu.kanade.tachiyomi.databinding.DescriptionAdapterHbBinding
|
||||
import eu.kanade.tachiyomi.ui.manga.MangaScreenModel.State
|
||||
import eu.kanade.tachiyomi.util.system.copyToClipboard
|
||||
import eu.kanade.tachiyomi.util.system.dpToPx
|
||||
import exh.metadata.metadata.HBrowseSearchMetadata
|
||||
import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
|
||||
import tachiyomi.core.common.i18n.pluralStringResource
|
||||
|
|
@ -41,7 +42,7 @@ fun HBrowseDescription(state: State.Success, openMetadataViewer: () -> Unit) {
|
|||
binding.pages.text =
|
||||
context.pluralStringResource(SYMR.plurals.num_pages, meta.length ?: 0, meta.length ?: 0)
|
||||
// KMK -->
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor)
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor, 4.dpToPx)
|
||||
binding.pages.setTextColor(textColor)
|
||||
|
||||
binding.moreInfo.bindDrawable(context, R.drawable.ic_info_24dp, iconColor)
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ object MetadataUIUtil {
|
|||
@DrawableRes drawable: Int,
|
||||
// KMK -->
|
||||
@ColorInt color: Int = context.getResourceColor(R.attr.colorAccent),
|
||||
drawablePadding: Int = 0.dpToPx,
|
||||
// KMK <--
|
||||
) {
|
||||
ContextCompat.getDrawable(context, drawable)?.apply {
|
||||
|
|
@ -74,6 +75,9 @@ object MetadataUIUtil {
|
|||
// KMK <--
|
||||
setBounds(0, 0, 20.dpToPx, 20.dpToPx)
|
||||
setCompoundDrawables(this, null, null, null)
|
||||
// KMK -->
|
||||
setCompoundDrawablePadding(drawablePadding)
|
||||
// KMK <--
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.R
|
|||
import eu.kanade.tachiyomi.databinding.DescriptionAdapterNhBinding
|
||||
import eu.kanade.tachiyomi.ui.manga.MangaScreenModel.State
|
||||
import eu.kanade.tachiyomi.util.system.copyToClipboard
|
||||
import eu.kanade.tachiyomi.util.system.dpToPx
|
||||
import exh.metadata.MetadataUtil
|
||||
import exh.metadata.metadata.NHentaiSearchMetadata
|
||||
import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
|
||||
|
|
@ -84,7 +85,7 @@ fun NHentaiDescription(state: State.Success, openMetadataViewer: () -> Unit) {
|
|||
meta.pageImageTypes.size,
|
||||
)
|
||||
// KMK -->
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor)
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor, 4.dpToPx)
|
||||
binding.pages.setTextColor(textColor)
|
||||
// KMK <--
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.R
|
|||
import eu.kanade.tachiyomi.databinding.DescriptionAdapterPuBinding
|
||||
import eu.kanade.tachiyomi.ui.manga.MangaScreenModel.State
|
||||
import eu.kanade.tachiyomi.util.system.copyToClipboard
|
||||
import eu.kanade.tachiyomi.util.system.dpToPx
|
||||
import exh.metadata.metadata.PururinSearchMetadata
|
||||
import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
|
||||
import exh.util.SourceTagsUtil.genreTextColor
|
||||
|
|
@ -70,7 +71,7 @@ fun PururinDescription(state: State.Success, openMetadataViewer: () -> Unit) {
|
|||
|
||||
binding.pages.text = context.pluralStringResource(SYMR.plurals.num_pages, meta.pages ?: 0, meta.pages ?: 0)
|
||||
// KMK -->
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor)
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor, 4.dpToPx)
|
||||
binding.pages.setTextColor(textColor)
|
||||
// KMK <--
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.R
|
|||
import eu.kanade.tachiyomi.databinding.DescriptionAdapterTsBinding
|
||||
import eu.kanade.tachiyomi.ui.manga.MangaScreenModel.State
|
||||
import eu.kanade.tachiyomi.util.system.copyToClipboard
|
||||
import eu.kanade.tachiyomi.util.system.dpToPx
|
||||
import exh.metadata.metadata.TsuminoSearchMetadata
|
||||
import exh.ui.metadata.adapters.MetadataUIUtil.bindDrawable
|
||||
import exh.util.SourceTagsUtil.genreTextColor
|
||||
|
|
@ -74,7 +75,7 @@ fun TsuminoDescription(state: State.Success, openMetadataViewer: () -> Unit) {
|
|||
binding.pages.text =
|
||||
context.pluralStringResource(SYMR.plurals.num_pages, meta.length ?: 0, meta.length ?: 0)
|
||||
// KMK -->
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor)
|
||||
binding.pages.bindDrawable(context, R.drawable.ic_baseline_menu_book_24, iconColor, 4.dpToPx)
|
||||
binding.pages.setTextColor(textColor)
|
||||
// KMK <--
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue