From d5a962727358dd08263eab7c1bed880d4c823c2c Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Fri, 31 May 2019 14:26:34 -0700 Subject: [PATCH] For #2941 - Remove Delete Dialog, Theme Dialogs (#3052) --- .../org/mozilla/fenix/home/HomeFragment.kt | 36 +++++++++---------- .../fenix/library/history/HistoryFragment.kt | 8 +---- .../settings/DeleteBrowsingDataFragment.kt | 34 ++++++++---------- app/src/main/res/values-night/styles.xml | 7 ++++ app/src/main/res/values/styles.xml | 29 +++++++++------ 5 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 app/src/main/res/values-night/styles.xml diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index c03aa6e05..4bdf957ad 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -8,7 +8,6 @@ import android.content.DialogInterface import android.content.res.Resources import android.graphics.drawable.BitmapDrawable import android.os.Bundle -import android.view.ContextThemeWrapper import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -379,26 +378,23 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver { } private fun createDeleteCollectionPrompt(tabCollection: TabCollection) { - AlertDialog.Builder( - ContextThemeWrapper( - activity, - R.style.DeleteDialogStyle - ) - ).apply { - val message = context.getString(R.string.tab_collection_dialog_message, tabCollection.title) - setMessage(message) - setNegativeButton(R.string.tab_collection_dialog_negative) { dialog: DialogInterface, _ -> - dialog.cancel() - } - setPositiveButton(R.string.tab_collection_dialog_positive) { dialog: DialogInterface, _ -> - launch(Dispatchers.IO) { - requireComponents.core.tabCollectionStorage.removeCollection(tabCollection) - }.invokeOnCompletion { - dialog.dismiss() + context?.let { + AlertDialog.Builder(it).apply { + val message = context.getString(R.string.tab_collection_dialog_message, tabCollection.title) + setMessage(message) + setNegativeButton(R.string.tab_collection_dialog_negative) { dialog: DialogInterface, _ -> + dialog.cancel() } - } - create() - }.show() + setPositiveButton(R.string.tab_collection_dialog_positive) { dialog: DialogInterface, _ -> + launch(Dispatchers.IO) { + requireComponents.core.tabCollectionStorage.removeCollection(tabCollection) + }.invokeOnCompletion { + dialog.dismiss() + } + } + create() + }.show() + } } @Suppress("ComplexMethod") diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt index 745d0d236..ba47c0018 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -16,7 +16,6 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.view.ContextThemeWrapper import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.navigation.Navigation @@ -228,12 +227,7 @@ class HistoryFragment : Fragment(), CoroutineScope by MainScope(), BackHandler { private fun displayDeleteAllDialog() { activity?.let { activity -> - AlertDialog.Builder( - ContextThemeWrapper( - activity, - R.style.DeleteDialogStyle - ) - ).apply { + AlertDialog.Builder(activity).apply { setMessage(R.string.history_delete_all_dialog) setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _ -> dialog.cancel() 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 ffda25060..b181ed075 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt @@ -6,7 +6,6 @@ package org.mozilla.fenix.settings import android.content.DialogInterface import android.os.Bundle -import android.view.ContextThemeWrapper import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -108,26 +107,23 @@ class DeleteBrowsingDataFragment : Fragment(), CoroutineScope { } private fun askToDelete() { - AlertDialog.Builder( - ContextThemeWrapper( - activity, - R.style.DeleteDialogStyle - ) - ).apply { - val appName = context.getString(R.string.app_name) - val message = context.getString(R.string.preferences_delete_browsing_data_prompt_message, appName) - setMessage(message) + context?.let { + AlertDialog.Builder(it).apply { + val appName = context.getString(R.string.app_name) + val message = context.getString(R.string.preferences_delete_browsing_data_prompt_message, appName) + setMessage(message) - setNegativeButton(R.string.preferences_delete_browsing_data_prompt_cancel) { dialog: DialogInterface, _ -> - dialog.cancel() - } + setNegativeButton(R.string.preferences_delete_browsing_data_prompt_cancel) { it: DialogInterface, _ -> + it.cancel() + } - setPositiveButton(R.string.preferences_delete_browsing_data_prompt_allow) { dialog: DialogInterface, _ -> - dialog.dismiss() - deleteSelected() - } - create() - }.show() + setPositiveButton(R.string.preferences_delete_browsing_data_prompt_allow) { it: DialogInterface, _ -> + it.dismiss() + deleteSelected() + } + create() + }.show() + } } private fun deleteSelected() { diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml new file mode 100644 index 000000000..43ec94faf --- /dev/null +++ b/app/src/main/res/values-night/styles.xml @@ -0,0 +1,7 @@ + + + + - - - + + +