Bug 1974873 - Migrate the AlertDialogs in Fenix to use the Material component. r=android-reviewers,tthibaud

Differential Revision: https://phabricator.services.mozilla.com/D262756

Author: iorgamgabriel

mobile/android/android-components/components/feature/addons/build.gradle

@@ -61,6 +61,7 @@ dependencies {
     implementation libs.androidx.core.ktx
     implementation libs.androidx.recyclerview
     implementation libs.androidx.room.runtime
+    implementation libs.google.material
     ksp libs.androidx.room.compiler
     implementation libs.androidx.work.runtime
     implementation libs.kotlinx.coroutines

mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/Extensions.kt

@@ -6,10 +6,10 @@ package mozilla.components.feature.addons.ui
 
 import android.content.Context
 import android.widget.ImageView
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.R
 import mozilla.components.feature.addons.update.AddonUpdater
@@ -120,7 +120,7 @@ fun AddonUpdater.Status?.toLocalizedString(context: Context): String {
  * Shows a dialog containing all the information related to the given [AddonUpdater.UpdateAttempt].
  */
 fun AddonUpdater.UpdateAttempt.showInformationDialog(context: Context) {
-    AlertDialog.Builder(context)
+    MaterialAlertDialogBuilder(context)
         .setTitle(R.string.mozac_feature_addons_updater_dialog_title)
         .setMessage(getDialogMessage(context))
         .show()

mobile/android/android-components/components/feature/app-links/build.gradle

@@ -36,6 +36,7 @@ dependencies {
     implementation project(':components:ui-widgets')
 
     implementation libs.kotlinx.coroutines
+    implementation libs.google.material
 
     testImplementation project(':components:support-test')
     testImplementation project(':components:support-test-libstate')

mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/SimpleRedirectDialogFragment.kt

@@ -15,13 +15,14 @@ import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import mozilla.components.support.ktx.util.PromptAbuserDetector
 import mozilla.components.ui.widgets.withCenterAlignedButtons
 
 /**
  * This is the default implementation of the [RedirectDialogFragment].
  *
- * It provides an [AlertDialog] giving the user the choice to allow or deny the opening of a
+ * It provides an [MaterialAlertDialogBuilder] giving the user the choice to allow or deny the opening of a
  * third party app.
  *
  * Intents passed are guaranteed to be openable by a non-browser app.
@@ -38,9 +39,13 @@ class SimpleRedirectDialogFragment(
     internal var testingContext: Context? = null
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        fun getBuilder(themeID: Int): AlertDialog.Builder {
+        fun getBuilder(themeID: Int): MaterialAlertDialogBuilder {
             val context = testingContext ?: requireContext()
-            return if (themeID == 0) AlertDialog.Builder(context) else AlertDialog.Builder(context, themeID)
+            return if (themeID == 0) {
+                MaterialAlertDialogBuilder(context)
+            } else {
+                MaterialAlertDialogBuilder(context, themeID)
+            }
         }
 
         promptAbuserDetector.updateJSDialogAbusedState()

mobile/android/android-components/components/feature/app-links/src/test/java/mozilla/components/feature/app/links/SimpleRedirectDialogFragmentTest.kt

@@ -24,11 +24,10 @@ import org.mockito.Mockito.doNothing
 import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.spy
 import org.robolectric.Shadows.shadowOf
-import androidx.appcompat.R as appcompatR
 
 @RunWith(AndroidJUnit4::class)
 class SimpleRedirectDialogFragmentTest {
-    private val themeResId = appcompatR.style.Theme_AppCompat_Light
+    private val themeResId = com.google.android.material.R.style.Theme_MaterialComponents_Light
 
     @Before
     fun setUp() {

mobile/android/android-components/components/feature/autofill/build.gradle

@@ -42,6 +42,7 @@ dependencies {
     implementation libs.androidx.preferences
     implementation libs.androidx.recyclerview
     implementation libs.kotlinx.coroutines
+    implementation libs.google.material
 
     testImplementation project(':components:lib-fetch-okhttp')
     testImplementation project(':components:support-test')

mobile/android/android-components/components/feature/autofill/src/main/java/mozilla/components/feature/autofill/ui/AbstractAutofillConfirmActivity.kt

@@ -11,10 +11,10 @@ import android.content.Intent
 import android.os.Bundle
 import android.service.autofill.Dataset
 import android.view.autofill.AutofillManager
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -101,7 +101,7 @@ internal class AutofillConfirmFragment : DialogFragment() {
         get() = getConfirmActivity().configuration
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        return AlertDialog.Builder(requireContext())
+        return MaterialAlertDialogBuilder(requireContext())
             .setTitle(
                 getString(R.string.mozac_feature_autofill_confirmation_title),
             )

mobile/android/android-components/components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuFragment.kt

@@ -14,12 +14,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.annotation.VisibleForTesting
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textview.MaterialTextView
 import mozilla.components.browser.state.state.SessionState
 
@@ -60,7 +60,7 @@ class ContextMenuFragment : DialogFragment() {
         @SuppressLint("UseGetLayoutInflater")
         val inflater = LayoutInflater.from(requireContext())
 
-        val builder = AlertDialog.Builder(requireContext())
+        val builder = MaterialAlertDialogBuilder(requireContext())
             .setCustomTitle(createDialogTitleView(inflater))
             .setView(createDialogContentView(inflater))
 

mobile/android/android-components/components/feature/contextmenu/src/test/java/mozilla/components/feature/contextmenu/ContextMenuFragmentTest.kt

@@ -16,6 +16,7 @@ import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.doNothing
@@ -25,6 +26,12 @@ import org.mockito.Mockito.verify
 
 @RunWith(AndroidJUnit4::class)
 class ContextMenuFragmentTest {
+
+    @Before
+    fun setup() {
+        testContext.setTheme(com.google.android.material.R.style.Theme_MaterialComponents_Light)
+    }
+
     @Test
     fun `Build dialog`() {
         val ids = listOf("A", "B", "C")

mobile/android/android-components/components/feature/downloads/README.md

@@ -74,7 +74,7 @@ class FocusDialogDownloadFragment : DownloadDialogFragment() {
         val url = arguments?.getString(KEY_URL)
         val contentLength = arguments?.getString(KEY_CONTENT_LENGTH)
 
-        val builder = AlertDialog.Builder(requireContext())
+        val builder = MaterialAlertDialogBuilder(requireContext())
         builder.setCancelable(true)
         builder.setTitle(getString(R.string.download_dialog_title))