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 c03aa6e055..4bdf957ad2 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 745d0d2364..ba47c00180 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 ffda250602..b181ed0750 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)
-
- setNegativeButton(R.string.preferences_delete_browsing_data_prompt_cancel) { dialog: DialogInterface, _ ->
- dialog.cancel()
- }
+ 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) { 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 0000000000..43ec94faf4
--- /dev/null
+++ b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a5201d955c..ea3a35767f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,8 +15,8 @@
- @color/primary_text_normal_theme
- @color/primary_text_normal_theme
- @color/secondary_text_normal_theme
- - @style/DialogStyle
- - @style/DialogStyle
+ - @style/DialogStyleNormal
+ - @style/DialogStyleNormal
- @color/accent_high_contrast_normal_theme
@@ -55,21 +55,28 @@
- ?above
- ?accent
- ?primaryText
- - @style/NegativeButtonStyle
-
-
-
+
+
+
+