Fire Dialog: Granular fire bottom sheet

android-design-system/design-system/src/main/res/drawable/background_large_rounded_surface.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2022 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.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/daxColorSurface" />
+    <corners android:radius="@dimen/mediumShapeCornerRadius" />
+</shape>

android-design-system/design-system/src/main/res/drawable/img_fire_96.xml

@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="96"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M42.647,18C47.94,21.52 48.28,27.4 49.784,33C50.039,33.949 51.412,38 56,38C60.078,38 61.765,35.271 62.274,34C62.784,32.729 63.039,30.002 63.294,30.229C63.549,30.457 72.2,39.865 72.2,56.136C72.2,68.339 62.02,76 48,76C33.98,76 22,68.339 22,56.136C22,39.865 35.765,35.797 42.647,18Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="47.366"
+          android:startY="29.6"
+          android:endX="53.23"
+          android:endY="70.978"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFA8B38"/>
+        <item android:offset="0.52" android:color="#FFE72A57"/>
+        <item android:offset="1" android:color="#FFCC165B"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M72,56.136C72,45.491 67.263,37.951 64.296,34.271C64.243,34.436 64.19,34.596 64.131,34.744C63.455,36.429 61.212,40 56,40C53.021,40 50.999,38.648 49.734,37.141C48.523,35.695 48.017,34.132 47.853,33.519C47.465,32.077 47.146,30.588 46.831,29.244C46.509,27.866 46.181,26.587 45.754,25.395C45.197,23.839 44.483,22.467 43.431,21.295C39.899,29.083 35.106,34.227 31.293,38.903C27.077,44.074 24,48.705 24,56.136L24.005,56.527C24.201,64.733 30.552,71.871 39.601,74.72C42.231,75.548 45.066,76 48,76C50.934,76 53.769,75.548 56.399,74.72C65.591,71.825 72,64.505 72,56.136ZM75.994,56.63C75.749,66.974 67.815,75.318 57.601,78.534C54.584,79.484 51.345,80 48,80C44.655,80 41.416,79.484 38.399,78.534C28.184,75.318 20.251,66.974 20.006,56.63L20,56.136C20,47.295 23.806,41.756 28.192,36.376C32.577,30.998 37.482,25.811 40.782,17.278L40.875,17.073C41.118,16.608 41.536,16.254 42.042,16.094C42.62,15.91 43.25,15.999 43.755,16.335C46.867,18.404 48.49,21.172 49.52,24.046C50.027,25.463 50.397,26.924 50.727,28.333C51.064,29.776 51.351,31.123 51.716,32.481C51.806,32.817 52.115,33.754 52.8,34.571C53.433,35.326 54.391,36 56,36C58.944,36 60.074,34.113 60.418,33.256C60.585,32.839 60.741,32.067 60.917,31.168C60.991,30.789 61.079,30.343 61.172,30.008C61.208,29.879 61.297,29.563 61.472,29.264C61.534,29.156 61.8,28.701 62.367,28.423C62.708,28.256 63.148,28.16 63.629,28.248C63.973,28.311 64.245,28.451 64.446,28.594L64.624,28.734L64.63,28.74C65.012,29.083 76,38.994 76,56.136L75.994,56.63Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="48"
+          android:startY="18"
+          android:endX="48"
+          android:endY="78"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF862D"/>
+        <item android:offset="1" android:color="#FFB40B4A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M48,51C53.333,56.459 60,62.373 60,68.173C60,74.428 56,80 48,80C40,80 36,74.428 36,68.173C36,61.918 42.667,56.459 48,51Z"
+      android:fillColor="#FFCC33"/>
+</vector>

app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt

@@ -81,6 +81,7 @@ import com.duckduckgo.app.global.intentText
 import com.duckduckgo.app.global.rating.PromptCount
 import com.duckduckgo.app.global.sanitize
 import com.duckduckgo.app.global.view.ClearDataAction
+import com.duckduckgo.app.global.view.FireDialog
 import com.duckduckgo.app.global.view.FireDialogProvider
 import com.duckduckgo.app.global.view.renderIfChanged
 import com.duckduckgo.app.onboarding.ui.page.DefaultBrowserPage
@@ -346,6 +347,7 @@ open class BrowserActivity : DuckDuckGoActivity() {
         // LiveData observers are restarted on each showWebContent() call; we want to subscribe to
         // flows only once, so a separate initialization is necessary
         configureFlowCollectors()
+        setupFireDialogListener()
 
         viewModel.viewState
             .flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED)
@@ -399,6 +401,24 @@ open class BrowserActivity : DuckDuckGoActivity() {
         }
     }
 
+    private fun setupFireDialogListener() {
+        supportFragmentManager.setFragmentResultListener(FireDialog.REQUEST_KEY, this) { _, bundle ->
+            when (bundle.getString(FireDialog.RESULT_KEY_EVENT)) {
+                FireDialog.EVENT_ON_SHOW -> {
+                    currentTab?.onFireDialogVisibilityChanged(isVisible = true)
+                }
+                FireDialog.EVENT_ON_CANCEL -> {
+                    pixel.fire(FIRE_DIALOG_CANCEL)
+                    currentTab?.onFireDialogVisibilityChanged(isVisible = false)
+                }
+                FireDialog.EVENT_ON_CLEAR_STARTED -> {
+                    isDataClearingInProgress = true
+                    removeObservers()
+                }
+            }
+        }
+    }
+
     override fun onStart() {
         super.onStart()
         duckAiAnimDelayJob =
@@ -801,17 +821,10 @@ open class BrowserActivity : DuckDuckGoActivity() {
         val params = mapOf(PixelParameter.FROM_FOCUSED_NTP to launchedFromFocusedNtp.toString())
         pixel.fire(AppPixelName.FORGET_ALL_PRESSED_BROWSING, params)
 
-        val dialog = fireDialogProvider.createFireDialog(context = this)
-        dialog.setOnShowListener { currentTab?.onFireDialogVisibilityChanged(isVisible = true) }
-        dialog.setOnCancelListener {
-            pixel.fire(FIRE_DIALOG_CANCEL)
-            currentTab?.onFireDialogVisibilityChanged(isVisible = false)
-        }
-        dialog.clearStarted = {
-            isDataClearingInProgress = true
-            removeObservers()
+        lifecycleScope.launch {
+            val dialog = fireDialogProvider.createFireDialog()
+            dialog.show(supportFragmentManager)
         }
-        dialog.show()
     }
 
     fun launchSettings() {

app/src/main/java/com/duckduckgo/app/browser/weblocalstorage/WebLocalStorageManager.kt

@@ -71,39 +71,9 @@ class DuckDuckGoWebLocalStorageManager @Inject constructor(
     private var matchingRegex = emptyList<String>()
 
     override suspend fun clearWebLocalStorage() = withContext(dispatcherProvider.io()) {
-        val settings = androidBrowserConfigFeature.webLocalStorage().getSettings()
-        val webLocalStorageSettings = webLocalStorageSettingsJsonParser.parseJson(settings)
-
-        val fireproofedDomains = fireproofWebsiteRepository.fireproofWebsitesSync().map { it.domain }
-
-        domains = webLocalStorageSettings.domains.list + fireproofedDomains
-        keysToDelete = webLocalStorageSettings.keysToDelete.list
-        matchingRegex = webLocalStorageSettings.matchingRegex.list
-
-        logcat { "WebLocalStorageManager: Allowed domains: $domains" }
-        logcat { "WebLocalStorageManager: Keys to delete: $keysToDelete" }
-        logcat { "WebLocalStorageManager: Matching regex: $matchingRegex" }
-
-        val db = databaseProvider.get()
-        db.iterator().use { iterator ->
-            iterator.seekToFirst()
-
-            while (iterator.hasNext()) {
-                val entry = iterator.next()
-                val key = String(entry.key, StandardCharsets.UTF_8)
-
-                val domainForMatchingAllowedKey = getDomainForMatchingAllowedKey(key)
-                if (domainForMatchingAllowedKey == null) {
-                    db.delete(entry.key)
-                    logcat { "WebLocalStorageManager: Deleted key: $key" }
-                } else if (settingsDataStore.clearDuckAiData && DUCKDUCKGO_DOMAINS.contains(domainForMatchingAllowedKey)) {
-                    if (keysToDelete.any { key.endsWith(it) }) {
-                        db.delete(entry.key)
-                        logcat { "WebLocalStorageManager: Deleted key: $key" }
-                    }
-                }
-            }
-        }
+        val shouldClearBrowserData = true // As per legacy behavior, we always clear browser data
+        val shouldClearDuckAiData = settingsDataStore.clearDuckAiData
+        clearWebLocalStorage(shouldClearBrowserData, shouldClearDuckAiData)
     }
 
     override suspend fun clearWebLocalStorage(

app/src/main/java/com/duckduckgo/app/firebutton/FireButtonActivity.kt

@@ -49,6 +49,7 @@ import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.di.scopes.ActivityScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import logcat.logcat
 import javax.inject.Inject
 
@@ -288,8 +289,10 @@ class FireButtonActivity : DuckDuckGoActivity() {
     }
 
     private fun launchFireDialog() {
-        val dialog = fireDialogProvider.createFireDialog(context = this)
-        dialog.show()
+        lifecycleScope.launch {
+            val dialog = fireDialogProvider.createFireDialog()
+            dialog.show(supportFragmentManager)
+        }
     }
 
     companion object {