From 3cf91fc303c3ee863ffa767fe5a20916a99c2e80 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Fri, 24 May 2019 14:27:26 -0700 Subject: [PATCH] For #225 - Adds button to delete browsing data --- .../fenix/settings/DeleteBrowsingDataFragment.kt | 7 +++++++ .../res/layout/fragment_delete_browsing_data.xml | 13 +++++++++++++ app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 22 insertions(+) diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt index 58f6130ed..f30b734bc 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt @@ -5,6 +5,7 @@ package org.mozilla.fenix.settings import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -82,10 +83,16 @@ class DeleteBrowsingDataFragment : Fragment(), CoroutineScope { updateTabCount() updateHistoryCount() updateCollectionsCount() + updateDeleteButton() } private fun updateDeleteButton() { + view?.delete_data?.isEnabled = + view!!.open_tabs_item!!.isChecked + || view!!.browsing_data_item!!.isChecked + || view!!.collections_item!!.isChecked + Log.e("wat", view?.delete_data?.isEnabled.toString()) } private fun updateTabCount() { diff --git a/app/src/main/res/layout/fragment_delete_browsing_data.xml b/app/src/main/res/layout/fragment_delete_browsing_data.xml index 7969281b8..6b50b98c9 100644 --- a/app/src/main/res/layout/fragment_delete_browsing_data.xml +++ b/app/src/main/res/layout/fragment_delete_browsing_data.xml @@ -45,5 +45,18 @@ app:deleteBrowsingDataItemIcon="@drawable/ic_collections_circle_background" app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_collections_title" app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_collections_subtitle" /> +