From affec55898c59deee345acceb1fa5a7c531b2019 Mon Sep 17 00:00:00 2001
From: Mugurell <Mugurell@users.noreply.github.com>
Date: Mon, 18 May 2026 20:44:28 +0300
Subject: [PATCH] Update Android Components to 20260518093736 and handle
 breaking changes

---
 .../browser/addons/WebExtensionPromptFeature.kt    | 14 ++++++++------
 .../browser/browser/CustomTabsIntegration.kt       |  2 +-
 .../browser/browser/ToolbarIntegration.kt          |  2 +-
 .../layout/activity_installed_add_on_details.xml   |  2 +-
 app/src/main/res/layout/fragment_browser.xml       |  2 +-
 gradle/libs.versions.toml                          |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt b/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt
index 8e43dd82d..0d121e2d9 100644
--- a/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt
+++ b/app/src/main/java/org/mozilla/reference/browser/addons/WebExtensionPromptFeature.kt
@@ -52,20 +52,18 @@ class WebExtensionPromptFeature(
         scope = store.flowScoped(dispatcher = mainDispatcher) { flow ->
             flow
                 .mapNotNull { state ->
-                state.webExtensionPromptRequest
-            }.distinctUntilChanged()
+                    state.webExtensionPromptRequest
+                }.distinctUntilChanged()
                 .collect { promptRequest ->
-                when (promptRequest) {
-                    is WebExtensionPromptRequest.AfterInstallation -> {
+                    if (promptRequest is WebExtensionPromptRequest.AfterInstallation) {
                         handleAfterInstallationRequest(promptRequest)
                     }
 
-                    is WebExtensionPromptRequest.BeforeInstallation.InstallationFailed -> {
+                    if (promptRequest is WebExtensionPromptRequest.BeforeInstallation.InstallationFailed) {
                         handleBeforeInstallationRequest(promptRequest)
                         consumePromptRequest()
                     }
                 }
-            }
         }
         tryToReAttachButtonHandlersToPreviousDialog()
     }
@@ -241,6 +239,10 @@ class WebExtensionPromptFeature(
                 promptRequest.onConfirm(response)
             }
 
+            is WebExtensionPromptRequest.InstallationRequested -> {
+                // opt-out
+            }
+
             is WebExtensionPromptRequest.AfterInstallation.PostInstallation -> {
                 // opt-out
             }
diff --git a/app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt b/app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt
index 9de49a46a..345ed2ad4 100644
--- a/app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt
+++ b/app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt
@@ -90,7 +90,7 @@ class CustomTabsIntegration(
             contentDescription = "Stop",
             icon = DrawableMenuIcon(
                 context,
-                mozilla.components.ui.icons.R.drawable.mozac_ic_stop,
+                mozilla.components.ui.icons.R.drawable.mozac_ic_cross_24,
                 tint = tint,
             ),
         ) {
diff --git a/app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt
index 473ddc916..c7ff72280 100644
--- a/app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt
+++ b/app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt
@@ -97,7 +97,7 @@ class ToolbarIntegration(
             contentDescription = "Stop",
             icon = DrawableMenuIcon(
                 context,
-                mozilla.components.ui.icons.R.drawable.mozac_ic_stop,
+                mozilla.components.ui.icons.R.drawable.mozac_ic_cross_24,
                 tint = tint,
             ),
         ) {
diff --git a/app/src/main/res/layout/activity_installed_add_on_details.xml b/app/src/main/res/layout/activity_installed_add_on_details.xml
index 169930790..268b6dcd2 100644
--- a/app/src/main/res/layout/activity_installed_add_on_details.xml
+++ b/app/src/main/res/layout/activity_installed_add_on_details.xml
@@ -39,7 +39,7 @@
                 android:padding="16dp"
                 android:text="@string/mozac_feature_addons_settings"
                 android:textSize="18sp"
-                app:drawableStartCompat="@drawable/mozac_ic_preferences"
+                app:drawableStartCompat="@drawable/mozac_ic_settings_24"
                 app:drawableTint="@color/icons" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index e95ad86e9..ac7aabb59 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -71,7 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        android:src="@drawable/mozac_ic_font"
+        android:src="@drawable/mozac_ic_reader_view_24"
         android:contentDescription="@string/reader_view_appearance_button"
         android:visibility="gone"
         android:layout_marginRight="16dp"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 51ce37c58..94cabbbf3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Android Components
-android-components = "152.0.20260513094209"
+android-components = "152.0.20260518093736"
 
 # AGP
 android-gradle-plugin = "9.2.1"