From 4f163e18e76e5544210c8d6736ac72d8235fd592 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Fri, 20 Aug 2021 16:57:54 -0400
Subject: [PATCH] For #20892 update connection icons in quick settings

---
 .../quicksettings/ConnectionDetailsView.kt    |  7 +------
 .../QuickSettingsFragmentState.kt             | 10 +++-------
 .../settings/quicksettings/WebsiteInfoView.kt |  8 +-------
 app/src/main/res/drawable/ic_broken_lock.xml  | 19 +++++++++++++++++++
 app/src/main/res/drawable/ic_lock.xml         | 13 +++++++++++++
 5 files changed, 37 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_broken_lock.xml
 create mode 100644 app/src/main/res/drawable/ic_lock.xml

diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionDetailsView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionDetailsView.kt
index 40a8b5640f..b7f8c7d548 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionDetailsView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/ConnectionDetailsView.kt
@@ -8,10 +8,8 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
-import androidx.core.content.ContextCompat.getColor
 import androidx.core.view.isVisible
 import mozilla.components.browser.icons.BrowserIcons
-import mozilla.components.support.ktx.android.content.getDrawableWithTint
 import org.mozilla.fenix.R
 import org.mozilla.fenix.databinding.ConnectionDetailsWebsiteInfoBinding
 import org.mozilla.fenix.ext.loadIntoView
@@ -53,11 +51,8 @@ class ConnectionDetailsView(
     }
 
     private fun bindSecurityInfo(uiValues: WebsiteSecurityUiValues) {
-        val tint = getColor(provideContext(), uiValues.iconTintRes)
         binding.securityInfo.setText(uiValues.securityInfoRes)
-        binding.securityInfoIcon.setImageDrawable(
-            provideContext().getDrawableWithTint(uiValues.iconRes, tint)
-        )
+        binding.securityInfoIcon.setImageResource(uiValues.iconRes)
     }
 
     @VisibleForTesting
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt
index bebea72360..dcd9430bd1 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt
@@ -5,7 +5,6 @@
 package org.mozilla.fenix.settings.quicksettings
 
 import android.content.Context
-import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import mozilla.components.concept.engine.permission.SitePermissions
@@ -69,18 +68,15 @@ data class WebsiteInfoState(
 
 enum class WebsiteSecurityUiValues(
     @StringRes val securityInfoRes: Int,
-    @DrawableRes val iconRes: Int,
-    @ColorRes val iconTintRes: Int
+    @DrawableRes val iconRes: Int
 ) {
     SECURE(
         R.string.quick_settings_sheet_secure_connection,
-        R.drawable.mozac_ic_lock,
-        R.color.photonGreen50
+        R.drawable.ic_lock
     ),
     INSECURE(
         R.string.quick_settings_sheet_insecure_connection,
-        R.drawable.mozac_ic_broken_lock,
-        R.color.photonRed50
+        R.drawable.ic_broken_lock
     )
 }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt
index 7152e3a2b9..7d92c8f3c9 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt
@@ -8,9 +8,7 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
-import androidx.core.content.ContextCompat.getColor
 import mozilla.components.browser.icons.BrowserIcons
-import mozilla.components.support.ktx.android.content.getDrawableWithTint
 import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl
 import org.mozilla.fenix.databinding.QuicksettingsWebsiteInfoBinding
 import org.mozilla.fenix.ext.components
@@ -50,13 +48,9 @@ class WebsiteInfoView(
     }
 
     private fun bindSecurityInfo(uiValues: WebsiteSecurityUiValues) {
-        val tint = getColor(provideContext(), uiValues.iconTintRes)
         binding.securityInfo.setText(uiValues.securityInfoRes)
         bindConnectionDetailsListener()
-
-        binding.securityInfoIcon.setImageDrawable(
-            provideContext().getDrawableWithTint(uiValues.iconRes, tint)
-        )
+        binding.securityInfoIcon.setImageResource(uiValues.iconRes)
     }
 
     @VisibleForTesting
diff --git a/app/src/main/res/drawable/ic_broken_lock.xml b/app/src/main/res/drawable/ic_broken_lock.xml
new file mode 100644
index 0000000000..dc9ec5a9f4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_broken_lock.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="?attr/primaryText"
+        android:pathData="M7 7.562V11H6.5A2.5 2.5 0 0 0 4 13.5v6A2.5 2.5 0 0 0 6.5 22h11c1.066 0 1.97-0.67 2.329-1.61L18.5 19.061V19.7l-0.8 0.8H6.3l-0.8-0.8v-6.4l0.8-0.8h5.638l-1.5-1.5H8.5V9.062L7 7.562z" />
+    <path
+        android:fillColor="#FF4F5E"
+        android:pathData="M4.78 3.22l17.5 17.5A0.748 0.748 0 0 1 21.749 22a0.748 0.748 0 0 1-0.53-0.22L3.719 4.281A0.75 0.75 0 1 1 4.78 3.22z" />
+    <path
+        android:fillColor="?attr/primaryText"
+        android:pathData="M12 3.5c1.93 0 3.5 1.57 3.5 3.5v4h-0.809l1.5 1.5H17.7l0.8 0.8v1.509l1.5 1.5V13.5a2.5 2.5 0 0 0-2.5-2.5H17V7a5 5 0 0 0-5-5 4.99 4.99 0 0 0-4.127 2.182L8.971 5.28C9.574 4.222 10.698 3.5 12 3.5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000000..8b2fe6870c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="?attr/primaryText"
+        android:pathData="M17.5 11H17V7A5 5 0 0 0 7 7v4H6.5A2.5 2.5 0 0 0 4 13.5v6A2.5 2.5 0 0 0 6.5 22h11a2.5 2.5 0 0 0 2.5-2.5v-6a2.5 2.5 0 0 0-2.5-2.5zm-9-4c0-1.93 1.57-3.5 3.5-3.5s3.5 1.57 3.5 3.5v4h-7V7zm10 12.7l-0.8 0.8H6.3l-0.8-0.8v-6.4l0.8-0.8h11.4l0.8 0.8v6.4z"/>
+</vector>