From a52858dd5b5a885468cee5b51ec1689391231b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 10:57:38 +0200
Subject: [PATCH 01/28] fixed colors for dialogs in settings screen

---
 .../SettingsAutomaticallyClearWhatFragment.kt      |  4 ++--
 .../SettingsAutomaticallyClearWhenFragment.kt      |  4 ++--
 .../settings_automatically_clear_what_fragment.xml |  3 +++
 .../settings_automatically_clear_when_fragment.xml |  6 ++++++
 app/src/main/res/values/styles.xml                 | 14 ++++++++++++++
 app/src/main/res/values/themes.xml                 |  8 ++++++++
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
index 19ae24f620b7..d8c5b00c9efb 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
@@ -26,7 +26,7 @@ import androidx.fragment.app.DialogFragment
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.settings.clear.ClearWhatOption
 import com.duckduckgo.app.settings.clear.ClearWhatOption.*
-
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class SettingsAutomaticallyClearWhatFragment : DialogFragment() {
 
@@ -41,7 +41,7 @@ class SettingsAutomaticallyClearWhatFragment : DialogFragment() {
         val rootView = View.inflate(activity, R.layout.settings_automatically_clear_what_fragment, null)
         updateCurrentSelect(currentOption, rootView.findViewById(R.id.settingsClearWhatGroup))
 
-        val alertBuilder = AlertDialog.Builder(requireActivity())
+        val alertBuilder = AlertDialog.Builder(requireActivity(), R.style.DaxAlertDialog)
             .setView(rootView)
             .setTitle(R.string.settingsAutomaticallyClearWhat)
             .setPositiveButton(R.string.settingsAutomaticallyClearingDialogSave) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
index 643af0cd156d..8e912ca32802 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
@@ -28,7 +28,7 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.view.show
 import com.duckduckgo.app.settings.clear.ClearWhenOption
 import com.duckduckgo.app.settings.clear.ClearWhenOption.*
-
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class SettingsAutomaticallyClearWhenFragment : DialogFragment() {
 
@@ -48,7 +48,7 @@ class SettingsAutomaticallyClearWhenFragment : DialogFragment() {
 
         updateCurrentSelect(currentOption, rootView.findViewById(R.id.settingsClearWhenGroup))
 
-        val alertBuilder = AlertDialog.Builder(requireActivity())
+        val alertBuilder = MaterialAlertDialogBuilder(requireActivity(), R.style.DaxAlertDialog)
             .setView(rootView)
             .setTitle(R.string.settingsAutomaticallyClearWhat)
             .setPositiveButton(R.string.settingsAutomaticallyClearingDialogSave) { _, _ ->
diff --git a/app/src/main/res/layout/settings_automatically_clear_what_fragment.xml b/app/src/main/res/layout/settings_automatically_clear_what_fragment.xml
index f9a14e6e94c3..bc1e5a3a9474 100644
--- a/app/src/main/res/layout/settings_automatically_clear_what_fragment.xml
+++ b/app/src/main/res/layout/settings_automatically_clear_what_fragment.xml
@@ -31,6 +31,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <RadioButton
+            style="@style/DaxDialogRadioButton"
             android:id="@+id/settingNone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -41,6 +42,7 @@
             android:text="@string/settingsAutomaticallyClearWhatOptionNone" />
 
         <RadioButton
+            style="@style/DaxDialogRadioButton"
             android:id="@+id/settingTabsOnly"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -51,6 +53,7 @@
             android:text="@string/settingsAutomaticallyClearWhatOptionTabs" />
 
         <RadioButton
+            style="@style/DaxDialogRadioButton"
             android:id="@+id/settingTabsAndData"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/settings_automatically_clear_when_fragment.xml b/app/src/main/res/layout/settings_automatically_clear_when_fragment.xml
index 2d71dfa8b484..7ae512a32ff0 100644
--- a/app/src/main/res/layout/settings_automatically_clear_when_fragment.xml
+++ b/app/src/main/res/layout/settings_automatically_clear_when_fragment.xml
@@ -33,6 +33,7 @@
 
         <RadioButton
             android:id="@+id/settingAppExitOnly"
+            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -43,6 +44,7 @@
 
         <RadioButton
             android:id="@+id/settingInactive5Seconds"
+            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -55,6 +57,7 @@
 
         <RadioButton
             android:id="@+id/settingInactive5Mins"
+            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -65,6 +68,7 @@
 
         <RadioButton
             android:id="@+id/settingInactive15Mins"
+            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -75,6 +79,7 @@
 
         <RadioButton
             android:id="@+id/settingInactive30Mins"
+            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -85,6 +90,7 @@
 
         <RadioButton
             android:id="@+id/settingInactive60Mins"
+            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6c20b714a946..2006640b5e6e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -310,4 +310,18 @@
         <item name="android:textColor">?attr/colorAccent</item>
     </style>
 
+    <style name="DaxDialogPositiveButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">?colorAccent</item>
+        <item name="backgroundTint">?colorPrimary</item>
+    </style>
+
+    <style name="DaxDialogNegativeButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">?colorAccent</item>
+        <item name="backgroundTint">?colorPrimary</item>
+    </style>
+
+    <style name="DaxDialogRadioButton">
+        <item name="android:textColor">?normalTextColor</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ccdbb44764b8..bf6f2b1aab68 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -31,6 +31,7 @@
         <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
         <item name="android:statusBarColor">?colorPrimary</item>
         <item name="snackbarButtonStyle">@style/snackbarButtonStyle</item>
+        <item name="materialAlertDialogTheme">@style/DaxAlertDialog</item>
     </style>
 
     <style name="AppTheme.BaseDark">
@@ -224,4 +225,11 @@
         <item name="android:textColorSecondary">?bottomBarIconColor</item>
     </style>
 
+    <style name="DaxAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+        <item name="android:background">?colorPrimary</item>
+        <item name="colorOnSurface">?normalTextColor</item>
+        <item name="buttonBarPositiveButtonStyle">@style/DaxDialogPositiveButton</item>
+        <item name="buttonBarNegativeButtonStyle">@style/DaxDialogNegativeButton</item>
+    </style>
+
 </resources>

From 3ce15a27995003f6c4ec619d9b7de9017893cc17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 11:04:33 +0200
Subject: [PATCH 02/28] change app icon dialog styling

---
 .../main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt | 3 ++-
 .../app/settings/SettingsAutomaticallyClearWhatFragment.kt     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
index 85da644eb39c..99be9a3593d5 100644
--- a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
@@ -24,6 +24,7 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.DuckDuckGoActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.android.synthetic.main.content_app_icons.appIconsList
 import kotlinx.android.synthetic.main.include_toolbar.toolbar
 
@@ -80,7 +81,7 @@ class ChangeIconActivity : DuckDuckGoActivity() {
                 finish()
             }
             is ChangeIconViewModel.Command.ShowConfirmationDialog -> {
-                AlertDialog.Builder(this)
+                MaterialAlertDialogBuilder(this, R.style.DaxAlertDialog)
                     .setTitle(R.string.changeIconDialogTitle)
                     .setMessage(getString(R.string.changeIconDialogMessage))
                     .setPositiveButton(R.string.changeIconCtaAccept) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
index d8c5b00c9efb..fd42a6adb128 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
@@ -41,7 +41,7 @@ class SettingsAutomaticallyClearWhatFragment : DialogFragment() {
         val rootView = View.inflate(activity, R.layout.settings_automatically_clear_what_fragment, null)
         updateCurrentSelect(currentOption, rootView.findViewById(R.id.settingsClearWhatGroup))
 
-        val alertBuilder = AlertDialog.Builder(requireActivity(), R.style.DaxAlertDialog)
+        val alertBuilder = MaterialAlertDialogBuilder(requireActivity(), R.style.DaxAlertDialog)
             .setView(rootView)
             .setTitle(R.string.settingsAutomaticallyClearWhat)
             .setPositiveButton(R.string.settingsAutomaticallyClearingDialogSave) { _, _ ->

From 903a2f785b630d2cd40c53dbaa5d618688b91e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 11:07:47 +0200
Subject: [PATCH 03/28] changed dialog for report broken site

---
 .../java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
index 60dbfa5c4639..ac5cd28ae668 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
@@ -57,7 +57,7 @@ class BrokenSiteActivity : DuckDuckGoActivity() {
         val categories = viewModel.categories.map { getString(it.category) }.toTypedArray()
 
         categoriesSelection.setOnClickListener {
-            MaterialAlertDialogBuilder(this)
+            MaterialAlertDialogBuilder(this, R.style.DaxAlertDialog)
                 .setTitle(getString(R.string.brokenSitesCategoriesTitle))
                 .setSingleChoiceItems(categories, viewModel.indexSelected) { _, newIndex ->
                     viewModel.onCategoryIndexChanged(newIndex)

From 94e2a2df0e180e9a2fce27a4f150575fa3510c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 11:33:55 +0200
Subject: [PATCH 04/28] fixing edit bookmark dialog theming

---
 .../app/bookmarks/ui/EditBookmarkDialogFragment.kt   |  3 ++-
 app/src/main/res/layout/edit_bookmark.xml            |  2 ++
 app/src/main/res/values/themes.xml                   | 12 ++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
index e0968400cec8..fd83360a269f 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
@@ -26,6 +26,7 @@ import androidx.fragment.app.DialogFragment
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.view.hideKeyboard
 import com.duckduckgo.app.global.view.showKeyboard
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.jetbrains.anko.find
 
 
@@ -43,7 +44,7 @@ class EditBookmarkDialogFragment : DialogFragment() {
         val titleInput = rootView.find<EditText>(R.id.titleInput)
         val urlInput = rootView.find<EditText>(R.id.urlInput)
 
-        val alertBuilder = AlertDialog.Builder(requireActivity())
+        val alertBuilder = MaterialAlertDialogBuilder(requireActivity(), R.style.DaxAlertDialog)
             .setView(rootView)
             .setTitle(R.string.bookmarkTitleEdit)
             .setPositiveButton(R.string.bookmarkSave) { _, _ ->
diff --git a/app/src/main/res/layout/edit_bookmark.xml b/app/src/main/res/layout/edit_bookmark.xml
index 27e886f98627..e4cff86e51bf 100644
--- a/app/src/main/res/layout/edit_bookmark.xml
+++ b/app/src/main/res/layout/edit_bookmark.xml
@@ -36,6 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/bookmarkTitleHint"
+            android:textColor="?normalTextColor"
             android:inputType="text|textCapWords" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -54,6 +55,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/bookmarkUrlHint"
+            android:textColor="?normalTextColor"
             android:inputType="textUri" />
 
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bf6f2b1aab68..89f750f3f6a7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -202,12 +202,12 @@
     </style>
 
     <style name="TextInputLayoutTheme" parent="Widget.Design.TextInputLayout">
-        <item name="colorControlActivated">@color/cornflowerBlue</item>
-        <item name="colorControlNormal">@color/cornflowerBlue</item>
-        <item name="colorControlHighlight">@color/cornflowerBlue</item>
-        <item name="android:textColor">@color/grayish</item>
-        <item name="android:textColorSecondary">@color/grayish</item>
-        <item name="android:textColorHint">@color/grayish</item>
+        <item name="colorControlActivated">?colorAccent</item>
+        <item name="colorControlNormal">?colorAccent</item>
+        <item name="colorControlHighlight">?colorAccent</item>
+        <item name="android:textColor">?normalTextColor</item>
+        <item name="android:textColorSecondary">?normalTextColor</item>
+        <item name="android:textColorHint">?normalTextColor</item>
     </style>
 
     <style name="AutoCompleteTextViewStyle" parent="Widget.AppCompat.AutoCompleteTextView">

From 2c387cf505bfd2a275ab60976d0e87115f45cc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 11:47:17 +0200
Subject: [PATCH 05/28] no need to set the theme per dialog, it inherits from
 the theme

---
 .../app/bookmarks/ui/BookmarksActivity.kt     | 21 +++++++++++++------
 .../ui/EditBookmarkDialogFragment.kt          |  2 +-
 .../app/brokensite/BrokenSiteActivity.kt      |  2 +-
 .../app/icon/ui/ChangeIconActivity.kt         |  2 +-
 .../SettingsAutomaticallyClearWhatFragment.kt |  3 +--
 .../SettingsAutomaticallyClearWhenFragment.kt |  2 +-
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
index 353cb5eb156c..17d819ef3dd6 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
@@ -16,7 +16,6 @@
 
 package com.duckduckgo.app.bookmarks.ui
 
-import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -28,6 +27,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.PopupMenu
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -43,6 +43,8 @@ import com.duckduckgo.app.global.faviconLocation
 import com.duckduckgo.app.global.image.GlideApp
 import com.duckduckgo.app.global.view.gone
 import com.duckduckgo.app.global.view.show
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.dialog.MaterialDialogs
 import kotlinx.android.synthetic.main.content_bookmarks.*
 import kotlinx.android.synthetic.main.include_toolbar.*
 import kotlinx.android.synthetic.main.view_bookmark_entry.view.*
@@ -129,11 +131,18 @@ class BookmarksActivity : DuckDuckGoActivity() {
         val message =
             Html.fromHtml(getString(R.string.bookmarkDeleteConfirmMessage, bookmark.title))
         val title = getString(R.string.bookmarkDeleteConfirmTitle)
-        deleteDialog = alert(message, title) {
-            positiveButton(android.R.string.yes) { delete(bookmark) }
-            negativeButton(android.R.string.no) { }
-        }.build()
-        deleteDialog?.show()
+
+        deleteDialog = MaterialAlertDialogBuilder(this)
+            .setTitle(title)
+            .setMessage(message)
+            .setPositiveButton(android.R.string.yes) { _, _ ->
+                delete(bookmark)
+            }
+            .setNegativeButton(android.R.string.no) { dialog, _ ->
+                dialog.dismiss()
+            }
+            .show()
+
     }
 
     private fun delete(bookmark: BookmarkEntity) {
diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
index fd83360a269f..ff4651924f3d 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
@@ -44,7 +44,7 @@ class EditBookmarkDialogFragment : DialogFragment() {
         val titleInput = rootView.find<EditText>(R.id.titleInput)
         val urlInput = rootView.find<EditText>(R.id.urlInput)
 
-        val alertBuilder = MaterialAlertDialogBuilder(requireActivity(), R.style.DaxAlertDialog)
+        val alertBuilder = MaterialAlertDialogBuilder(requireActivity())
             .setView(rootView)
             .setTitle(R.string.bookmarkTitleEdit)
             .setPositiveButton(R.string.bookmarkSave) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
index ac5cd28ae668..60dbfa5c4639 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
@@ -57,7 +57,7 @@ class BrokenSiteActivity : DuckDuckGoActivity() {
         val categories = viewModel.categories.map { getString(it.category) }.toTypedArray()
 
         categoriesSelection.setOnClickListener {
-            MaterialAlertDialogBuilder(this, R.style.DaxAlertDialog)
+            MaterialAlertDialogBuilder(this)
                 .setTitle(getString(R.string.brokenSitesCategoriesTitle))
                 .setSingleChoiceItems(categories, viewModel.indexSelected) { _, newIndex ->
                     viewModel.onCategoryIndexChanged(newIndex)
diff --git a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
index 99be9a3593d5..8af89a1045fc 100644
--- a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
@@ -81,7 +81,7 @@ class ChangeIconActivity : DuckDuckGoActivity() {
                 finish()
             }
             is ChangeIconViewModel.Command.ShowConfirmationDialog -> {
-                MaterialAlertDialogBuilder(this, R.style.DaxAlertDialog)
+                MaterialAlertDialogBuilder(this)
                     .setTitle(R.string.changeIconDialogTitle)
                     .setMessage(getString(R.string.changeIconDialogMessage))
                     .setPositiveButton(R.string.changeIconCtaAccept) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
index fd42a6adb128..859b6bdc769a 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
@@ -21,7 +21,6 @@ import android.os.Bundle
 import android.view.View
 import android.widget.RadioGroup
 import androidx.annotation.IdRes
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.settings.clear.ClearWhatOption
@@ -41,7 +40,7 @@ class SettingsAutomaticallyClearWhatFragment : DialogFragment() {
         val rootView = View.inflate(activity, R.layout.settings_automatically_clear_what_fragment, null)
         updateCurrentSelect(currentOption, rootView.findViewById(R.id.settingsClearWhatGroup))
 
-        val alertBuilder = MaterialAlertDialogBuilder(requireActivity(), R.style.DaxAlertDialog)
+        val alertBuilder = MaterialAlertDialogBuilder(requireActivity())
             .setView(rootView)
             .setTitle(R.string.settingsAutomaticallyClearWhat)
             .setPositiveButton(R.string.settingsAutomaticallyClearingDialogSave) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
index 8e912ca32802..7cbe1ac3ef93 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
@@ -48,7 +48,7 @@ class SettingsAutomaticallyClearWhenFragment : DialogFragment() {
 
         updateCurrentSelect(currentOption, rootView.findViewById(R.id.settingsClearWhenGroup))
 
-        val alertBuilder = MaterialAlertDialogBuilder(requireActivity(), R.style.DaxAlertDialog)
+        val alertBuilder = MaterialAlertDialogBuilder(requireActivity())
             .setView(rootView)
             .setTitle(R.string.settingsAutomaticallyClearWhat)
             .setPositiveButton(R.string.settingsAutomaticallyClearingDialogSave) { _, _ ->

From e5bdd594bddf7531bbe7f09b05b47865f1a46bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 15:20:04 +0200
Subject: [PATCH 06/28] using the new popup menu

---
 .../app/bookmarks/ui/BookmarksActivity.kt     | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
index 353cb5eb156c..5ee64f866ab6 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
@@ -16,7 +16,6 @@
 
 package com.duckduckgo.app.bookmarks.ui
 
-import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -27,7 +26,7 @@ import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.PopupMenu
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -43,10 +42,16 @@ import com.duckduckgo.app.global.faviconLocation
 import com.duckduckgo.app.global.image.GlideApp
 import com.duckduckgo.app.global.view.gone
 import com.duckduckgo.app.global.view.show
-import kotlinx.android.synthetic.main.content_bookmarks.*
-import kotlinx.android.synthetic.main.include_toolbar.*
-import kotlinx.android.synthetic.main.view_bookmark_entry.view.*
-import org.jetbrains.anko.alert
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.android.synthetic.main.content_bookmarks.emptyBookmarks
+import kotlinx.android.synthetic.main.content_bookmarks.recycler
+import kotlinx.android.synthetic.main.include_toolbar.toolbar
+import kotlinx.android.synthetic.main.popup_window_bookmarks_menu.view.deleteBookmark
+import kotlinx.android.synthetic.main.popup_window_bookmarks_menu.view.editBookmark
+import kotlinx.android.synthetic.main.view_bookmark_entry.view.favicon
+import kotlinx.android.synthetic.main.view_bookmark_entry.view.overflowMenu
+import kotlinx.android.synthetic.main.view_bookmark_entry.view.title
+import kotlinx.android.synthetic.main.view_bookmark_entry.view.url
 import timber.log.Timber
 
 class BookmarksActivity : DuckDuckGoActivity() {
@@ -65,7 +70,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
     }
 
     private fun setupBookmarksRecycler() {
-        adapter = BookmarksAdapter(applicationContext, viewModel)
+        adapter = BookmarksAdapter(layoutInflater, viewModel)
         recycler.adapter = adapter
 
         val separator = DividerItemDecoration(this, VERTICAL)
@@ -129,11 +134,17 @@ class BookmarksActivity : DuckDuckGoActivity() {
         val message =
             Html.fromHtml(getString(R.string.bookmarkDeleteConfirmMessage, bookmark.title))
         val title = getString(R.string.bookmarkDeleteConfirmTitle)
-        deleteDialog = alert(message, title) {
-            positiveButton(android.R.string.yes) { delete(bookmark) }
-            negativeButton(android.R.string.no) { }
-        }.build()
-        deleteDialog?.show()
+
+        deleteDialog = MaterialAlertDialogBuilder(this)
+            .setTitle(title)
+            .setMessage(message)
+            .setPositiveButton(android.R.string.yes) { _, _ ->
+                delete(bookmark)
+            }
+            .setNegativeButton(android.R.string.no) { dialog, _ ->
+                dialog.dismiss()
+            }
+            .show()
     }
 
     private fun delete(bookmark: BookmarkEntity) {
@@ -155,7 +166,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
     }
 
     class BookmarksAdapter(
-        private val context: Context,
+        private val layoutInflater: LayoutInflater,
         private val viewModel: BookmarksViewModel
     ) : Adapter<BookmarksViewHolder>() {
 
@@ -168,7 +179,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BookmarksViewHolder {
             val inflater = LayoutInflater.from(parent.context)
             val view = inflater.inflate(R.layout.view_bookmark_entry, parent, false)
-            return BookmarksViewHolder(view, viewModel)
+            return BookmarksViewHolder(layoutInflater, view, viewModel)
         }
 
         override fun onBindViewHolder(holder: BookmarksViewHolder, position: Int) {
@@ -180,8 +191,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
         }
     }
 
-    class BookmarksViewHolder(itemView: View, private val viewModel: BookmarksViewModel) :
-        ViewHolder(itemView) {
+    class BookmarksViewHolder(val layoutInflater: LayoutInflater, itemView: View, private val viewModel: BookmarksViewModel) : ViewHolder(itemView) {
 
         lateinit var bookmark: BookmarkEntity
 
@@ -221,26 +231,16 @@ class BookmarksActivity : DuckDuckGoActivity() {
             return uri.baseHost ?: return urlString
         }
 
-        private fun showOverFlowMenu(overflowMenu: ImageView, bookmark: BookmarkEntity) {
-            val popup = PopupMenu(overflowMenu.context, overflowMenu)
-            popup.inflate(R.menu.bookmarks_individual_overflow_menu)
-            popup.setOnMenuItemClickListener {
-                when (it.itemId) {
-
-                    R.id.edit -> {
-                        editBookmark(bookmark); true
-                    }
-                    R.id.delete -> {
-                        deleteBookmark(bookmark); true
-                    }
-                    else -> false
-
-                }
+        private fun showOverFlowMenu(anchor: ImageView, bookmark: BookmarkEntity) {
+            val popupMenu = BookmarksPopupMenu(layoutInflater)
+            val view = popupMenu.contentView
+            popupMenu.apply {
+                onMenuItemClicked(view.editBookmark) { editBookmark(bookmark) }
+                onMenuItemClicked(view.deleteBookmark) { deleteBookmark(bookmark) }
             }
-            popup.show()
+            popupMenu.show(itemView, anchor)
         }
 
-
         private fun editBookmark(bookmark: BookmarkEntity) {
             Timber.i("Editing bookmark ${bookmark.title}")
             viewModel.onEditBookmarkRequested(bookmark)

From 0f72ed5e715c48fb6f9670ef002594a0cbee7b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 15:20:57 +0200
Subject: [PATCH 07/28] added new popup menu

---
 .../app/bookmarks/ui/BookmarksPopupMenu.kt    | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt

diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt
new file mode 100644
index 000000000000..bbb96ffe28cc
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2020 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.bookmarks.ui
+
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Build.VERSION.SDK_INT
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.PopupWindow
+import com.duckduckgo.app.browser.BrowserPopupMenu
+import com.duckduckgo.app.browser.R
+
+class BookmarksPopupMenu(layoutInflater: LayoutInflater, view: View = inflate(layoutInflater, R.layout.popup_window_bookmarks_menu)) :
+    PopupWindow(view, WRAP_CONTENT, WRAP_CONTENT, true) {
+
+    // popupwindow gets stuck on the screen on API 22 (tested on 23) without a background
+    // color.  Adding it however garbles the elevation so we cannot have elevation here.
+
+    init {
+        if (SDK_INT <= 22) {
+            // popupwindow gets stuck on the screen on API 22 (tested on 23) without a background
+            // color.  Adding it however garbles the elevation so we cannot have elevation here.
+            setBackgroundDrawable(ColorDrawable(Color.WHITE))
+        } else {
+            elevation = 6.toFloat()
+        }
+        animationStyle = android.R.style.Animation_Dialog
+    }
+
+    fun onMenuItemClicked(menuView: View, onClick: () -> Unit) {
+        menuView.setOnClickListener {
+            onClick()
+            dismiss()
+        }
+    }
+
+    fun show(rootView: View, anchorView: View) {
+        val anchorLocation = IntArray(2)
+        anchorView.getLocationOnScreen(anchorLocation)
+        val x = MARGIN
+        val y = anchorLocation[1] + MARGIN
+        showAtLocation(rootView, Gravity.TOP or Gravity.END, x, y)
+    }
+
+    companion object {
+
+        private const val MARGIN = 30
+
+        fun inflate(layoutInflater: LayoutInflater, resourceId: Int): View {
+            return layoutInflater.inflate(resourceId, null)
+        }
+    }
+}
+

From c5714de2b2d7ef3300f1fa44e4bb4a3a255630a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 15:42:17 +0200
Subject: [PATCH 08/28] added popup layout

---
 .../layout/popup_window_bookmarks_menu.xml    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 app/src/main/res/layout/popup_window_bookmarks_menu.xml

diff --git a/app/src/main/res/layout/popup_window_bookmarks_menu.xml b/app/src/main/res/layout/popup_window_bookmarks_menu.xml
new file mode 100644
index 000000000000..337d368d472a
--- /dev/null
+++ b/app/src/main/res/layout/popup_window_bookmarks_menu.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2018 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="13dp"
+    android:paddingBottom="20dp"
+    android:background="@drawable/popup_menu_bg">
+
+    <TextView
+        android:id="@+id/editBookmark"
+        style="@style/BrowserTextMenuItem"
+        android:text="@string/edit" />
+
+    <TextView
+        android:id="@+id/deleteBookmark"
+        style="@style/BrowserTextMenuItem"
+        android:text="@string/delete" />
+
+</LinearLayout>

From e996e4a13fa8290f913202e07d91b4ab73c1c037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 16:04:46 +0200
Subject: [PATCH 09/28] added support for dark theme in fire dialog

---
 .../res/drawable/ic_cancel_brownish_24dp.xml  |  2 +-
 app/src/main/res/drawable/ic_fire_red.xml     | 25 +++++++++++++++++++
 .../main/res/layout/sheet_fire_clear_data.xml |  8 +++---
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/colors.xml            |  3 ++-
 app/src/main/res/values/themes.xml            |  3 +++
 6 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_fire_red.xml

diff --git a/app/src/main/res/drawable/ic_cancel_brownish_24dp.xml b/app/src/main/res/drawable/ic_cancel_brownish_24dp.xml
index 1052e0370478..796f2febb521 100644
--- a/app/src/main/res/drawable/ic_cancel_brownish_24dp.xml
+++ b/app/src/main/res/drawable/ic_cancel_brownish_24dp.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/brownishGray"
+        android:fillColor="?normalTextColor"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_fire_red.xml b/app/src/main/res/drawable/ic_fire_red.xml
new file mode 100644
index 000000000000..bad99ae4add3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fire_red.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2019 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/fireIcon"
+        android:pathData="M10.208,22.307c-2.552,-0.843 -4.667,-2.904 -5.762,-6.043C2.818,11.79 6.172,8.23 6.172,8.23s-0.097,0.913 0.316,1.92c0.413,1.007 1.216,1.734 1.216,1.734S6.926,9.775 8.822,6.26c2.14,-3.959 6.855,-4.803 6.855,-4.803S14.486,3.356 15.02,5.3c0.414,1.453 1.094,2.156 1.848,4.123 0.754,2.015 0.632,3.116 0.632,3.116s0.22,-1.24 0.754,-2.084C19.42,8.603 21,8.159 21,8.159s-0.826,1.686 -0.631,3.958c0.145,1.664 0.388,3.585 -0.511,5.74 -0.706,1.71 -2.747,4.052 -5.615,4.685 1.653,-0.703 2.746,-2.343 2.625,-4.123 -0.073,-1.03 -0.705,-2.015 -1.385,-2.694 -0.413,2.6 -1.896,2.905 -1.896,2.905s0.85,-1.71 0.972,-3.608a5.997,5.997 0,0 0,-0.219 -2.342c-0.777,-2.694 -2.114,-3.42 -2.114,-3.42s0.438,1.568 -1.167,4.099c-1.119,1.757 -3.015,3.045 -2.942,5.669 0.05,1.405 0.9,2.6 2.091,3.28z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_fire_clear_data.xml b/app/src/main/res/layout/sheet_fire_clear_data.xml
index 862a7c1da0bf..d8c5aff400ed 100644
--- a/app/src/main/res/layout/sheet_fire_clear_data.xml
+++ b/app/src/main/res/layout/sheet_fire_clear_data.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    android:background="?colorPrimary"
     app:layout_behavior="@string/bottom_sheet_behavior">
 
     <TextView
@@ -27,7 +27,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
-        android:drawableStart="@drawable/icon_fire_glyph_24dp"
+        android:drawableStart="@drawable/ic_fire_red"
         android:drawablePadding="24dp"
         android:fontFamily="sans-serif"
         android:paddingStart="24dp"
@@ -35,7 +35,7 @@
         android:paddingEnd="24dp"
         android:paddingBottom="17dp"
         android:text="@string/fireClearAll"
-        android:textColor="@color/brickOrange"
+        android:textColor="?fireIcon"
         android:textSize="16sp"
         android:textStyle="normal"
         app:layout_constraintEnd_toEndOf="parent"
@@ -56,7 +56,7 @@
         android:paddingEnd="24dp"
         android:paddingBottom="24dp"
         android:text="@string/fireCancel"
-        android:textColor="@color/brownishGray"
+        android:textColor="?normalTextColor"
         android:textSize="16sp"
         android:textStyle="normal"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 084377713189..88e55c80fede 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -62,6 +62,7 @@
     <attr name="privacyDashboardLogoLetterTextColor" format="color" />
     <attr name="bottomBarIconColor" format="color" />
     <attr name="bottomBarIconColorDisabled" format="color" />
+    <attr name="fireIcon" format="color" />
 
     <declare-styleable name="BottomNavigationBar">
         <attr name="layoutResource" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1d9ae0cc427f..db85afa575ea 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -66,7 +66,8 @@
     <color name="whiteSix">#e5e5e5</color>
     <color name="pinkish_grey_two">#c0c0c0</color>
 
-    <color name="brickOrange">#d03a10</color>
+    <color name="brickOrangeLight">#CE2929</color>
+    <color name="brickOrangeDark">#FA5252</color>
 
     <color name="powderBlue">#50bfff</color>
     <color name="warmBlue">#3f66d5</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ccdbb44764b8..f98f3e51ff88 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -87,6 +87,7 @@
         <item name="bottomBarIconColor">@color/grayish</item>
         <item name="bottomBarIconColorDisabled">@color/midGray</item>
 
+        <item name="fireIcon">@color/brickOrangeDark</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.BaseDark" />
@@ -161,6 +162,8 @@
         <item name="bottomBarIconColor">@color/grayishBrown</item>
         <item name="bottomBarIconColorDisabled">@color/pinkish_grey_two</item>
 
+        <item name="fireIcon">@color/brickOrangeLight</item>
+
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.BaseLight">

From dd69615a2b1b357b20b22c4229e75af750326333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 7 May 2020 16:30:34 +0200
Subject: [PATCH 10/28] all dialogs are using the same theme

---
 .../com/duckduckgo/app/browser/BrowserTabFragment.kt     | 3 ++-
 .../app/browser/rating/ui/AppEnjoymentDialogFragment.kt  | 4 ++--
 .../app/browser/rating/ui/GiveFeedbackDialogFragment.kt  | 4 ++--
 .../app/browser/rating/ui/RateAppDialogFragment.kt       | 4 ++--
 app/src/main/res/values/styles.xml                       | 9 ---------
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index f30c1a232129..0600d47493f7 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -132,6 +132,7 @@ import com.duckduckgo.app.tabs.ui.TabSwitcherActivity
 import com.duckduckgo.app.tabs.ui.TabSwitcherBottomBarFeatureActivity
 import com.duckduckgo.app.widget.ui.AddWidgetInstructionsActivity
 import com.duckduckgo.widget.SearchWidgetLight
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_browser_tab.autoCompleteSuggestionsList
@@ -712,7 +713,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi
         val isShowing = alertDialog?.isShowing
 
         if (isShowing != true) {
-            alertDialog = AlertDialog.Builder(context)
+            alertDialog = MaterialAlertDialogBuilder(context)
                 .setTitle(R.string.launchingExternalApp)
                 .setMessage(getString(R.string.confirmOpenExternalApp))
                 .setPositiveButton(R.string.yes) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
index 6693851a8d31..404c6b9a6bc7 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
@@ -23,7 +23,7 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
-
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class AppEnjoymentDialogFragment : EnjoymentDialog() {
 
@@ -38,7 +38,7 @@ class AppEnjoymentDialogFragment : EnjoymentDialog() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         firePixelWithPromptCount(APP_ENJOYMENT_DIALOG_SHOWN)
 
-        return AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme)
+        return MaterialAlertDialogBuilder(requireActivity())
             .setTitle(R.string.appEnjoymentDialogTitle)
             .setMessage(R.string.appEnjoymentDialogMessage)
             .setPositiveButton(R.string.appEnjoymentDialogPositiveButton) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
index 1599ae16ec1e..b592b5593b1b 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
@@ -23,7 +23,7 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
-
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class GiveFeedbackDialogFragment : EnjoymentDialog() {
 
@@ -38,7 +38,7 @@ class GiveFeedbackDialogFragment : EnjoymentDialog() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         firePixelWithPromptCount(APP_FEEDBACK_DIALOG_SHOWN)
 
-        return AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme)
+        return MaterialAlertDialogBuilder(requireActivity())
             .setTitle(R.string.giveFeedbackDialogTitle)
             .setMessage(R.string.giveFeedbackDialogMessage)
             .setPositiveButton(R.string.giveFeedbackDialogPositiveButton) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
index 8e87bd233374..d038c12e320e 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
@@ -23,7 +23,7 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
-
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class RateAppDialogFragment : EnjoymentDialog() {
 
@@ -38,7 +38,7 @@ class RateAppDialogFragment : EnjoymentDialog() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         firePixelWithPromptCount(APP_RATING_DIALOG_SHOWN)
 
-        return AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme)
+        return MaterialAlertDialogBuilder(requireActivity())
             .setTitle(R.string.rateAppDialogTitle)
             .setMessage(R.string.rateAppDialogMessage)
             .setPositiveButton(R.string.rateAppDialogPositiveButton) { _, _ ->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 36b151ef6e36..7da6b408cd6e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -202,15 +202,6 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="buttonBarNegativeButtonStyle">@style/AlertDialogButtonStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/AlertDialogButtonStyle</item>
-    </style>
-
-    <style name="AlertDialogButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-        <item name="android:textColor">@color/cornflowerBlue</item>
-    </style>
-
     <style name="FeedbackFragmentStyle">
         <item name="android:background">?attr/colorPrimaryDark</item>
         <item name="android:layout_width">match_parent</item>

From d379849495a2fc214cff14809852886668ca112b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Fri, 8 May 2020 14:23:59 +0200
Subject: [PATCH 11/28] using white instead of grayish

---
 app/src/main/res/layout/activity_system_search.xml | 2 +-
 app/src/main/res/layout/item_tab.xml               | 2 +-
 app/src/main/res/values/colors.xml                 | 2 +-
 app/src/main/res/values/themes.xml                 | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
index 43c06a1e8cdb..8e4a25cc31be 100644
--- a/app/src/main/res/layout/activity_system_search.xml
+++ b/app/src/main/res/layout/activity_system_search.xml
@@ -142,7 +142,7 @@
                 android:paddingEnd="16dp"
                 android:paddingBottom="2dp"
                 android:text="@string/systemSearchDeviceAppLabel"
-                android:textColor="@color/grayish"
+                android:textColor="?normalTextColor"
                 android:textSize="13sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_tab.xml b/app/src/main/res/layout/item_tab.xml
index 1375e0ee704e..0779ba621c71 100644
--- a/app/src/main/res/layout/item_tab.xml
+++ b/app/src/main/res/layout/item_tab.xml
@@ -68,7 +68,7 @@
             android:contentDescription="@string/closeContentDescription"
             android:scaleType="center"
             android:src="@drawable/ic_close_tab"
-            android:tint="@color/grayish"
+            android:tint="?normalTextColor"
             app:layout_constraintBottom_toBottomOf="@id/favicon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/favicon" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1d9ae0cc427f..9afc85b7e63e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,7 +32,7 @@
 
     <!-- Universal -->
     <color name="dimmed">#99000000</color>
-    <color name="white">#ffffff</color>
+    <color name="white">#FFFFFF</color>
     <color name="whiteSemiTransparent">#d6ffffff</color>
     <color name="whiteTwo">#e4e4e4</color>
     <color name="whiteThree">#f5f5f5</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cc2a40aa7396..bf4233ba00e0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -39,8 +39,8 @@
         <item name="colorPrimaryDark">@color/darkThemePrimaryDark</item>
         <item name="daxLogoTextColor">@color/white</item>
         <item name="normalTextColor">@color/white</item>
-        <item name="toolbarIconColor">@color/grayish</item>
-        <item name="toolbarTextColor">@color/grayish</item>
+        <item name="toolbarIconColor">@color/white</item>
+        <item name="toolbarTextColor">@color/white</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_dark</item>
         <item name="browserMenuTextColor">@color/white</item>
         <item name="browserMenuTextColorDisabled">@color/midGray</item>
@@ -176,7 +176,7 @@
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
-        <item name="toolbarIconColor">@color/grayish</item>
+        <item name="toolbarIconColor">@color/white</item>
     </style>
 
     <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">

From b96c37abe24122b0e4d76904603661ae9464ebcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Fri, 8 May 2020 15:06:49 +0200
Subject: [PATCH 12/28] changed text and icon colors in light and dark mode

---
 .../browser_icon_color_selector_dark.xml      |  2 +-
 .../browser_icon_color_selector_light.xml     |  2 +-
 .../main/res/layout/view_bookmark_entry.xml   |  2 +-
 app/src/main/res/values/colors.xml            |  2 +-
 app/src/main/res/values/themes.xml            | 34 +++++++++----------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/color/browser_icon_color_selector_dark.xml b/app/src/main/res/color/browser_icon_color_selector_dark.xml
index c2ff93c64211..cc3056f1256f 100644
--- a/app/src/main/res/color/browser_icon_color_selector_dark.xml
+++ b/app/src/main/res/color/browser_icon_color_selector_dark.xml
@@ -17,5 +17,5 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/midGray" />
-    <item android:color="@color/grayish"/>
+    <item android:color="@color/white"/>
 </selector>
diff --git a/app/src/main/res/color/browser_icon_color_selector_light.xml b/app/src/main/res/color/browser_icon_color_selector_light.xml
index 08729162fab2..4a7816ad6569 100644
--- a/app/src/main/res/color/browser_icon_color_selector_light.xml
+++ b/app/src/main/res/color/browser_icon_color_selector_light.xml
@@ -17,5 +17,5 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/pinkish_grey_two" />
-    <item android:color="@color/grayishBrown"/>
+    <item android:color="@color/almostBlackDark"/>
 </selector>
diff --git a/app/src/main/res/layout/view_bookmark_entry.xml b/app/src/main/res/layout/view_bookmark_entry.xml
index 8510167c09b3..85140bf64def 100644
--- a/app/src/main/res/layout/view_bookmark_entry.xml
+++ b/app/src/main/res/layout/view_bookmark_entry.xml
@@ -43,7 +43,7 @@
         android:layout_marginStart="22dp"
         android:fontFamily="sans-serif"
         android:paddingTop="4dp"
-        android:textColor="?attr/bookmarkTitleTextColor"
+        android:textColor="?attr/normalTextColor"
         android:textSize="16sp"
         android:textStyle="normal"
         app:layout_constraintBottom_toTopOf="@+id/url"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9afc85b7e63e..9defb1fec2cb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -63,7 +63,7 @@
     <color name="coolGray">#969799</color>
     <color name="subtleGray">#f0f0f0</color>
     <color name="subtleGrayTwo">#d8d8d8</color>
-    <color name="whiteSix">#e5e5e5</color>
+    <color name="whiteSix">#e0e0e0</color>
     <color name="pinkish_grey_two">#c0c0c0</color>
 
     <color name="brickOrange">#d03a10</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bf4233ba00e0..06255fae92c5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -110,47 +110,47 @@
     <style name="AppTheme.BaseLight">
         <item name="colorPrimary">@color/lightThemePrimary</item>
         <item name="colorPrimaryDark">@color/lightThemePrimaryDark</item>
-        <item name="daxLogoTextColor">@color/greyishBrownTwo</item>
-        <item name="normalTextColor">@color/grayishBrown</item>
-        <item name="toolbarIconColor">@color/grayishBrown</item>
-        <item name="toolbarTextColor">@color/grayishBrown</item>
+        <item name="daxLogoTextColor">@color/almostBlackDark</item>
+        <item name="normalTextColor">@color/almostBlackDark</item>
+        <item name="toolbarIconColor">@color/almostBlackDark</item>
+        <item name="toolbarTextColor">@color/almostBlackDark</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_light</item>
-        <item name="browserMenuTextColor">@color/brownishGrayTwo</item>
+        <item name="browserMenuTextColor">@color/almostBlackDark</item>
         <item name="browserMenuTextColorDisabled">@color/pinkish_grey_two</item>
         <item name="omnibarRoundedFieldBackgroundColor">@color/whiteFour</item>
-        <item name="omnibarTextColor">@color/brownishGrayTwo</item>
+        <item name="omnibarTextColor">@color/almostBlackDark</item>
         <item name="omnibarHintColor">@color/warmGray</item>
         <item name="omnibarLogoLetterTextColor">@color/whiteFour</item>
-        <item name="autoCompleteTextColor">@color/grayishBrown</item>
+        <item name="autoCompleteTextColor">@color/almostBlackDark</item>
         <item name="autoCompleteSubtitleTextColor">@color/warmerGray</item>
-        <item name="tabTitleTextColor">@color/almostBlack</item>
-        <item name="tabTitleTextColorLegacy">@color/almostBlack</item>
+        <item name="tabTitleTextColor">@color/almostBlackDark</item>
+        <item name="tabTitleTextColorLegacy">@color/almostBlackDark</item>
         <item name="tabSubtitleTextColor">@color/warmerGray</item>
         <item name="tabSelectedBorderColor">@color/cornflowerBlue</item>
         <item name="tabsFireTextColor">@color/warmerGray</item>
         <item name="tabCardBackgroundColor">@color/white</item>
-        <item name="bookmarkIconColor">@color/grayishBrown</item>
-        <item name="bookmarkTitleTextColor">@color/almostBlack</item>
+        <item name="bookmarkIconColor">@color/almostBlackDark</item>
+        <item name="bookmarkTitleTextColor">@color/almostBlackDark</item>
         <item name="bookmarkSubtitleTextColor">@color/warmerGray</item>
-        <item name="settingsItemTextColor">@color/grayishBrown</item>
+        <item name="settingsItemTextColor">@color/almostBlackDark</item>
         <item name="settingsItemTextColorDisabled">@color/pinkish_grey_two</item>
         <item name="settingsMinorTextColor">@color/warmerGray</item>
         <item name="settingsSwitchBackgroundColor">@color/brownishGrayTwo</item>
         <item name="settingsDividerColor">@color/whiteSix</item>
-        <item name="buttonOutlinedTextColor">@color/cornflowerDark</item>
+        <item name="buttonOutlinedTextColor">@color/cornflowerBlue</item>
         <item name="buttonOutlinedBorderColor">@color/grayishThree</item>
-        <item name="callToActionTitleColor">@color/almostBlack</item>
+        <item name="callToActionTitleColor">@color/almostBlackDark</item>
         <item name="callToActionSubtitleColor">@color/brownishGrayTwo</item>
         <item name="daxDialogBackgroundColor">@color/white</item>
-        <item name="daxDialogSecondaryButtonTextColor">@color/grayishBrown</item>
+        <item name="daxDialogSecondaryButtonTextColor">@color/almostBlackDark</item>
         <item name="daxDialogSecondaryButtonRippleColor">@color/subtleGrayTwo</item>
 
-        <item name="brokenSiteSelectionTextColor">@color/almostBlack</item>
+        <item name="brokenSiteSelectionTextColor">@color/almostBlackDark</item>
         <item name="brokenSiteOutlinedColor">@color/grayishTwo</item>
         <item name="brokenSitesButtonDisabledBackgroundColor">@color/subtleGrayTwo</item>
         <item name="brokenSitesButtonDisabledTextColor">@color/white</item>
         <item name="brokenSitesButtonRippleColor">@color/subtleGrayTwo</item>
-        <item name="topCallToActionDescriptionColor">@color/almostBlack</item>
+        <item name="topCallToActionDescriptionColor">@color/almostBlackDark</item>
         <item name="topCallToActionBackgroundColor">@color/white</item>
 
         <item name="feedbackAnonymousFeedbackLabelColor">@color/warmerGray</item>

From 675f91fa8326b1567209003d696789d5b9802569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Fri, 8 May 2020 15:40:43 +0200
Subject: [PATCH 13/28] adding new colors for contrast

---
 .../res/drawable/bottom_navigation_bar_bg.xml    |  2 +-
 app/src/main/res/drawable/popup_menu_bg.xml      |  2 +-
 .../main/res/layout/include_omnibar_toolbar.xml  |  2 +-
 app/src/main/res/layout/include_toolbar.xml      |  1 +
 app/src/main/res/values-v27/themes.xml           |  2 +-
 app/src/main/res/values/attrs.xml                |  2 ++
 app/src/main/res/values/colors.xml               |  7 ++++---
 app/src/main/res/values/styles.xml               |  4 ++--
 app/src/main/res/values/themes.xml               | 16 ++++++++++------
 9 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/drawable/bottom_navigation_bar_bg.xml b/app/src/main/res/drawable/bottom_navigation_bar_bg.xml
index 1cf17cd39fdb..502bf98a50c5 100644
--- a/app/src/main/res/drawable/bottom_navigation_bar_bg.xml
+++ b/app/src/main/res/drawable/bottom_navigation_bar_bg.xml
@@ -49,7 +49,7 @@
     <item>
         <shape
             android:shape="rectangle">
-            <solid android:color="?attr/colorPrimary"/>
+            <solid android:color="?attr/toolbarBgColor"/>
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/popup_menu_bg.xml b/app/src/main/res/drawable/popup_menu_bg.xml
index faaf444af467..548e94e21199 100644
--- a/app/src/main/res/drawable/popup_menu_bg.xml
+++ b/app/src/main/res/drawable/popup_menu_bg.xml
@@ -15,6 +15,6 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/colorPrimary"/>
+    <solid android:color="?attr/dialogBgColor"/>
     <corners android:radius="8dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_omnibar_toolbar.xml b/app/src/main/res/layout/include_omnibar_toolbar.xml
index 57f533edfe67..1356a2119c7c 100644
--- a/app/src/main/res/layout/include_omnibar_toolbar.xml
+++ b/app/src/main/res/layout/include_omnibar_toolbar.xml
@@ -39,7 +39,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="0dp"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
+                android:background="?attr/toolbarBgColor"
                 app:contentInsetEnd="0dp"
                 app:contentInsetStart="0dp"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/include_toolbar.xml b/app/src/main/res/layout/include_toolbar.xml
index fbd3ec411537..71476b424fad 100644
--- a/app/src/main/res/layout/include_toolbar.xml
+++ b/app/src/main/res/layout/include_toolbar.xml
@@ -30,6 +30,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:background="?attr/toolbarBgColor"
         android:theme="@style/ToolbarTheme"
         app:popupTheme="@style/AppTheme.Dark.PopupOverlay" />
 
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index 2159a170cb68..f457f6ee067c 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -21,7 +21,7 @@
     <style name="AppTheme.Dark" parent="AppTheme.BaseDark">
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:navigationBarColor">?toolbarBgColor</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.BaseLight">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 39b958522514..d6a751d2e4db 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,8 +18,10 @@
 
     <attr name="daxLogoTextColor" format="color" />
     <attr name="normalTextColor" format="color" />
+    <attr name="dialogBgColor" format="color" />
     <attr name="toolbarIconColor" format="color" />
     <attr name="toolbarTextColor" format="color" />
+    <attr name="toolbarBgColor" format="color" />
     <attr name="browserIconColorSelector" format="color" />
     <attr name="browserMenuTextColor" format="color" />
     <attr name="browserMenuTextColorDisabled" format="color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9defb1fec2cb..35aea7b2850e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,11 +17,11 @@
 <resources>
 
     <!-- Dark theme primary colors -->
-    <color name="darkThemePrimaryDark">@color/almostBlackDark</color>
+    <color name="darkThemePrimaryDark">@color/black</color>
     <color name="darkThemePrimary">@color/almostBlack</color>
 
     <!-- Light theme primary colors -->
-    <color name="lightThemePrimaryDark">@color/whiteThree</color>
+    <color name="lightThemePrimaryDark">@color/white</color>
     <color name="lightThemePrimary">@color/whiteFive</color>
 
     <!-- Widget colors -->
@@ -43,6 +43,7 @@
     <color name="almostBlackDark">#222222</color>
     <color name="almostBlack">#333333</color>
     <color name="black">#000000</color>
+    <color name="newBlack">#111111</color>
 
     <color name="charcoalGrey">#383838</color>
     <color name="charcoalGreyTwoSemiTransparent">#d6333339</color>
@@ -56,7 +57,7 @@
     <color name="warGreyTwo">#888888</color>
     <color name="warmerGray">#777777</color>
     <color name="silver">#c0c2c9</color>
-    <color name="paleBrownishGray">#b0b0b0</color>
+    <color name="paleBrownishGray">#d0d0d0</color>
     <color name="brownishGray">#5c5c5c</color>
     <color name="brownishGrayTwo">#666666</color>
     <color name="pinkishGrayThree">#cccccc</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7da6b408cd6e..0e474037763a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -303,12 +303,12 @@
 
     <style name="DaxDialogPositiveButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
         <item name="android:textColor">?colorAccent</item>
-        <item name="backgroundTint">?colorPrimary</item>
+        <item name="backgroundTint">?dialogBgColor</item>
     </style>
 
     <style name="DaxDialogNegativeButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
         <item name="android:textColor">?colorAccent</item>
-        <item name="backgroundTint">?colorPrimary</item>
+        <item name="backgroundTint">?dialogBgColor</item>
     </style>
 
     <style name="DaxDialogRadioButton">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 06255fae92c5..26b280a193dc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -21,7 +21,7 @@
         <!-- These neutral colors cover cases before dynamic theme can be applied
              such as the app launch color -->
         <item name="colorPrimary">@color/almostBlackDark</item>
-        <item name="colorPrimaryDark">@color/almostBlackDark</item>
+        <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/cornflowerBlue</item>
         <item name="android:windowBackground">?attr/colorPrimaryDark</item>
         <item name="windowActionBar">false</item>
@@ -29,7 +29,7 @@
         <item name="bottomSheetDialogTheme">@style/BottomSheetDialog</item>
         <item name="android:windowActivityTransitions">true</item>
         <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
-        <item name="android:statusBarColor">?colorPrimary</item>
+        <item name="android:statusBarColor">?toolbarBgColor</item>
         <item name="snackbarButtonStyle">@style/snackbarButtonStyle</item>
         <item name="materialAlertDialogTheme">@style/DaxAlertDialog</item>
     </style>
@@ -41,12 +41,14 @@
         <item name="normalTextColor">@color/white</item>
         <item name="toolbarIconColor">@color/white</item>
         <item name="toolbarTextColor">@color/white</item>
+        <item name="toolbarBgColor">@color/newBlack</item>
+        <item name="dialogBgColor">@color/almostBlackDark</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_dark</item>
         <item name="browserMenuTextColor">@color/white</item>
         <item name="browserMenuTextColorDisabled">@color/midGray</item>
-        <item name="omnibarRoundedFieldBackgroundColor">@color/midGray</item>
+        <item name="omnibarRoundedFieldBackgroundColor">@color/almostBlack</item>
         <item name="omnibarTextColor">@color/white</item>
-        <item name="omnibarHintColor">@color/grayishTwo</item>
+        <item name="omnibarHintColor">@color/paleBrownishGray</item>
         <item name="omnibarLogoLetterTextColor">@color/midGray</item>
         <item name="autoCompleteTextColor">@color/white</item>
         <item name="autoCompleteSubtitleTextColor">@color/grayish</item>
@@ -114,12 +116,14 @@
         <item name="normalTextColor">@color/almostBlackDark</item>
         <item name="toolbarIconColor">@color/almostBlackDark</item>
         <item name="toolbarTextColor">@color/almostBlackDark</item>
+        <item name="toolbarBgColor">@color/white</item>
+        <item name="dialogBgColor">@color/lightThemePrimaryDark</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_light</item>
         <item name="browserMenuTextColor">@color/almostBlackDark</item>
         <item name="browserMenuTextColorDisabled">@color/pinkish_grey_two</item>
         <item name="omnibarRoundedFieldBackgroundColor">@color/whiteFour</item>
         <item name="omnibarTextColor">@color/almostBlackDark</item>
-        <item name="omnibarHintColor">@color/warmGray</item>
+        <item name="omnibarHintColor">@color/brownishGrayTwo</item>
         <item name="omnibarLogoLetterTextColor">@color/whiteFour</item>
         <item name="autoCompleteTextColor">@color/almostBlackDark</item>
         <item name="autoCompleteSubtitleTextColor">@color/warmerGray</item>
@@ -224,7 +228,7 @@
     </style>
 
     <style name="DaxAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="android:background">?colorPrimary</item>
+        <item name="android:background">@drawable/popup_menu_bg</item>
         <item name="colorOnSurface">?normalTextColor</item>
         <item name="buttonBarPositiveButtonStyle">@style/DaxDialogPositiveButton</item>
         <item name="buttonBarNegativeButtonStyle">@style/DaxDialogNegativeButton</item>

From 6a35ddd64c581c9cc919a4cfd0dd9b07774e2542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Fri, 8 May 2020 15:46:38 +0200
Subject: [PATCH 14/28] cleaning up bad color

---
 .../com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt  | 8 --------
 app/src/main/res/values/themes.xml                        | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
index d71aee552404..fec83f527145 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
@@ -16,7 +16,6 @@
 
 package com.duckduckgo.app.bookmarks.ui
 
-import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -28,8 +27,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
-import android.widget.PopupMenu
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -55,11 +52,6 @@ import kotlinx.android.synthetic.main.view_bookmark_entry.view.favicon
 import kotlinx.android.synthetic.main.view_bookmark_entry.view.overflowMenu
 import kotlinx.android.synthetic.main.view_bookmark_entry.view.title
 import kotlinx.android.synthetic.main.view_bookmark_entry.view.url
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.dialog.MaterialDialogs
-import kotlinx.android.synthetic.main.content_bookmarks.*
-import kotlinx.android.synthetic.main.include_toolbar.*
-import kotlinx.android.synthetic.main.view_bookmark_entry.view.*
 import org.jetbrains.anko.alert
 import timber.log.Timber
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index dce4d506cd97..ebe14650bbdd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -232,7 +232,7 @@
     </style>
 
     <style name="DaxAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="android:background">@drawable/popup_menu_bg</item>
+        <item name="android:background">?dialogBgColor</item>
         <item name="colorOnSurface">?normalTextColor</item>
         <item name="buttonBarPositiveButtonStyle">@style/DaxDialogPositiveButton</item>
         <item name="buttonBarNegativeButtonStyle">@style/DaxDialogNegativeButton</item>

From 4ea61caa9b6c13f4e06ba8bb3806093843bebb30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Fri, 8 May 2020 15:56:44 +0200
Subject: [PATCH 15/28] updated bg color in fire dialog

---
 app/src/main/res/layout/sheet_fire_clear_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/sheet_fire_clear_data.xml b/app/src/main/res/layout/sheet_fire_clear_data.xml
index d8c5aff400ed..08d52b692848 100644
--- a/app/src/main/res/layout/sheet_fire_clear_data.xml
+++ b/app/src/main/res/layout/sheet_fire_clear_data.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorPrimary"
+    android:background="?dialogBgColor"
     app:layout_behavior="@string/bottom_sheet_behavior">
 
     <TextView

From e19f59608ce887887e6e5270fabfde9a91c0fbc1 Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Thu, 14 May 2020 17:35:38 +0200
Subject: [PATCH 16/28] adding colors so we pass the color contrast test

---
 .../main/res/drawable/loading_progress.xml    | 35 +++++++++++++++++++
 .../main/res/layout/fragment_browser_tab.xml  |  4 +--
 app/src/main/res/layout/include_cta.xml       |  2 +-
 .../res/layout/include_omnibar_toolbar.xml    |  3 +-
 .../item_autocomplete_bookmark_suggestion.xml |  9 +++--
 .../item_autocomplete_search_suggestion.xml   |  2 +-
 app/src/main/res/layout/item_tab.xml          |  2 +-
 app/src/main/res/values/colors.xml            |  6 ++--
 app/src/main/res/values/themes.xml            |  4 +--
 9 files changed, 51 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/drawable/loading_progress.xml

diff --git a/app/src/main/res/drawable/loading_progress.xml b/app/src/main/res/drawable/loading_progress.xml
new file mode 100644
index 000000000000..4de517b4f678
--- /dev/null
+++ b/app/src/main/res/drawable/loading_progress.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2020 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid
+                android:color="?toolbarBgColor" />
+        </shape>
+    </item>
+
+    <item
+        android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid
+                    android:color="?colorAccent" />
+            </shape>
+        </clip>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_browser_tab.xml b/app/src/main/res/layout/fragment_browser_tab.xml
index ef5f9e496c81..b2bf8f3011e3 100644
--- a/app/src/main/res/layout/fragment_browser_tab.xml
+++ b/app/src/main/res/layout/fragment_browser_tab.xml
@@ -61,8 +61,8 @@
         android:id="@+id/autoCompleteSuggestionsList"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
-        android:backgroundTint="?attr/colorPrimary"
+        android:background="?toolbarBgColor"
+        android:backgroundTint="?toolbarBgColor"
         android:clipToPadding="false"
         android:elevation="4dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
diff --git a/app/src/main/res/layout/include_cta.xml b/app/src/main/res/layout/include_cta.xml
index a7bc15f426a9..664ef7b4a0ca 100644
--- a/app/src/main/res/layout/include_cta.xml
+++ b/app/src/main/res/layout/include_cta.xml
@@ -21,7 +21,7 @@
     android:id="@+id/cta"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary"
+    android:background="?toolbarBgColor"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent">
diff --git a/app/src/main/res/layout/include_omnibar_toolbar.xml b/app/src/main/res/layout/include_omnibar_toolbar.xml
index 1356a2119c7c..b67be4dfbf0f 100644
--- a/app/src/main/res/layout/include_omnibar_toolbar.xml
+++ b/app/src/main/res/layout/include_omnibar_toolbar.xml
@@ -33,7 +33,7 @@
             android:id="@+id/toolbarContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:theme="@style/OmnibarToolbarTheme">
+            android:background="?toolbarBgColor">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
@@ -210,6 +210,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 tools:progress="50"
+                android:progressDrawable="@drawable/loading_progress"
                 tools:visibility="visible" />
 
             <include
diff --git a/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml b/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
index 4796d7998112..eac317bb8e60 100644
--- a/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
+++ b/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
@@ -26,7 +26,7 @@
         android:id="@+id/bookmarkIndicator"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="18dp"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_autocomplete_bookmark"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -37,9 +37,9 @@
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
         android:ellipsize="end"
-        android:letterSpacing="0"
+        android:includeFontPadding="false"
         android:fontFamily="sans-serif"
         android:gravity="center_vertical|start"
         android:maxLines="1"
@@ -55,9 +55,8 @@
         android:id="@+id/url"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
         android:ellipsize="end"
-        android:letterSpacing="0"
         android:fontFamily="sans-serif"
         android:gravity="center_vertical|start"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/item_autocomplete_search_suggestion.xml b/app/src/main/res/layout/item_autocomplete_search_suggestion.xml
index b929cfa9d7bd..25132140587b 100644
--- a/app/src/main/res/layout/item_autocomplete_search_suggestion.xml
+++ b/app/src/main/res/layout/item_autocomplete_search_suggestion.xml
@@ -58,7 +58,7 @@
         android:layout_height="wrap_content"
         android:padding="6dp"
         android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        android:paddingEnd="14dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/item_tab.xml b/app/src/main/res/layout/item_tab.xml
index 0779ba621c71..e61cfcb180f3 100644
--- a/app/src/main/res/layout/item_tab.xml
+++ b/app/src/main/res/layout/item_tab.xml
@@ -23,7 +23,7 @@
     android:layout_marginEnd="7dp"
     android:layout_marginBottom="10dp"
     app:cardElevation="4dp"
-    app:cardBackgroundColor="?attr/colorPrimary"
+    app:cardBackgroundColor="?toolbarBgColor"
     app:cardCornerRadius="6dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2ec95d0ef2e8..a6279562928c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,16 +18,16 @@
 
     <!-- Dark theme primary colors -->
     <color name="darkThemePrimaryDark">@color/black</color>
-    <color name="darkThemePrimary">@color/almostBlack</color>
+    <color name="darkThemePrimary">@color/newBlack</color>
 
     <!-- Light theme primary colors -->
-    <color name="lightThemePrimaryDark">@color/white</color>
+    <color name="lightThemePrimaryDark">@color/whiteFive</color>
     <color name="lightThemePrimary">@color/whiteFive</color>
 
     <!-- Widget colors -->
     <color name="divider">@color/subtleGrayTwo</color>
     <color name="slightlyTransparentDivider">#1A000000</color>
-    <color name="webViewScrollbarTrackColor">#ff333333</color>
+    <color name="webViewScrollbarTrackColor">#ff333333</color>ñ
     <color name="webViewScrollbarThumbColor">#ffababab</color>
 
     <!-- Universal -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ebe14650bbdd..21c541d06430 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -45,7 +45,7 @@
         <item name="dialogBgColor">@color/almostBlackDark</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_dark</item>
         <item name="browserMenuTextColor">@color/white</item>
-        <item name="browserMenuTextColorDisabled">@color/midGray</item>
+        <item name="browserMenuTextColorDisabled">@color/warGreyTwo</item>
         <item name="omnibarRoundedFieldBackgroundColor">@color/almostBlack</item>
         <item name="omnibarTextColor">@color/white</item>
         <item name="omnibarHintColor">@color/paleBrownishGray</item>
@@ -62,7 +62,7 @@
         <item name="bookmarkTitleTextColor">@color/white</item>
         <item name="bookmarkSubtitleTextColor">@color/grayishTwo</item>
         <item name="settingsItemTextColor">@color/white</item>
-        <item name="settingsItemTextColorDisabled">@color/midGray</item>
+        <item name="settingsItemTextColorDisabled">@color/warGreyTwo</item>
         <item name="settingsMinorTextColor">@color/grayishTwo</item>
         <item name="settingsSwitchBackgroundColor">@color/subtleGrayTwo</item>
         <item name="settingsDividerColor">@color/almostBlack</item>

From 926c086032fb262802084fa3fb445781f69bdefb Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Fri, 15 May 2020 11:58:38 +0200
Subject: [PATCH 17/28] final tweaks to the toolbar, removing elevation and
 adding custom shadow

---
 .../app/statistics/VariantManager.kt          |   2 +-
 app/src/main/res/drawable/appbar_bg.xml       |  31 ++++
 .../res/drawable/bottom_navigation_bar_bg.xml |  26 +--
 .../res/layout/include_omnibar_toolbar.xml    | 162 +++++++++---------
 app/src/main/res/layout/include_toolbar.xml   |   2 +
 app/src/main/res/values/attrs.xml             |   1 +
 app/src/main/res/values/colors.xml            |   3 +
 app/src/main/res/values/themes.xml            |   2 +
 8 files changed, 123 insertions(+), 106 deletions(-)
 create mode 100644 app/src/main/res/drawable/appbar_bg.xml

diff --git a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
index c545755b74f5..6267f536ab3f 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
@@ -48,7 +48,7 @@ interface VariantManager {
             // Bottom Bar Navigation Experiment
             Variant(
                 key = "mb",
-                weight = 1.0,
+                weight = 0.0,
                 features = emptyList(),
                 filterBy = { noFilter() }),
             Variant(
diff --git a/app/src/main/res/drawable/appbar_bg.xml b/app/src/main/res/drawable/appbar_bg.xml
new file mode 100644
index 000000000000..6b828feeaf73
--- /dev/null
+++ b/app/src/main/res/drawable/appbar_bg.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2020 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:shape="rectangle">
+            <solid android:color="?attr/toolbarBgColor"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding android:bottom="1dp"/>
+            <solid android:color="?toolbarBgBorderColor" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bottom_navigation_bar_bg.xml b/app/src/main/res/drawable/bottom_navigation_bar_bg.xml
index 502bf98a50c5..4a6c2bca87da 100644
--- a/app/src/main/res/drawable/bottom_navigation_bar_bg.xml
+++ b/app/src/main/res/drawable/bottom_navigation_bar_bg.xml
@@ -16,34 +16,10 @@
   -->
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item >
-        <shape android:shape="rectangle">
-            <padding android:top="1dp"/>
-            <solid android:color="#00CCCCCC" />
-        </shape>
-    </item>
-    <item >
-        <shape android:shape="rectangle">
-            <padding android:top="1dp"/>
-            <solid android:color="#10CCCCCC" />
-        </shape>
-    </item>
-    <item >
-        <shape android:shape="rectangle">
-            <padding android:top="1dp"/>
-            <solid android:color="#20CCCCCC" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <padding android:top="1dp"/>
-            <solid android:color="#30CCCCCC" />
-        </shape>
-    </item>
     <item>
         <shape android:shape="rectangle">
             <padding android:top="1dp"/>
-            <solid android:color="#50CCCCCC" />
+            <solid android:color="?attr/toolbarBgBorderColor" />
         </shape>
     </item>
     <item>
diff --git a/app/src/main/res/layout/include_omnibar_toolbar.xml b/app/src/main/res/layout/include_omnibar_toolbar.xml
index b67be4dfbf0f..260ddea5adee 100644
--- a/app/src/main/res/layout/include_omnibar_toolbar.xml
+++ b/app/src/main/res/layout/include_omnibar_toolbar.xml
@@ -27,7 +27,9 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:theme="@style/AppTheme.Dark.AppBarOverlay">
+        android:theme="@style/AppTheme.Dark.AppBarOverlay"
+        android:background="@drawable/appbar_bg"
+        app:elevation="0dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/toolbarContainer"
@@ -48,95 +50,95 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:popupTheme="@style/AppTheme.Dark.PopupOverlay">
 
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/omniBarContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="8dp"
+                    android:background="@drawable/omnibar_field_background"
+                    android:paddingStart="6dp"
+                    android:paddingEnd="6dp">
+
                     <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/omniBarContainer"
-                        android:layout_width="match_parent"
+                        android:id="@+id/networksContainer"
+                        android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/omnibar_field_background"
-                        android:paddingStart="6dp"
-                        android:paddingEnd="6dp">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/networksContainer"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                        <FrameLayout
-                            android:id="@+id/omnibarIconContainer"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent" />
+
+                    <FrameLayout
+                        android:id="@+id/omnibarIconContainer"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <ImageButton
+                            android:id="@+id/privacyGradeButton"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:contentDescription="@string/privacyGradeContentDescription"
+                            android:padding="4dp"
+                            android:src="@drawable/privacygrade_icon_a"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
-
-                            <ImageButton
-                                android:id="@+id/privacyGradeButton"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:background="?attr/selectableItemBackgroundBorderless"
-                                android:contentDescription="@string/privacyGradeContentDescription"
-                                android:padding="4dp"
-                                android:src="@drawable/privacygrade_icon_a"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <ImageView
-                                android:id="@+id/searchIcon"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:contentDescription="@string/privacyGradeContentDescription"
-                                android:padding="4dp"
-                                android:src="@drawable/ic_loupe_24dp"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                        </FrameLayout>
-
-                        <com.duckduckgo.app.browser.omnibar.KeyboardAwareEditText
-                            android:id="@+id/omnibarTextInput"
-                            style="@style/Base.V7.Widget.AppCompat.EditText"
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:background="@null"
-                            android:fontFamily="sans-serif"
-                            android:hint="@string/omnibarInputHint"
-                            android:imeOptions="flagNoExtractUi|actionGo|flagNoPersonalizedLearning"
-                            android:inputType="textUri|textNoSuggestions"
-                            android:maxLines="1"
-                            android:paddingStart="5dp"
-                            android:paddingEnd="8dp"
-                            android:selectAllOnFocus="true"
-                            android:textColor="?attr/omnibarTextColor"
-                            android:textColorHint="?attr/omnibarHintColor"
-                            android:textCursorDrawable="@drawable/text_cursor"
-                            android:textSize="16sp"
-                            android:textStyle="normal"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toStartOf="@id/clearTextButton"
-                            app:layout_constraintStart_toEndOf="@id/omnibarIconContainer"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:text="https://duckduckgo.com/?q=areallylongexampleexample" />
+                            app:layout_constraintTop_toTopOf="parent" />
 
                         <ImageView
-                            android:id="@+id/clearTextButton"
+                            android:id="@+id/searchIcon"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:background="?selectableItemBackground"
-                            android:contentDescription="@string/clearButtonContentDescription"
-                            android:padding="3dp"
-                            android:src="@drawable/ic_close"
-                            android:visibility="gone"
+                            android:contentDescription="@string/privacyGradeContentDescription"
+                            android:padding="4dp"
+                            android:src="@drawable/ic_loupe_24dp"
                             app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            tools:visibility="visible" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </FrameLayout>
+
+                    <com.duckduckgo.app.browser.omnibar.KeyboardAwareEditText
+                        android:id="@+id/omnibarTextInput"
+                        style="@style/Base.V7.Widget.AppCompat.EditText"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:background="@null"
+                        android:fontFamily="sans-serif"
+                        android:hint="@string/omnibarInputHint"
+                        android:imeOptions="flagNoExtractUi|actionGo|flagNoPersonalizedLearning"
+                        android:inputType="textUri|textNoSuggestions"
+                        android:maxLines="1"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="8dp"
+                        android:selectAllOnFocus="true"
+                        android:textColor="?attr/omnibarTextColor"
+                        android:textColorHint="?attr/omnibarHintColor"
+                        android:textCursorDrawable="@drawable/text_cursor"
+                        android:textSize="16sp"
+                        android:textStyle="normal"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@id/clearTextButton"
+                        app:layout_constraintStart_toEndOf="@id/omnibarIconContainer"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="https://duckduckgo.com/?q=areallylongexampleexample" />
+
+                    <ImageView
+                        android:id="@+id/clearTextButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?selectableItemBackground"
+                        android:contentDescription="@string/clearButtonContentDescription"
+                        android:padding="3dp"
+                        android:src="@drawable/ic_close"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:visibility="visible" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
             </androidx.appcompat.widget.Toolbar>
 
@@ -205,12 +207,12 @@
                 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="4dp"
+                android:progressDrawable="@drawable/loading_progress"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 tools:progress="50"
-                android:progressDrawable="@drawable/loading_progress"
                 tools:visibility="visible" />
 
             <include
diff --git a/app/src/main/res/layout/include_toolbar.xml b/app/src/main/res/layout/include_toolbar.xml
index 71476b424fad..5e1a9ed3a2fc 100644
--- a/app/src/main/res/layout/include_toolbar.xml
+++ b/app/src/main/res/layout/include_toolbar.xml
@@ -24,6 +24,8 @@
     android:layout_height="wrap_content"
     android:id="@+id/appBarLayout"
     android:theme="@style/AppTheme.Dark.AppBarOverlay"
+    android:background="@drawable/appbar_bg"
+    app:elevation="0dp"
     tools:showIn="@layout/activity_tracker_networks">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index df7aa31b816c..8688a7d80b6e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -22,6 +22,7 @@
     <attr name="toolbarIconColor" format="color" />
     <attr name="toolbarTextColor" format="color" />
     <attr name="toolbarBgColor" format="color" />
+    <attr name="toolbarBgBorderColor" format="color" />
     <attr name="browserIconColorSelector" format="color" />
     <attr name="browserMenuTextColor" format="color" />
     <attr name="browserMenuTextColorDisabled" format="color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a6279562928c..ca292a9f2a35 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -90,4 +90,7 @@
     <color name="ic_launcher_purple_background">#7A4BDC</color>
     <color name="ic_launcher_blue_background">#4179ED</color>
     <color name="ic_launcher_black_background">#262626</color>
+
+    <color name="toolbarBorderColorLight">#26000000</color>
+    <color name="toolbarBorderColorDark">#33FFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 21c541d06430..0d5156bfcc37 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -42,6 +42,7 @@
         <item name="toolbarIconColor">@color/white</item>
         <item name="toolbarTextColor">@color/white</item>
         <item name="toolbarBgColor">@color/newBlack</item>
+        <item name="toolbarBgBorderColor">@color/toolbarBorderColorDark</item>
         <item name="dialogBgColor">@color/almostBlackDark</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_dark</item>
         <item name="browserMenuTextColor">@color/white</item>
@@ -119,6 +120,7 @@
         <item name="toolbarIconColor">@color/almostBlackDark</item>
         <item name="toolbarTextColor">@color/almostBlackDark</item>
         <item name="toolbarBgColor">@color/white</item>
+        <item name="toolbarBgBorderColor">@color/toolbarBorderColorLight</item>
         <item name="dialogBgColor">@color/lightThemePrimaryDark</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_light</item>
         <item name="browserMenuTextColor">@color/almostBlackDark</item>

From a1e186bf0e3c2bc5558fa130cf776ca9d807db73 Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Fri, 15 May 2020 11:59:05 +0200
Subject: [PATCH 18/28] back to it's proper experiment definition

---
 .../main/java/com/duckduckgo/app/statistics/VariantManager.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
index 6267f536ab3f..c545755b74f5 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
@@ -48,7 +48,7 @@ interface VariantManager {
             // Bottom Bar Navigation Experiment
             Variant(
                 key = "mb",
-                weight = 0.0,
+                weight = 1.0,
                 features = emptyList(),
                 filterBy = { noFilter() }),
             Variant(

From 3bc6986ced4294ee94004739dda260a35e48fd2f Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Mon, 18 May 2020 16:12:24 +0200
Subject: [PATCH 19/28] last ui review changes

---
 app/src/main/res/drawable/appbar_bg.xml       | 31 -------------------
 .../res/drawable/bottom_navigation_bar_bg.xml | 24 ++++++++++++++
 .../res/layout/include_omnibar_toolbar.xml    |  4 +--
 app/src/main/res/layout/include_toolbar.xml   |  2 --
 app/src/main/res/values/themes.xml            |  2 +-
 5 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 app/src/main/res/drawable/appbar_bg.xml

diff --git a/app/src/main/res/drawable/appbar_bg.xml b/app/src/main/res/drawable/appbar_bg.xml
deleted file mode 100644
index 6b828feeaf73..000000000000
--- a/app/src/main/res/drawable/appbar_bg.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2020 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape
-            android:shape="rectangle">
-            <solid android:color="?attr/toolbarBgColor"/>
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <padding android:bottom="1dp"/>
-            <solid android:color="?toolbarBgBorderColor" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bottom_navigation_bar_bg.xml b/app/src/main/res/drawable/bottom_navigation_bar_bg.xml
index 4a6c2bca87da..79bff523c7a4 100644
--- a/app/src/main/res/drawable/bottom_navigation_bar_bg.xml
+++ b/app/src/main/res/drawable/bottom_navigation_bar_bg.xml
@@ -16,6 +16,30 @@
   -->
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape android:shape="rectangle">
+            <padding android:top="1dp"/>
+            <solid android:color="#00CCCCCC" />
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle">
+            <padding android:top="1dp"/>
+            <solid android:color="#10CCCCCC" />
+        </shape>
+    </item>
+    <item >
+        <shape android:shape="rectangle">
+            <padding android:top="1dp"/>
+            <solid android:color="#20CCCCCC" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding android:top="1dp"/>
+            <solid android:color="#30CCCCCC" />
+        </shape>
+    </item>
     <item>
         <shape android:shape="rectangle">
             <padding android:top="1dp"/>
diff --git a/app/src/main/res/layout/include_omnibar_toolbar.xml b/app/src/main/res/layout/include_omnibar_toolbar.xml
index 260ddea5adee..e82c3304b1cb 100644
--- a/app/src/main/res/layout/include_omnibar_toolbar.xml
+++ b/app/src/main/res/layout/include_omnibar_toolbar.xml
@@ -27,9 +27,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:theme="@style/AppTheme.Dark.AppBarOverlay"
-        android:background="@drawable/appbar_bg"
-        app:elevation="0dp">
+        android:theme="@style/AppTheme.Dark.AppBarOverlay">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/toolbarContainer"
diff --git a/app/src/main/res/layout/include_toolbar.xml b/app/src/main/res/layout/include_toolbar.xml
index 5e1a9ed3a2fc..71476b424fad 100644
--- a/app/src/main/res/layout/include_toolbar.xml
+++ b/app/src/main/res/layout/include_toolbar.xml
@@ -24,8 +24,6 @@
     android:layout_height="wrap_content"
     android:id="@+id/appBarLayout"
     android:theme="@style/AppTheme.Dark.AppBarOverlay"
-    android:background="@drawable/appbar_bg"
-    app:elevation="0dp"
     tools:showIn="@layout/activity_tracker_networks">
 
     <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4bbf55970b5d..864ecb128d55 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -124,7 +124,7 @@
         <item name="toolbarTextColor">@color/almostBlackDark</item>
         <item name="toolbarBgColor">@color/white</item>
         <item name="toolbarBgBorderColor">@color/toolbarBorderColorLight</item>
-        <item name="dialogBgColor">@color/lightThemePrimaryDark</item>
+        <item name="dialogBgColor">@color/white</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_light</item>
         <item name="browserMenuTextColor">@color/almostBlackDark</item>
         <item name="browserMenuTextColorDisabled">@color/pinkish_grey_two</item>

From 90663a02121c1ad01cc239121aa480e2d95c5635 Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Wed, 20 May 2020 16:59:02 +0200
Subject: [PATCH 20/28] clean up bottom bar background color

---
 .../res/layout/activity_tab_switcher_bottom_bar_feature.xml     | 2 +-
 app/src/main/res/layout/fragment_browser_tab.xml                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_tab_switcher_bottom_bar_feature.xml b/app/src/main/res/layout/activity_tab_switcher_bottom_bar_feature.xml
index 175a1bb0d139..e6e198c10774 100644
--- a/app/src/main/res/layout/activity_tab_switcher_bottom_bar_feature.xml
+++ b/app/src/main/res/layout/activity_tab_switcher_bottom_bar_feature.xml
@@ -46,7 +46,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottomBarHeight"
         android:layout_gravity="bottom"
-        android:background="@drawable/bottom_navigation_bar_bg"
+        android:background="?toolbarBgColor"
         android:gravity="center"
         android:orientation="horizontal"
         android:elevation="8dp"
diff --git a/app/src/main/res/layout/fragment_browser_tab.xml b/app/src/main/res/layout/fragment_browser_tab.xml
index b2bf8f3011e3..50767e75aeed 100644
--- a/app/src/main/res/layout/fragment_browser_tab.xml
+++ b/app/src/main/res/layout/fragment_browser_tab.xml
@@ -28,10 +28,10 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottomBarHeight"
         android:layout_gravity="bottom"
-        android:background="@drawable/bottom_navigation_bar_bg"
         android:elevation="8dp"
         android:gravity="center"
         android:orientation="horizontal"
+        android:background="?toolbarBgColor"
         app:layoutResource="@layout/layout_browser_bottom_navigation_bar"
         app:layout_behavior="com.duckduckgo.app.browser.ui.BottomNavigationBehavior" />
 

From bcbd582cdbe6abadb9b1b74470cf41ddb873aae5 Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Wed, 20 May 2020 19:25:37 +0200
Subject: [PATCH 21/28] fixed version for release

---
 .../main/java/com/duckduckgo/app/statistics/VariantManager.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
index c545755b74f5..6267f536ab3f 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
@@ -48,7 +48,7 @@ interface VariantManager {
             // Bottom Bar Navigation Experiment
             Variant(
                 key = "mb",
-                weight = 1.0,
+                weight = 0.0,
                 features = emptyList(),
                 filterBy = { noFilter() }),
             Variant(

From a70f5f2df5c756b93040af05ef1a01c4d4eeacce Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Mon, 25 May 2020 11:19:12 +0200
Subject: [PATCH 22/28] experiment back to original value

---
 .../main/java/com/duckduckgo/app/statistics/VariantManager.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
index f8095f37d795..427123d7cf3a 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
@@ -48,7 +48,7 @@ interface VariantManager {
             // Bottom Bar Navigation Experiment
             Variant(
                 key = "mb",
-                weight = 0.0,
+                weight = 1.0,
                 features = emptyList(),
                 filterBy = { noFilter() }),
             Variant(

From f15c94da6ae24c4694c116dc131f93739a868de8 Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Mon, 25 May 2020 11:25:42 +0200
Subject: [PATCH 23/28] applying ktlint

---
 .../java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt   | 1 -
 .../java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt  | 2 --
 .../app/browser/rating/ui/AppEnjoymentDialogFragment.kt         | 1 -
 .../app/browser/rating/ui/GiveFeedbackDialogFragment.kt         | 2 --
 .../duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt   | 1 -
 .../main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt  | 1 -
 .../app/settings/SettingsAutomaticallyClearWhenFragment.kt      | 1 -
 7 files changed, 9 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
index 06db5888e447..8e43200989fa 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
@@ -55,7 +55,6 @@ import kotlinx.android.synthetic.main.view_bookmark_entry.view.favicon
 import kotlinx.android.synthetic.main.view_bookmark_entry.view.overflowMenu
 import kotlinx.android.synthetic.main.view_bookmark_entry.view.title
 import kotlinx.android.synthetic.main.view_bookmark_entry.view.url
-import org.jetbrains.anko.alert
 import timber.log.Timber
 
 class BookmarksActivity : DuckDuckGoActivity() {
diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt
index bbb96ffe28cc..f430f1785a51 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt
@@ -24,7 +24,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.PopupWindow
-import com.duckduckgo.app.browser.BrowserPopupMenu
 import com.duckduckgo.app.browser.R
 
 class BookmarksPopupMenu(layoutInflater: LayoutInflater, view: View = inflate(layoutInflater, R.layout.popup_window_bookmarks_menu)) :
@@ -68,4 +67,3 @@ class BookmarksPopupMenu(layoutInflater: LayoutInflater, view: View = inflate(la
         }
     }
 }
-
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
index f34e15100f9f..d320517d8705 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
@@ -18,7 +18,6 @@ package com.duckduckgo.app.browser.rating.ui
 
 import android.app.Dialog
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
index 09628b0a9372..2b1fd2bd8495 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
@@ -18,14 +18,12 @@ package com.duckduckgo.app.browser.rating.ui
 
 import android.app.Dialog
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
-
 class GiveFeedbackDialogFragment : EnjoymentDialog() {
 
     interface Listener {
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
index f9a12ed2a074..086060b20399 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
@@ -18,7 +18,6 @@ package com.duckduckgo.app.browser.rating.ui
 
 import android.app.Dialog
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
diff --git a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
index b4a834c941de..8804d63cd3a4 100644
--- a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
@@ -19,7 +19,6 @@ package com.duckduckgo.app.icon.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import com.duckduckgo.app.browser.R
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
index f001a7601d57..18e70a108993 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
@@ -21,7 +21,6 @@ import android.os.Bundle
 import android.view.View
 import android.widget.RadioGroup
 import androidx.annotation.IdRes
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.duckduckgo.app.browser.BuildConfig
 import com.duckduckgo.app.browser.R

From 375d0f68e9743b181888f5dc2b6a34fa1f6b9f8c Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Wed, 27 May 2020 14:01:10 +0200
Subject: [PATCH 24/28] adding text color for the dialogs

---
 app/src/main/res/values/styles.xml | 4 ++++
 app/src/main/res/values/themes.xml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5b3b48f0c9a5..105e530ad425 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -311,6 +311,10 @@
         <item name="backgroundTint">?dialogBgColor</item>
     </style>
 
+    <style name="DaxDialogCheckedTextView" parent="Widget.MaterialComponents.CheckedTextView">
+        <item name="android:textColor">?normalTextColor</item>
+    </style>
+
     <style name="DaxDialogRadioButton">
         <item name="android:textColor">?normalTextColor</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 864ecb128d55..184f7a7c55a9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -242,8 +242,12 @@
     <style name="DaxAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="android:background">?dialogBgColor</item>
         <item name="colorOnSurface">?normalTextColor</item>
+        <item name="android:textColor">?normalTextColor</item>
         <item name="buttonBarPositiveButtonStyle">@style/DaxDialogPositiveButton</item>
         <item name="buttonBarNegativeButtonStyle">@style/DaxDialogNegativeButton</item>
+        <item name="checkedTextViewStyle">@style/DaxDialogCheckedTextView</item>
     </style>
 
+
+
 </resources>

From 52e7233e56418a5297f51735fe4435306b105287 Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Wed, 27 May 2020 16:14:39 +0200
Subject: [PATCH 25/28] revert changes to dialogs, they don't belong here

---
 .../app/bookmarks/ui/BookmarksActivity.kt     |  2 +-
 .../app/bookmarks/ui/BookmarksPopupMenu.kt    |  6 ++---
 .../ui/EditBookmarkDialogFragment.kt          |  2 +-
 .../app/browser/BrowserTabFragment.kt         |  2 +-
 .../rating/ui/AppEnjoymentDialogFragment.kt   |  3 ++-
 .../rating/ui/GiveFeedbackDialogFragment.kt   |  3 ++-
 .../rating/ui/RateAppDialogFragment.kt        |  3 ++-
 .../app/icon/ui/ChangeIconActivity.kt         |  3 ++-
 .../SettingsAutomaticallyClearWhatFragment.kt |  3 ++-
 .../SettingsAutomaticallyClearWhenFragment.kt |  3 ++-
 app/src/main/res/drawable/ic_fire_red.xml     |  2 +-
 ...ings_automatically_clear_what_fragment.xml |  3 ---
 ...ings_automatically_clear_when_fragment.xml |  6 -----
 .../main/res/layout/sheet_fire_clear_data.xml |  6 ++---
 app/src/main/res/values/attrs.xml             |  1 -
 app/src/main/res/values/colors.xml            |  3 +--
 app/src/main/res/values/styles.xml            | 27 +++++++------------
 app/src/main/res/values/themes.xml            | 16 ++---------
 18 files changed, 33 insertions(+), 61 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
index 8e43200989fa..738ceeb7a6f0 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
@@ -132,7 +132,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
     private fun confirmDeleteBookmark(bookmark: BookmarkEntity) {
         val message = getString(R.string.bookmarkDeleteConfirmMessage, bookmark.title).html(this)
         val title = getString(R.string.dialogConfirmTitle)
-        deleteDialog = MaterialAlertDialogBuilder(this)
+        deleteDialog = AlertDialog.Builder(this)
             .setTitle(title)
             .setMessage(message)
             .setPositiveButton(android.R.string.yes) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt
index f430f1785a51..8d10d48dd860 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksPopupMenu.kt
@@ -29,16 +29,13 @@ import com.duckduckgo.app.browser.R
 class BookmarksPopupMenu(layoutInflater: LayoutInflater, view: View = inflate(layoutInflater, R.layout.popup_window_bookmarks_menu)) :
     PopupWindow(view, WRAP_CONTENT, WRAP_CONTENT, true) {
 
-    // popupwindow gets stuck on the screen on API 22 (tested on 23) without a background
-    // color.  Adding it however garbles the elevation so we cannot have elevation here.
-
     init {
         if (SDK_INT <= 22) {
             // popupwindow gets stuck on the screen on API 22 (tested on 23) without a background
             // color.  Adding it however garbles the elevation so we cannot have elevation here.
             setBackgroundDrawable(ColorDrawable(Color.WHITE))
         } else {
-            elevation = 6.toFloat()
+            elevation = ELEVATION
         }
         animationStyle = android.R.style.Animation_Dialog
     }
@@ -61,6 +58,7 @@ class BookmarksPopupMenu(layoutInflater: LayoutInflater, view: View = inflate(la
     companion object {
 
         private const val MARGIN = 30
+        private const val ELEVATION = 6f
 
         fun inflate(layoutInflater: LayoutInflater, resourceId: Int): View {
             return layoutInflater.inflate(resourceId, null)
diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
index 0c05b79d40f2..e0c4dae9aba0 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
@@ -43,7 +43,7 @@ class EditBookmarkDialogFragment : DialogFragment() {
         val titleInput = rootView.find<EditText>(R.id.titleInput)
         val urlInput = rootView.find<EditText>(R.id.urlInput)
 
-        val alertBuilder = MaterialAlertDialogBuilder(requireActivity())
+        val alertBuilder = AlertDialog.Builder(requireActivity())
             .setView(rootView)
             .setTitle(R.string.bookmarkTitleEdit)
             .setPositiveButton(R.string.dialogSave) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index ec6e38720cf8..188673510816 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -657,7 +657,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi
         val isShowing = alertDialog?.isShowing
 
         if (isShowing != true) {
-            alertDialog = MaterialAlertDialogBuilder(context)
+            alertDialog = AlertDialog.Builder(context)
                 .setTitle(R.string.launchingExternalApp)
                 .setMessage(getString(R.string.confirmOpenExternalApp))
                 .setPositiveButton(R.string.yes) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
index d320517d8705..e6c553017384 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
@@ -18,6 +18,7 @@ package com.duckduckgo.app.browser.rating.ui
 
 import android.app.Dialog
 import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
@@ -37,7 +38,7 @@ class AppEnjoymentDialogFragment : EnjoymentDialog() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         firePixelWithPromptCount(APP_ENJOYMENT_DIALOG_SHOWN)
 
-        return MaterialAlertDialogBuilder(requireActivity())
+        return AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme)
             .setTitle(R.string.appEnjoymentDialogTitle)
             .setMessage(R.string.appEnjoymentDialogMessage)
             .setPositiveButton(R.string.appEnjoymentDialogPositiveButton) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
index 2b1fd2bd8495..983d8728d35f 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
@@ -18,6 +18,7 @@ package com.duckduckgo.app.browser.rating.ui
 
 import android.app.Dialog
 import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
@@ -37,7 +38,7 @@ class GiveFeedbackDialogFragment : EnjoymentDialog() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         firePixelWithPromptCount(APP_FEEDBACK_DIALOG_SHOWN)
 
-        return MaterialAlertDialogBuilder(requireActivity())
+        return AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme)
             .setTitle(R.string.giveFeedbackDialogTitle)
             .setMessage(R.string.giveFeedbackDialogMessage)
             .setPositiveButton(R.string.giveFeedbackDialogPositiveButton) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
index 086060b20399..968eb649434b 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
@@ -18,6 +18,7 @@ package com.duckduckgo.app.browser.rating.ui
 
 import android.app.Dialog
 import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
@@ -37,7 +38,7 @@ class RateAppDialogFragment : EnjoymentDialog() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         firePixelWithPromptCount(APP_RATING_DIALOG_SHOWN)
 
-        return MaterialAlertDialogBuilder(requireActivity())
+        return AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme)
             .setTitle(R.string.rateAppDialogTitle)
             .setMessage(R.string.rateAppDialogMessage)
             .setPositiveButton(R.string.rateAppDialogPositiveButton) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
index 8804d63cd3a4..840651901e97 100644
--- a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
@@ -19,6 +19,7 @@ package com.duckduckgo.app.icon.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import com.duckduckgo.app.browser.R
@@ -82,7 +83,7 @@ class ChangeIconActivity : DuckDuckGoActivity() {
                 finish()
             }
             is ChangeIconViewModel.Command.ShowConfirmationDialog -> {
-                MaterialAlertDialogBuilder(this)
+                AlertDialog.Builder(this)
                     .setTitle(R.string.changeIconDialogTitle)
                     .setMessage(getString(R.string.changeIconDialogMessage))
                     .setPositiveButton(R.string.changeIconCtaAccept) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
index cb00076ed6b2..cd85ce25c32f 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
@@ -21,6 +21,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.RadioGroup
 import androidx.annotation.IdRes
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.settings.clear.ClearWhatOption
@@ -40,7 +41,7 @@ class SettingsAutomaticallyClearWhatFragment : DialogFragment() {
         val rootView = View.inflate(activity, R.layout.settings_automatically_clear_what_fragment, null)
         updateCurrentSelect(currentOption, rootView.findViewById(R.id.settingsClearWhatGroup))
 
-        val alertBuilder = MaterialAlertDialogBuilder(requireActivity())
+        val alertBuilder = AlertDialog.Builder(requireActivity())
             .setView(rootView)
             .setTitle(R.string.settingsAutomaticallyClearWhat)
             .setPositiveButton(R.string.settingsAutomaticallyClearingDialogSave) { _, _ ->
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
index 18e70a108993..5ab2879ee48a 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
@@ -21,6 +21,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.RadioGroup
 import androidx.annotation.IdRes
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.duckduckgo.app.browser.BuildConfig
 import com.duckduckgo.app.browser.R
@@ -47,7 +48,7 @@ class SettingsAutomaticallyClearWhenFragment : DialogFragment() {
 
         updateCurrentSelect(currentOption, rootView.findViewById(R.id.settingsClearWhenGroup))
 
-        val alertBuilder = MaterialAlertDialogBuilder(requireActivity())
+        val alertBuilder = AlertDialog.Builder(requireActivity())
             .setView(rootView)
             .setTitle(R.string.settingsAutomaticallyClearWhat)
             .setPositiveButton(R.string.settingsAutomaticallyClearingDialogSave) { _, _ ->
diff --git a/app/src/main/res/drawable/ic_fire_red.xml b/app/src/main/res/drawable/ic_fire_red.xml
index bad99ae4add3..e3dfcf68cf9b 100644
--- a/app/src/main/res/drawable/ic_fire_red.xml
+++ b/app/src/main/res/drawable/ic_fire_red.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?attr/fireIcon"
+        android:fillColor="?attr/fireIconColor"
         android:pathData="M10.208,22.307c-2.552,-0.843 -4.667,-2.904 -5.762,-6.043C2.818,11.79 6.172,8.23 6.172,8.23s-0.097,0.913 0.316,1.92c0.413,1.007 1.216,1.734 1.216,1.734S6.926,9.775 8.822,6.26c2.14,-3.959 6.855,-4.803 6.855,-4.803S14.486,3.356 15.02,5.3c0.414,1.453 1.094,2.156 1.848,4.123 0.754,2.015 0.632,3.116 0.632,3.116s0.22,-1.24 0.754,-2.084C19.42,8.603 21,8.159 21,8.159s-0.826,1.686 -0.631,3.958c0.145,1.664 0.388,3.585 -0.511,5.74 -0.706,1.71 -2.747,4.052 -5.615,4.685 1.653,-0.703 2.746,-2.343 2.625,-4.123 -0.073,-1.03 -0.705,-2.015 -1.385,-2.694 -0.413,2.6 -1.896,2.905 -1.896,2.905s0.85,-1.71 0.972,-3.608a5.997,5.997 0,0 0,-0.219 -2.342c-0.777,-2.694 -2.114,-3.42 -2.114,-3.42s0.438,1.568 -1.167,4.099c-1.119,1.757 -3.015,3.045 -2.942,5.669 0.05,1.405 0.9,2.6 2.091,3.28z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_automatically_clear_what_fragment.xml b/app/src/main/res/layout/settings_automatically_clear_what_fragment.xml
index bc1e5a3a9474..f9a14e6e94c3 100644
--- a/app/src/main/res/layout/settings_automatically_clear_what_fragment.xml
+++ b/app/src/main/res/layout/settings_automatically_clear_what_fragment.xml
@@ -31,7 +31,6 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <RadioButton
-            style="@style/DaxDialogRadioButton"
             android:id="@+id/settingNone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -42,7 +41,6 @@
             android:text="@string/settingsAutomaticallyClearWhatOptionNone" />
 
         <RadioButton
-            style="@style/DaxDialogRadioButton"
             android:id="@+id/settingTabsOnly"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -53,7 +51,6 @@
             android:text="@string/settingsAutomaticallyClearWhatOptionTabs" />
 
         <RadioButton
-            style="@style/DaxDialogRadioButton"
             android:id="@+id/settingTabsAndData"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/settings_automatically_clear_when_fragment.xml b/app/src/main/res/layout/settings_automatically_clear_when_fragment.xml
index 7ae512a32ff0..2d71dfa8b484 100644
--- a/app/src/main/res/layout/settings_automatically_clear_when_fragment.xml
+++ b/app/src/main/res/layout/settings_automatically_clear_when_fragment.xml
@@ -33,7 +33,6 @@
 
         <RadioButton
             android:id="@+id/settingAppExitOnly"
-            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -44,7 +43,6 @@
 
         <RadioButton
             android:id="@+id/settingInactive5Seconds"
-            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -57,7 +55,6 @@
 
         <RadioButton
             android:id="@+id/settingInactive5Mins"
-            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -68,7 +65,6 @@
 
         <RadioButton
             android:id="@+id/settingInactive15Mins"
-            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -79,7 +75,6 @@
 
         <RadioButton
             android:id="@+id/settingInactive30Mins"
-            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -90,7 +85,6 @@
 
         <RadioButton
             android:id="@+id/settingInactive60Mins"
-            style="@style/DaxDialogRadioButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/sheet_fire_clear_data.xml b/app/src/main/res/layout/sheet_fire_clear_data.xml
index 08d52b692848..808d8c62e6af 100644
--- a/app/src/main/res/layout/sheet_fire_clear_data.xml
+++ b/app/src/main/res/layout/sheet_fire_clear_data.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?dialogBgColor"
+    android:background="@color/white"
     app:layout_behavior="@string/bottom_sheet_behavior">
 
     <TextView
@@ -27,7 +27,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
-        android:drawableStart="@drawable/ic_fire_red"
+        android:drawableStart="@drawable/icon_fire_glyph_24dp"
         android:drawablePadding="24dp"
         android:fontFamily="sans-serif"
         android:paddingStart="24dp"
@@ -35,7 +35,7 @@
         android:paddingEnd="24dp"
         android:paddingBottom="17dp"
         android:text="@string/fireClearAll"
-        android:textColor="?fireIcon"
+        android:textColor="@color/brickOrange"
         android:textSize="16sp"
         android:textStyle="normal"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index bf223ebd99f3..af0e95853018 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -68,7 +68,6 @@
     <attr name="topCallToActionDescriptionColor" format="color" />
     <attr name="topCallToActionBackgroundColor" format="color" />
     <attr name="privacyDashboardLogoLetterTextColor" format="color" />
-    <attr name="fireIcon" format="color" />
     <attr name="fireproofWebsiteTitleTextColor" format="color" />
 
     <declare-styleable name="BottomNavigationBar">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ca292a9f2a35..c34be2ea3e79 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -67,8 +67,7 @@
     <color name="whiteSix">#e0e0e0</color>
     <color name="pinkish_grey_two">#c0c0c0</color>
 
-    <color name="brickOrangeLight">#CE2929</color>
-    <color name="brickOrangeDark">#FA5252</color>
+    <color name="brickOrange">#d03a10</color>
 
     <color name="powderBlue">#50bfff</color>
     <color name="warmBlue">#3f66d5</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 105e530ad425..d00777c48ae7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -202,6 +202,15 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="buttonBarNegativeButtonStyle">@style/AlertDialogButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/AlertDialogButtonStyle</item>
+    </style>
+
+    <style name="AlertDialogButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:textColor">@color/cornflowerBlue</item>
+    </style>
+
     <style name="FeedbackFragmentStyle">
         <item name="android:background">?attr/colorPrimaryDark</item>
         <item name="android:layout_width">match_parent</item>
@@ -301,22 +310,4 @@
         <item name="android:textColor">?attr/colorAccent</item>
     </style>
 
-    <style name="DaxDialogPositiveButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
-        <item name="android:textColor">?colorAccent</item>
-        <item name="backgroundTint">?dialogBgColor</item>
-    </style>
-
-    <style name="DaxDialogNegativeButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
-        <item name="android:textColor">?colorAccent</item>
-        <item name="backgroundTint">?dialogBgColor</item>
-    </style>
-
-    <style name="DaxDialogCheckedTextView" parent="Widget.MaterialComponents.CheckedTextView">
-        <item name="android:textColor">?normalTextColor</item>
-    </style>
-
-    <style name="DaxDialogRadioButton">
-        <item name="android:textColor">?normalTextColor</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 184f7a7c55a9..2c2640bd7344 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -31,7 +31,6 @@
         <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
         <item name="android:statusBarColor">?toolbarBgColor</item>
         <item name="snackbarButtonStyle">@style/snackbarButtonStyle</item>
-        <item name="materialAlertDialogTheme">@style/DaxAlertDialog</item>
     </style>
 
     <style name="AppTheme.BaseDark">
@@ -94,7 +93,7 @@
 
         <item name="privacyDashboardLogoLetterTextColor">@color/subtleGray</item>
 
-        <item name="fireIcon">@color/brickOrangeDark</item>
+        <item name="fireIconColor">@color/brickOrangeDark</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.BaseDark" />
@@ -175,7 +174,7 @@
 
         <item name="privacyDashboardLogoLetterTextColor">@color/whiteFour</item>
 
-        <item name="fireIcon">@color/brickOrangeLight</item>
+        <item name="fireIconColor">@color/brickOrangeLight</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.BaseLight">
@@ -239,15 +238,4 @@
         <item name="android:textColorSecondary">?attr/toolbarIconColor</item>
     </style>
 
-    <style name="DaxAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="android:background">?dialogBgColor</item>
-        <item name="colorOnSurface">?normalTextColor</item>
-        <item name="android:textColor">?normalTextColor</item>
-        <item name="buttonBarPositiveButtonStyle">@style/DaxDialogPositiveButton</item>
-        <item name="buttonBarNegativeButtonStyle">@style/DaxDialogNegativeButton</item>
-        <item name="checkedTextViewStyle">@style/DaxDialogCheckedTextView</item>
-    </style>
-
-
-
 </resources>

From 31b62a8cb8905c54227442ed98414abee4b6bc8f Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Wed, 27 May 2020 16:15:17 +0200
Subject: [PATCH 26/28] remove unnecessary imports

---
 .../java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt    | 1 -
 .../duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt    | 1 -
 .../main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt   | 1 -
 .../app/browser/rating/ui/AppEnjoymentDialogFragment.kt          | 1 -
 .../app/browser/rating/ui/GiveFeedbackDialogFragment.kt          | 1 -
 .../duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt    | 1 -
 .../main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt   | 1 -
 .../app/settings/SettingsAutomaticallyClearWhatFragment.kt       | 1 -
 .../app/settings/SettingsAutomaticallyClearWhenFragment.kt       | 1 -
 9 files changed, 9 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
index 738ceeb7a6f0..93376cea4c79 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
@@ -45,7 +45,6 @@ import com.duckduckgo.app.global.view.show
 import kotlinx.android.synthetic.main.content_bookmarks.*
 import kotlinx.android.synthetic.main.include_toolbar.*
 import kotlinx.android.synthetic.main.view_bookmark_entry.view.*
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.android.synthetic.main.content_bookmarks.emptyBookmarks
 import kotlinx.android.synthetic.main.content_bookmarks.recycler
 import kotlinx.android.synthetic.main.include_toolbar.toolbar
diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
index e0c4dae9aba0..d1c5aece3ee8 100644
--- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt
@@ -26,7 +26,6 @@ import androidx.fragment.app.DialogFragment
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.view.hideKeyboard
 import com.duckduckgo.app.global.view.showKeyboard
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.jetbrains.anko.find
 
 class EditBookmarkDialogFragment : DialogFragment() {
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index 188673510816..cce88f67023b 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -96,7 +96,6 @@ import com.duckduckgo.app.tabs.ui.TabSwitcherActivity
 import com.duckduckgo.app.tabs.ui.TabSwitcherBottomBarFeatureActivity
 import com.duckduckgo.app.widget.ui.AddWidgetInstructionsActivity
 import com.duckduckgo.widget.SearchWidgetLight
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_browser_tab.*
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
index e6c553017384..51b854c2928c 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt
@@ -23,7 +23,6 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class AppEnjoymentDialogFragment : EnjoymentDialog() {
 
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
index 983d8728d35f..d11fa4ec7543 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt
@@ -23,7 +23,6 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class GiveFeedbackDialogFragment : EnjoymentDialog() {
 
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
index 968eb649434b..222073daaabc 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt
@@ -23,7 +23,6 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.dialog.BackKeyListener
 import com.duckduckgo.app.global.rating.PromptCount
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class RateAppDialogFragment : EnjoymentDialog() {
 
diff --git a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
index 840651901e97..2e2ced876991 100644
--- a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt
@@ -24,7 +24,6 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.DuckDuckGoActivity
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.android.synthetic.main.content_app_icons.appIconsList
 import kotlinx.android.synthetic.main.include_toolbar.toolbar
 import kotlinx.android.synthetic.main.content_app_icons.*
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
index cd85ce25c32f..8ca03e51e053 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
@@ -26,7 +26,6 @@ import androidx.fragment.app.DialogFragment
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.settings.clear.ClearWhatOption
 import com.duckduckgo.app.settings.clear.ClearWhatOption.*
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class SettingsAutomaticallyClearWhatFragment : DialogFragment() {
 
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
index 5ab2879ee48a..726a9c9c28ee 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
@@ -28,7 +28,6 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.view.show
 import com.duckduckgo.app.settings.clear.ClearWhenOption
 import com.duckduckgo.app.settings.clear.ClearWhenOption.*
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class SettingsAutomaticallyClearWhenFragment : DialogFragment() {
 

From 2d0c50ce426ae0776e64d0d47bdf2579f9191ac7 Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Wed, 27 May 2020 16:19:19 +0200
Subject: [PATCH 27/28] more cleanup reveryting changes

---
 app/src/main/res/drawable/ic_fire_red.xml     | 25 -------------------
 .../main/res/layout/sheet_fire_clear_data.xml |  2 +-
 app/src/main/res/values/themes.xml            |  2 --
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_fire_red.xml

diff --git a/app/src/main/res/drawable/ic_fire_red.xml b/app/src/main/res/drawable/ic_fire_red.xml
deleted file mode 100644
index e3dfcf68cf9b..000000000000
--- a/app/src/main/res/drawable/ic_fire_red.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/fireIconColor"
-        android:pathData="M10.208,22.307c-2.552,-0.843 -4.667,-2.904 -5.762,-6.043C2.818,11.79 6.172,8.23 6.172,8.23s-0.097,0.913 0.316,1.92c0.413,1.007 1.216,1.734 1.216,1.734S6.926,9.775 8.822,6.26c2.14,-3.959 6.855,-4.803 6.855,-4.803S14.486,3.356 15.02,5.3c0.414,1.453 1.094,2.156 1.848,4.123 0.754,2.015 0.632,3.116 0.632,3.116s0.22,-1.24 0.754,-2.084C19.42,8.603 21,8.159 21,8.159s-0.826,1.686 -0.631,3.958c0.145,1.664 0.388,3.585 -0.511,5.74 -0.706,1.71 -2.747,4.052 -5.615,4.685 1.653,-0.703 2.746,-2.343 2.625,-4.123 -0.073,-1.03 -0.705,-2.015 -1.385,-2.694 -0.413,2.6 -1.896,2.905 -1.896,2.905s0.85,-1.71 0.972,-3.608a5.997,5.997 0,0 0,-0.219 -2.342c-0.777,-2.694 -2.114,-3.42 -2.114,-3.42s0.438,1.568 -1.167,4.099c-1.119,1.757 -3.015,3.045 -2.942,5.669 0.05,1.405 0.9,2.6 2.091,3.28z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_fire_clear_data.xml b/app/src/main/res/layout/sheet_fire_clear_data.xml
index 808d8c62e6af..862a7c1da0bf 100644
--- a/app/src/main/res/layout/sheet_fire_clear_data.xml
+++ b/app/src/main/res/layout/sheet_fire_clear_data.xml
@@ -56,7 +56,7 @@
         android:paddingEnd="24dp"
         android:paddingBottom="24dp"
         android:text="@string/fireCancel"
-        android:textColor="?normalTextColor"
+        android:textColor="@color/brownishGray"
         android:textSize="16sp"
         android:textStyle="normal"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2c2640bd7344..b8b214f8961a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -92,8 +92,6 @@
         <item name="feedbackEditTextHintColor">@color/grayish</item>
 
         <item name="privacyDashboardLogoLetterTextColor">@color/subtleGray</item>
-
-        <item name="fireIconColor">@color/brickOrangeDark</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.BaseDark" />

From 5abac5824326271273fed6a97168a035455e8385 Mon Sep 17 00:00:00 2001
From: David Gonzalez <malmstein@gmail.com>
Date: Wed, 27 May 2020 16:29:38 +0200
Subject: [PATCH 28/28] revert change in bookmarks

---
 app/src/main/res/layout/edit_bookmark.xml | 2 --
 app/src/main/res/values/themes.xml        | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app/src/main/res/layout/edit_bookmark.xml b/app/src/main/res/layout/edit_bookmark.xml
index e4cff86e51bf..27e886f98627 100644
--- a/app/src/main/res/layout/edit_bookmark.xml
+++ b/app/src/main/res/layout/edit_bookmark.xml
@@ -36,7 +36,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/bookmarkTitleHint"
-            android:textColor="?normalTextColor"
             android:inputType="text|textCapWords" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -55,7 +54,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/bookmarkUrlHint"
-            android:textColor="?normalTextColor"
             android:inputType="textUri" />
 
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b8b214f8961a..512ee71bb9c7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -171,8 +171,6 @@
         <item name="feedbackEditTextHintColor">@color/warmerGray</item>
 
         <item name="privacyDashboardLogoLetterTextColor">@color/whiteFour</item>
-
-        <item name="fireIconColor">@color/brickOrangeLight</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.BaseLight">