From c501c9ecc36858f5053a605f11c6629899e920cb Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Wed, 30 Sep 2020 19:29:44 -0400 Subject: [PATCH] Modify the looks of the extra info for a few sources --- .../adapters/EHentaiDescriptionAdapter.kt | 7 ++- .../adapters/HBrowseDescriptionAdapter.kt | 4 ++ .../adapters/NHentaiDescriptionAdapter.kt | 4 ++ .../adapters/PururinDescriptionAdapter.kt | 5 ++ .../adapters/TsuminoDescriptionAdapter.kt | 4 ++ .../res/drawable/ic_baseline_menu_book_24.xml | 19 +++++++ .../res/layout/description_adapter_eh.xml | 26 +++++----- .../res/layout/description_adapter_pe.xml | 48 +++++++++-------- .../res/layout/description_adapter_pu.xml | 49 +++++++++--------- .../res/layout/description_adapter_ts.xml | 51 ++++++++++--------- 10 files changed, 135 insertions(+), 82 deletions(-) create mode 100644 app/src/main/res/drawable/ic_baseline_menu_book_24.xml diff --git a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt index a998db64a..9154787df 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt @@ -75,7 +75,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_favorite_24dp) + val drawable = itemView.context.getDrawable(R.drawable.ic_book_24dp) drawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent)) binding.favorites.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) @@ -83,7 +83,12 @@ class EHentaiDescriptionAdapter( binding.uploader.text = meta.uploader ?: itemView.context.getString(R.string.unknown) 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) + pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent)) + binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null) + val language = meta.language ?: itemView.context.getString(R.string.unknown) binding.language.text = if (meta.translated == true) { itemView.context.getString(R.string.language_translated, language) diff --git a/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt index 6a2edf59d..a2b385730 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt @@ -9,6 +9,7 @@ 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.getResourceColor import exh.metadata.metadata.HBrowseSearchMetadata import exh.ui.metadata.MetadataViewController import kotlinx.coroutines.CoroutineScope @@ -44,6 +45,9 @@ 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) + pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent)) + binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null) binding.pages.longClicks() .onEach { diff --git a/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt index c1c446fae..b4c90d0b3 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt @@ -89,6 +89,10 @@ 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) + pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent)) + binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null) + @SuppressLint("SetTextI18n") binding.id.text = "#" + (meta.nhId ?: 0) diff --git a/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt index 8d69fdf8a..723dfe619 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt @@ -10,6 +10,7 @@ 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.getResourceColor import exh.metadata.metadata.PururinSearchMetadata import exh.metadata.metadata.PururinSearchMetadata.Companion.TAG_NAMESPACE_CATEGORY import exh.ui.metadata.MetadataViewController @@ -67,7 +68,11 @@ class PururinDescriptionAdapter( binding.uploader.text = meta.uploaderDisp ?: meta.uploader ?: "" 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) + pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent)) + binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null) val ratingFloat = meta.averageRating?.toFloat() val name = when (((ratingFloat ?: 100F) * 2).roundToInt()) { diff --git a/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt index f3d646053..f0ae3c599 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt @@ -73,7 +73,11 @@ class TsuminoDescriptionAdapter( binding.whenPosted.text = TsuminoSearchMetadata.TSUMINO_DATE_FORMAT.format(Date(meta.uploadDate ?: 0)) 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) + pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent)) + binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null) val name = when (((meta.averageRating ?: 100F) * 2).roundToInt()) { 0 -> R.string.rating0 diff --git a/app/src/main/res/drawable/ic_baseline_menu_book_24.xml b/app/src/main/res/drawable/ic_baseline_menu_book_24.xml new file mode 100644 index 000000000..f9029784a --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_menu_book_24.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/layout/description_adapter_eh.xml b/app/src/main/res/layout/description_adapter_eh.xml index 857eba137..2a8013998 100644 --- a/app/src/main/res/layout/description_adapter_eh.xml +++ b/app/src/main/res/layout/description_adapter_eh.xml @@ -117,20 +117,22 @@ android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/when_posted" /> + + - + - + - + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/description_adapter_pu.xml b/app/src/main/res/layout/description_adapter_pu.xml index 23c548032..a74670c00 100644 --- a/app/src/main/res/layout/description_adapter_pu.xml +++ b/app/src/main/res/layout/description_adapter_pu.xml @@ -78,30 +78,33 @@ app:layout_constraintTop_toTopOf="parent" /> + + + + + + - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/description_adapter_ts.xml b/app/src/main/res/layout/description_adapter_ts.xml index c090cfbb3..8800f5fec 100644 --- a/app/src/main/res/layout/description_adapter_ts.xml +++ b/app/src/main/res/layout/description_adapter_ts.xml @@ -65,7 +65,6 @@ style="@style/TextAppearance.Regular" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="32dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -88,30 +87,32 @@ android:layout_marginStart="16dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + + - - - - - \ No newline at end of file