From 80c3c260a00402f5c5d8ff86d9592e3cd8220c19 Mon Sep 17 00:00:00 2001 From: Damontecres <154766448+damontecres@users.noreply.github.com> Date: Sun, 11 Feb 2024 09:34:55 -0500 Subject: [PATCH] Fix reuse of icons --- .../stashapp/presenters/StashPresenter.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/github/damontecres/stashapp/presenters/StashPresenter.kt b/app/src/main/java/com/github/damontecres/stashapp/presenters/StashPresenter.kt index 3fa2f88a..fd40988f 100644 --- a/app/src/main/java/com/github/damontecres/stashapp/presenters/StashPresenter.kt +++ b/app/src/main/java/com/github/damontecres/stashapp/presenters/StashPresenter.kt @@ -93,12 +93,11 @@ abstract class StashPresenter : Presenter() { LayoutInflater.from(infoView.context) .inflate(R.layout.image_card_extra, infoView, true) as ViewGroup - iconMap.forEach { - setUpIcon(sceneExtra, it.key, it.value) - } - if (oCounter != null && oCounter > 0) { - setUpIcon(sceneExtra, null, oCounter) + DataType.entries.forEach { + val count = iconMap[it] ?: -1 + setUpIcon(sceneExtra, it, count) } + setUpIcon(sceneExtra, null, oCounter ?: -1) } private fun setUpIcon( @@ -140,7 +139,7 @@ abstract class StashPresenter : Presenter() { iconResId = R.id.extra_ocounter_icon } - else -> throw IllegalArgumentException() + else -> return } val textView = rootView.findViewById(textResId) val iconView = rootView.findViewById(iconResId) @@ -149,6 +148,10 @@ abstract class StashPresenter : Presenter() { textView.visibility = View.VISIBLE iconView.visibility = View.VISIBLE (textView.parent as ViewGroup).visibility = View.VISIBLE + } else { + textView.visibility = View.GONE + iconView.visibility = View.GONE + (textView.parent as ViewGroup).visibility = View.GONE } }