From f16ade33dfb816b8e06dec6ee0a7bff5191d83e7 Mon Sep 17 00:00:00 2001 From: ekager Date: Mon, 21 Sep 2020 15:33:52 -0700 Subject: [PATCH] For #15089 - Disable recently closed in multiselect --- .../viewholders/HistoryListItemViewHolder.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt index 9d09c115e..82a6e0eaa 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt @@ -98,10 +98,11 @@ class HistoryListItemViewHolder( showTopContent: Boolean, isNormalMode: Boolean ) { + itemView.delete_button.isVisible = showTopContent + itemView.findViewById(R.id.recently_closed_nav).isVisible = showTopContent + if (showTopContent) { itemView.delete_button.run { - visibility = View.VISIBLE - if (isNormalMode) { isEnabled = true alpha = 1f @@ -117,10 +118,15 @@ class HistoryListItemViewHolder( R.string.recently_closed_tab else R.string.recently_closed_tabs ), numRecentTabs ) - itemView.findViewById(R.id.recently_closed_nav).isVisible = true - } else { - itemView.findViewById(R.id.recently_closed_nav).visibility = View.GONE - itemView.delete_button.visibility = View.GONE + itemView.findViewById(R.id.recently_closed_nav).run { + if (isNormalMode) { + isEnabled = true + alpha = 1f + } else { + isEnabled = false + alpha = DELETE_BUTTON_DISABLED_ALPHA + } + } } }