From 97bfe1bb5e106812bd377a528488a4805dc74df4 Mon Sep 17 00:00:00 2001
From: deeppandya <deeppandya91@gmail.com>
Date: Tue, 28 Nov 2023 12:59:30 -0500
Subject: [PATCH] Update vpn icon for light/dark mode

---
 android/java/res/drawable/ic_vpn.xml          | 35 ++++---------------
 .../java/res/values-night/brave_colors.xml    |  1 +
 android/java/res/values/brave_colors.xml      |  1 +
 3 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/android/java/res/drawable/ic_vpn.xml b/android/java/res/drawable/ic_vpn.xml
index 3e1727eda39..76979763435 100644
--- a/android/java/res/drawable/ic_vpn.xml
+++ b/android/java/res/drawable/ic_vpn.xml
@@ -1,35 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M2,4.75L22,4.75A1.25,1.25 0,0 1,23.25 6L23.25,19A1.25,1.25 0,0 1,22 20.25L2,20.25A1.25,1.25 0,0 1,0.75 19L0.75,6A1.25,1.25 0,0 1,2 4.75z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/shield_text_color"/>
-  <path
-      android:pathData="M5.81,16.4L8.159,9.354H6.572L5,14.74H4.912L3.31,9.354H1.645L4.028,16.4H5.81Z"
-      android:fillColor="@color/shield_text_color"/>
-  <path
-      android:pathData="M9.148,9.354V16.4H10.622V14.212H12.014C13.498,14.212 14.528,13.241 14.528,11.791C14.528,10.326 13.537,9.354 12.087,9.354H9.148ZM10.622,10.565H11.696C12.546,10.565 13.03,10.995 13.03,11.795C13.03,12.587 12.536,13.016 11.692,13.016H10.622V10.565Z"
-      android:fillColor="@color/shield_text_color"/>
-  <path
-      android:pathData="M17.08,16.4V11.991H17.168L20.42,16.4H21.641V9.354H20.229V13.744H20.142L16.899,9.354H15.669V16.4H17.08Z"
-      android:fillColor="@color/shield_text_color"/>
-  <path
-      android:strokeWidth="1"
-      android:pathData="M5.81,16.4L8.159,9.354H6.572L5,14.74H4.912L3.31,9.354H1.645L4.028,16.4H5.81Z"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/shield_text_color"/>
-  <path
-      android:strokeWidth="1"
-      android:pathData="M9.148,9.354V16.4H10.622V14.212H12.014C13.498,14.212 14.528,13.241 14.528,11.791C14.528,10.326 13.537,9.354 12.087,9.354H9.148ZM10.622,10.565H11.696C12.546,10.565 13.03,10.995 13.03,11.795C13.03,12.587 12.536,13.016 11.692,13.016H10.622V10.565Z"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/shield_text_color"/>
-  <path
-      android:strokeWidth="1"
-      android:pathData="M17.08,16.4V11.991H17.168L20.42,16.4H21.641V9.354H20.229V13.744H20.142L16.899,9.354H15.669V16.4H17.08Z"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/shield_text_color"/>
+    <path
+        android:fillColor="@color/vpn_icon_color"
+        android:fillType="evenOdd"
+        android:pathData="M12,3.604L6.5,6.003V9.629C6.5,13.129 8.892,16.351 12,17.299C15.108,16.351 17.5,13.129 17.5,9.629V6.003L12,3.604ZM19.131,9.629C19.131,13.657 16.479,17.442 12.8,18.724V19.166C13.261,19.368 13.632,19.739 13.834,20.2H20.2C20.642,20.2 21,20.558 21,21C21,21.442 20.642,21.8 20.2,21.8H13.834C13.525,22.506 12.82,23 12,23C11.18,23 10.475,22.506 10.166,21.8H3.8C3.358,21.8 3,21.442 3,21C3,20.558 3.358,20.2 3.8,20.2H10.166C10.368,19.739 10.739,19.368 11.2,19.166V18.724C7.521,17.442 4.87,13.657 4.87,9.629V5.974C4.87,5.359 5.238,4.803 5.811,4.553L11.356,2.134C11.766,1.955 12.234,1.955 12.644,2.134L18.19,4.553C18.762,4.803 19.131,5.359 19.131,5.974V9.629ZM8.355,9.632C8.107,9.84 7.741,9.818 7.511,9.587C7.24,9.316 7.262,8.874 7.556,8.639C10.138,6.531 13.868,6.531 16.446,8.639C16.739,8.878 16.757,9.321 16.491,9.587C16.261,9.818 15.891,9.836 15.638,9.628C13.525,7.899 10.464,7.899 8.355,9.632ZM11.678,13.755L11.014,13.091C10.802,12.879 10.852,12.513 11.109,12.373C11.665,12.089 12.324,12.089 12.875,12.373C13.145,12.513 13.191,12.879 12.978,13.091L12.315,13.755C12.139,13.931 11.854,13.931 11.678,13.755ZM10.156,11.465C9.899,11.651 9.551,11.628 9.33,11.407C9.055,11.131 9.073,10.675 9.384,10.45C10.942,9.325 13.06,9.325 14.613,10.45C14.924,10.671 14.942,11.131 14.672,11.402L14.667,11.407C14.446,11.628 14.098,11.646 13.841,11.465C12.739,10.684 11.258,10.684 10.156,11.465Z"
+        tools:ignore="VectorPath" />
 </vector>
diff --git a/android/java/res/values-night/brave_colors.xml b/android/java/res/values-night/brave_colors.xml
index 5fd68cce77d..a075d30e748 100644
--- a/android/java/res/values-night/brave_colors.xml
+++ b/android/java/res/values-night/brave_colors.xml
@@ -247,4 +247,5 @@
     <color name="vpn_timer_bg_color">#0D0F14</color>
     <color name="vpn_timer_text_color">#F6F7F8</color>
     <color name="vpn_timer_icon_color">#A1ABBA</color>
+    <color name="vpn_icon_color">#A1ABBA</color>
 </resources>
diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml
index b00e6d1999c..49d40844b62 100644
--- a/android/java/res/values/brave_colors.xml
+++ b/android/java/res/values/brave_colors.xml
@@ -374,4 +374,5 @@
     <color name="vpn_timer_bg_color">#F6F7F8</color>
     <color name="vpn_timer_text_color">#0D0F14</color>
     <color name="vpn_timer_icon_color">#687485</color>
+    <color name="vpn_icon_color">#687485</color>
 </resources>