From bdf16280bfce8561a295149c7af1cf0d4e0f6a0f Mon Sep 17 00:00:00 2001
From: Ezequiel <ezequielzanetta@gmail.com>
Date: Wed, 17 Jun 2020 21:13:55 -0300
Subject: [PATCH 1/2] Add FireDialog theme in order to fix navigation buttons
 hiden on some devices

---
 .../main/java/com/duckduckgo/app/global/view/FireDialog.kt  | 5 ++++-
 app/src/main/res/values/styles.xml                          | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt b/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt
index 76588a6dc06f..9ade80e6bab8 100644
--- a/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt
@@ -25,7 +25,10 @@ import kotlinx.android.synthetic.main.sheet_fire_clear_data.*
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 
-class FireDialog(context: Context, private val clearPersonalDataAction: ClearPersonalDataAction) : BottomSheetDialog(context) {
+class FireDialog(
+    context: Context,
+    private val clearPersonalDataAction: ClearPersonalDataAction
+) : BottomSheetDialog(context, R.style.FireDialog) {
 
     var clearStarted: (() -> Unit) = {}
     var clearComplete: (() -> Unit) = {}
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d00777c48ae7..a9162aa5a2b3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -310,4 +310,10 @@
         <item name="android:textColor">?attr/colorAccent</item>
     </style>
 
+    <style name="FireDialog" parent="@style/Theme.Design.BottomSheetDialog">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:navigationBarColor">?toolbarBgColor</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
 </resources>
\ No newline at end of file

From 56a04e4dc75ffb6357ffb270b0b49e558981eac3 Mon Sep 17 00:00:00 2001
From: Ezequiel <ezequielzanetta@gmail.com>
Date: Thu, 25 Jun 2020 10:45:10 -0300
Subject: [PATCH 2/2] Remove android:navigationBarColor from main style and
 move the same style to v27 theme file for better compatibility

---
 app/src/main/res/values-v27/themes.xml | 6 ++++++
 app/src/main/res/values/styles.xml     | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index f457f6ee067c..76df695c7cc1 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -30,4 +30,10 @@
         <item name="android:navigationBarColor">@color/white</item>
     </style>
 
+    <style name="FireDialog" parent="@style/Theme.Design.BottomSheetDialog">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:navigationBarColor">?toolbarBgColor</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a9162aa5a2b3..08d31407672e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -312,7 +312,6 @@
 
     <style name="FireDialog" parent="@style/Theme.Design.BottomSheetDialog">
         <item name="android:windowIsFloating">false</item>
-        <item name="android:navigationBarColor">?toolbarBgColor</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>