remove icon from location + DRM dialogs

duckduckgo · Nov 28, 2023 · bf9b98b · bf9b98b
1 parent 12a32db
commit bf9b98b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 63 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
@@ -1433,9 +1433,6 @@ class BrowserTabFragment :
         } else {
             getString(R.string.preciseLocationSiteDialogSubtitle)
         }
-        lifecycleScope.launch {
-            faviconManager.loadToViewFromLocalWithPlaceholder(tabId, domain, binding.sitePermissionDialogFavicon)
-        }
 
         val dialog = MaterialAlertDialogBuilder(requireActivity())
             .setView(binding.root)

diff --git a/app/src/main/res/layout/content_site_location_permission_dialog.xml b/app/src/main/res/layout/content_site_location_permission_dialog.xml
@@ -29,25 +29,6 @@
             android:gravity="center"
             android:orientation="vertical">
 
-        <FrameLayout
-                android:id="@+id/sitePermissionDialogFaviconContainer"
-                android:layout_width="@dimen/dialogImageSize"
-                android:layout_height="@dimen/dialogImageSize"
-                android:layout_marginBottom="@dimen/keyline_4"
-                android:background="@drawable/list_item_image_circular_background"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                    android:id="@+id/sitePermissionDialogFavicon"
-                    android:layout_width="22dp"
-                    android:layout_height="22dp"
-                    android:layout_gravity="center"
-                    android:importantForAccessibility="no"
-                    android:src="@drawable/ic_globe_gray_16dp"/>
-        </FrameLayout>
-
         <com.duckduckgo.common.ui.view.text.DaxTextView
                 android:id="@+id/sitePermissionDialogTitle"
                 app:typography="h2"

diff --git a/app/src/main/res/layout/content_system_location_permission_dialog.xml b/app/src/main/res/layout/content_system_location_permission_dialog.xml
@@ -27,18 +27,6 @@
             android:gravity="center"
             android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/faviconImage"
-                android:layout_width="@dimen/dialogImageSize"
-                android:layout_height="@dimen/dialogImageSize"
-                android:layout_gravity="center"
-                android:importantForAccessibility="no"
-                android:layout_marginBottom="@dimen/keyline_4"
-                app:srcCompat="@drawable/ic_dax_icon"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
         <com.duckduckgo.common.ui.view.text.DaxTextView
                 android:id="@+id/systemPermissionDialogTitle"
                 app:typography="h2"

diff --git a/...c/main/java/com/duckduckgo/site/permissions/impl/SitePermissionsDialogActivityLauncher.kt b/...c/main/java/com/duckduckgo/site/permissions/impl/SitePermissionsDialogActivityLauncher.kt
@@ -26,7 +26,6 @@ import android.webkit.PermissionRequest
 import androidx.activity.result.ActivityResultCaller
 import androidx.annotation.StringRes
 import androidx.core.net.toUri
-import com.duckduckgo.app.browser.favicon.FaviconManager
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.common.ui.view.addClickableLink
 import com.duckduckgo.common.ui.view.dialog.TextAlertDialogBuilder
@@ -67,9 +66,6 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
     private var siteURL: String = ""
     private var tabId: String = ""
 
-    @Inject
-    lateinit var faviconManager: FaviconManager
-
     override fun registerPermissionLauncher(caller: ActivityResultCaller) {
         systemPermissionsHelper.registerPermissionLaunchers(
             caller,
@@ -107,7 +103,7 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
                 showSitePermissionsRationaleDialog(R.string.sitePermissionsCameraDialogTitle, url, this::askForCameraPermissions)
             }
             permissionsHandledByUser.contains(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID) -> {
-                showSiteDrmPermissionsDialog(activity, url, tabId)
+                showSiteDrmPermissionsDialog(activity, url)
             }
         }
     }
@@ -138,7 +134,6 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
     private fun showSiteDrmPermissionsDialog(
         activity: Activity,
         url: String,
-        tabId: String,
     ) {
         val domain = url.extractDomain() ?: url
 
@@ -170,10 +165,6 @@ class SitePermissionsDialogActivityLauncher @Inject constructor(
             activity.startActivity(Intent(Intent.ACTION_VIEW, DRM_LEARN_MORE_URL))
         }
 
-        appCoroutineScope.launch(dispatcher.main()) {
-            faviconManager.loadToViewFromLocalWithPlaceholder(tabId, url, binding.sitePermissionDialogFavicon)
-        }
-
         binding.siteAllowAlwaysDrmPermission.setOnClickListener {
             systemPermissionGranted()
             onSiteDrmPermissionSave(domain, SitePermissionAskSettingType.ALLOW_ALWAYS)

diff --git a/...missions/site-permissions-impl/src/main/res/layout/content_site_drm_permission_dialog.xml b/...missions/site-permissions-impl/src/main/res/layout/content_site_drm_permission_dialog.xml
@@ -29,25 +29,6 @@
             android:gravity="center"
             android:orientation="vertical">
 
-        <FrameLayout
-                android:id="@+id/sitePermissionDialogFaviconContainer"
-                android:layout_width="@dimen/dialogImageSize"
-                android:layout_height="@dimen/dialogImageSize"
-                android:layout_marginBottom="@dimen/keyline_4"
-                android:background="@drawable/list_item_image_circular_background"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                    android:id="@+id/sitePermissionDialogFavicon"
-                    android:layout_width="22dp"
-                    android:layout_height="22dp"
-                    android:layout_gravity="center"
-                    android:importantForAccessibility="no"
-                    android:src="@drawable/ic_globe_gray_16dp"/>
-        </FrameLayout>
-
         <com.duckduckgo.common.ui.view.text.DaxTextView
                 android:id="@+id/sitePermissionDialogTitle"
                 app:typography="h2"