From f3a412e24e6b9ad2e19594e072a1fd272533b682 Mon Sep 17 00:00:00 2001 From: Suraj Shah Date: Mon, 19 Aug 2019 21:53:12 +0530 Subject: [PATCH] [fenix] Fixes https://github.com/mozilla-mobile/fenix/issues/4704 (https://github.com/mozilla-mobile/fenix/pull/4728) * Fixes https://github.com/mozilla-mobile/fenix/issues/4704. Overrides `setEnabled` for DeleteBrowsingDataItem to change view alpha when disabled and to toggle the checkbox `isEnabled` behavior based on the value provided. * Updates CHANGELOG.md * Removes unnecessary disabling of checkbox in DeleteBrowsingDataItem.kt Updates CHANGELOG.md to reflect the component changed. --- CHANGELOG.md | 1 + .../mozilla/fenix/settings/DeleteBrowsingDataItem.kt | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2b02b8406..0bc689189e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +- #4704 - Adds ability to show a different alpha when no elements available to be deleted for a delete browsing data item - #4137 - Adds pagination to the history view - #3695 - Made search suggestions for other tabs clickable diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt index 6432149a7c..6c8b96aefc 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt @@ -19,6 +19,11 @@ class DeleteBrowsingDataItem @JvmOverloads constructor( defStyleAttr: Int = 0 ) : ConstraintLayout(context, attrs, defStyleAttr) { + private companion object { + private const val ENABLED_ALPHA = 1f + private const val DISABLED_ALPHA = 0.6f + } + val titleView: TextView get() = title @@ -61,4 +66,9 @@ class DeleteBrowsingDataItem @JvmOverloads constructor( subtitle.text = resources.getString(subtitleId) } } + + override fun setEnabled(enabled: Boolean) { + super.setEnabled(enabled) + alpha = if (enabled) ENABLED_ALPHA else DISABLED_ALPHA + } }