Merge branch '5311_main_toggle_wording' into 'main'

5311 main toggle wording, 5321 default settings

See merge request e/privacy-central/privacycentralapp!43

7 files changed, 104 insertions, 23 deletions

diff --git a/app/src/main/res/drawable-night/ic_shield_off.xml b/app/src/main/res/drawable-night/ic_shield_off.xml
new file mode 100644
index 0000000..f45fd98
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_shield_off.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="24dp"
+    android:viewportWidth="25"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M12.0183,1L3.0183,5V11C3.0183,16.55 6.8583,21.74 12.0183,23C17.1783,21.74 21.0183,16.55 21.0183,11V5L12.0183,1Z"/>
+    <path
+        android:pathData="M12.0183,1L12.8306,-0.8276L12.0183,-1.1886L11.206,-0.8276L12.0183,1ZM3.0183,5L2.206,3.1724L1.0183,3.7002V5H3.0183ZM12.0183,23L11.5439,24.9429L12.0183,25.0588L12.4927,24.9429L12.0183,23ZM21.0183,5H23.0183V3.7002L21.8306,3.1724L21.0183,5ZM11.206,-0.8276L2.206,3.1724L3.8306,6.8276L12.8306,2.8276L11.206,-0.8276ZM1.0183,5V11H5.0183V5H1.0183ZM1.0183,11C1.0183,17.3888 5.4102,23.4452 11.5439,24.9429L12.4927,21.0571C8.3064,20.0348 5.0183,15.7112 5.0183,11H1.0183ZM12.4927,24.9429C18.6264,23.4452 23.0183,17.3888 23.0183,11H19.0183C19.0183,15.7112 15.7302,20.0348 11.5439,21.0571L12.4927,24.9429ZM23.0183,11V5H19.0183V11H23.0183ZM21.8306,3.1724L12.8306,-0.8276L11.206,2.8276L20.206,6.8276L21.8306,3.1724Z"
+        android:fillColor="#ffffff"
+        android:fillAlpha="0.87"/>
+  </group>
+  <path
+      android:pathData="M15.1396,10.1213L15.8467,9.4142L14.4325,8L13.7254,8.7071L11.9325,10.5L10.1396,8.7071L9.4325,8L8.0183,9.4142L8.7254,10.1213L10.5183,11.9142L8.7254,13.7071L8.0183,14.4142L9.4325,15.8284L10.1396,15.1213L11.9325,13.3284L13.7254,15.1213L14.4325,15.8284L15.8467,14.4142L15.1396,13.7071L13.3467,11.9142L15.1396,10.1213Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.87"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_shield_on.xml b/app/src/main/res/drawable-night/ic_shield_on.xml
new file mode 100644
index 0000000..ecc27b4
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_shield_on.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+  <group>
+    <clip-path
+        android:pathData="M12,1.5796L3,5.5796V11.5796C3,17.1296 6.84,22.3196 12,23.5796C17.16,22.3196 21,17.1296 21,11.5796V5.5796L12,1.5796Z"/>
+    <path
+        android:pathData="M12,1.5796L12.8123,-0.248L12,-0.609L11.1877,-0.248L12,1.5796ZM3,5.5796L2.1877,3.752L1,4.2798V5.5796H3ZM12,23.5796L11.5256,25.5225L12,25.6384L12.4744,25.5225L12,23.5796ZM21,5.5796H23V4.2798L21.8123,3.752L21,5.5796ZM11.1877,-0.248L2.1877,3.752L3.8123,7.4072L12.8123,3.4072L11.1877,-0.248ZM1,5.5796V11.5796H5V5.5796H1ZM1,11.5796C1,17.9684 5.3919,24.0247 11.5256,25.5225L12.4744,21.6367C8.2881,20.6144 5,16.2907 5,11.5796H1ZM12.4744,25.5225C18.6081,24.0247 23,17.9684 23,11.5796H19C19,16.2907 15.7119,20.6144 11.5256,21.6367L12.4744,25.5225ZM23,11.5796V5.5796H19V11.5796H23ZM21.8123,3.752L12.8123,-0.248L11.1877,3.4072L20.1877,7.4072L21.8123,3.752Z"
+        android:fillColor="#ffffff"
+        android:fillAlpha="0.87"/>
+  </group>
+  <path
+      android:pathData="M10.6951,14.5796L10.0141,15.3118L10.6948,15.9449L11.3758,15.3122L10.6951,14.5796ZM9.681,12.2708L8.9488,11.5897L7.5867,13.0542L8.319,13.7353L9.681,12.2708ZM15.6807,11.3122L16.4133,10.6315L15.0519,9.1663L14.3193,9.847L15.6807,11.3122ZM11.3762,13.8473L9.681,12.2708L8.319,13.7353L10.0141,15.3118L11.3762,13.8473ZM14.3193,9.847L10.0144,13.847L11.3758,15.3122L15.6807,11.3122L14.3193,9.847Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.87"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_shield_off.xml b/app/src/main/res/drawable/ic_shield_off.xml
index 8f811a2..cd60ba4 100644
--- a/app/src/main/res/drawable/ic_shield_off.xml
+++ b/app/src/main/res/drawable/ic_shield_off.xml
@@ -1,16 +1,19 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="25dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="@color/red_off">
+    android:viewportWidth="25"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M12.5,1L3.5,5V11C3.5,16.55 7.34,21.74 12.5,23C17.66,21.74 21.5,16.55 21.5,11V5L12.5,1Z"/>
     <path
-        android:pathData="M4,11V5.6499L12,2.0943L20,5.6499V11C20,16.0434 16.556,20.7257 12,21.9673C7.444,20.7257 4,16.0434 4,11Z"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#000000"/>
-    <path
-        android:pathData="M15.1213,10.1213L15.8284,9.4142L14.4142,8L13.7071,8.7071L11.9142,10.5L10.1213,8.7071L9.4142,8L8,9.4142L8.7071,10.1213L10.5,11.9142L8.7071,13.7071L8,14.4142L9.4142,15.8284L10.1213,15.1213L11.9142,13.3284L13.7071,15.1213L14.4142,15.8284L15.8284,14.4142L15.1213,13.7071L13.3284,11.9142L15.1213,10.1213Z"
+        android:pathData="M12.5,1L13.3123,-0.8276L12.5,-1.1886L11.6877,-0.8276L12.5,1ZM3.5,5L2.6877,3.1724L1.5,3.7002V5H3.5ZM12.5,23L12.0256,24.9429L12.5,25.0588L12.9744,24.9429L12.5,23ZM21.5,5H23.5V3.7002L22.3123,3.1724L21.5,5ZM11.6877,-0.8276L2.6877,3.1724L4.3123,6.8276L13.3123,2.8276L11.6877,-0.8276ZM1.5,5V11H5.5V5H1.5ZM1.5,11C1.5,17.3888 5.8919,23.4452 12.0256,24.9429L12.9744,21.0571C8.7881,20.0348 5.5,15.7112 5.5,11H1.5ZM12.9744,24.9429C19.1081,23.4452 23.5,17.3888 23.5,11H19.5C19.5,15.7112 16.2119,20.0348 12.0256,21.0571L12.9744,24.9429ZM23.5,11V5H19.5V11H23.5ZM22.3123,3.1724L13.3123,-0.8276L11.6877,2.8276L20.6877,6.8276L22.3123,3.1724Z"
         android:fillColor="#000000"
-        android:fillType="evenOdd"/>
+        android:fillAlpha="0.87"/>
+  </group>
+  <path
+      android:pathData="M15.6213,10.1213L16.3284,9.4142L14.9142,8L14.2071,8.7071L12.4142,10.5L10.6213,8.7071L9.9142,8L8.5,9.4142L9.2071,10.1213L11,11.9142L9.2071,13.7071L8.5,14.4142L9.9142,15.8284L10.6213,15.1213L12.4142,13.3284L14.2071,15.1213L14.9142,15.8284L16.3284,14.4142L15.6213,13.7071L13.8284,11.9142L15.6213,10.1213Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.87"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_shield_off_white.xml b/app/src/main/res/drawable/ic_shield_off_white.xml
new file mode 100644
index 0000000..f45fd98
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shield_off_white.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="24dp"
+    android:viewportWidth="25"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M12.0183,1L3.0183,5V11C3.0183,16.55 6.8583,21.74 12.0183,23C17.1783,21.74 21.0183,16.55 21.0183,11V5L12.0183,1Z"/>
+    <path
+        android:pathData="M12.0183,1L12.8306,-0.8276L12.0183,-1.1886L11.206,-0.8276L12.0183,1ZM3.0183,5L2.206,3.1724L1.0183,3.7002V5H3.0183ZM12.0183,23L11.5439,24.9429L12.0183,25.0588L12.4927,24.9429L12.0183,23ZM21.0183,5H23.0183V3.7002L21.8306,3.1724L21.0183,5ZM11.206,-0.8276L2.206,3.1724L3.8306,6.8276L12.8306,2.8276L11.206,-0.8276ZM1.0183,5V11H5.0183V5H1.0183ZM1.0183,11C1.0183,17.3888 5.4102,23.4452 11.5439,24.9429L12.4927,21.0571C8.3064,20.0348 5.0183,15.7112 5.0183,11H1.0183ZM12.4927,24.9429C18.6264,23.4452 23.0183,17.3888 23.0183,11H19.0183C19.0183,15.7112 15.7302,20.0348 11.5439,21.0571L12.4927,24.9429ZM23.0183,11V5H19.0183V11H23.0183ZM21.8306,3.1724L12.8306,-0.8276L11.206,2.8276L20.206,6.8276L21.8306,3.1724Z"
+        android:fillColor="#ffffff"
+        android:fillAlpha="0.87"/>
+  </group>
+  <path
+      android:pathData="M15.1396,10.1213L15.8467,9.4142L14.4325,8L13.7254,8.7071L11.9325,10.5L10.1396,8.7071L9.4325,8L8.0183,9.4142L8.7254,10.1213L10.5183,11.9142L8.7254,13.7071L8.0183,14.4142L9.4325,15.8284L10.1396,15.1213L11.9325,13.3284L13.7254,15.1213L14.4325,15.8284L15.8467,14.4142L15.1396,13.7071L13.3467,11.9142L15.1396,10.1213Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.87"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_shield_on.xml b/app/src/main/res/drawable/ic_shield_on.xml
index b70dc6e..e29f766 100644
--- a/app/src/main/res/drawable/ic_shield_on.xml
+++ b/app/src/main/res/drawable/ic_shield_on.xml
@@ -1,17 +1,18 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="25dp"
     android:height="25dp"
-    android:viewportWidth="24"
+    android:viewportWidth="25"
     android:viewportHeight="25">
+  <group>
+    <clip-path
+        android:pathData="M12.5,1.5L3.5,5.5V11.5C3.5,17.05 7.34,22.24 12.5,23.5C17.66,22.24 21.5,17.05 21.5,11.5V5.5L12.5,1.5Z"/>
     <path
-        android:pathData="M4,11.5V6.1499L12,2.5943L20,6.1499V11.5C20,16.5434 16.556,21.2257 12,22.4673C7.444,21.2257 4,16.5434 4,11.5Z"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#2CC766"/>
-    <path
-        android:pathData="M9,12.9234L10.6951,14.5L15,10.5"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#2CC766"
-        android:strokeLineCap="square"/>
+        android:pathData="M12.5,1.5L13.3123,-0.3276L12.5,-0.6886L11.6877,-0.3276L12.5,1.5ZM3.5,5.5L2.6877,3.6724L1.5,4.2003V5.5H3.5ZM12.5,23.5L12.0256,25.4429L12.5,25.5588L12.9744,25.4429L12.5,23.5ZM21.5,5.5H23.5V4.2003L22.3123,3.6724L21.5,5.5ZM11.6877,-0.3276L2.6877,3.6724L4.3123,7.3276L13.3123,3.3276L11.6877,-0.3276ZM1.5,5.5V11.5H5.5V5.5H1.5ZM1.5,11.5C1.5,17.8888 5.8919,23.9452 12.0256,25.4429L12.9744,21.5571C8.7881,20.5348 5.5,16.2112 5.5,11.5H1.5ZM12.9744,25.4429C19.1081,23.9452 23.5,17.8888 23.5,11.5H19.5C19.5,16.2112 16.2119,20.5348 12.0256,21.5571L12.9744,25.4429ZM23.5,11.5V5.5H19.5V11.5H23.5ZM22.3123,3.6724L13.3123,-0.3276L11.6877,3.3276L20.6877,7.3276L22.3123,3.6724Z"
+        android:fillColor="#000000"
+        android:fillAlpha="0.87"/>
+  </group>
+  <path
+      android:pathData="M11.1951,14.5L10.5141,15.2323L11.1948,15.8654L11.8758,15.2326L11.1951,14.5ZM10.181,12.1912L9.4488,11.5102L8.0867,12.9747L8.819,13.6557L10.181,12.1912ZM16.1807,11.2326L16.9133,10.5519L15.5519,9.0867L14.8193,9.7674L16.1807,11.2326ZM11.8762,13.7677L10.181,12.1912L8.819,13.6557L10.5141,15.2323L11.8762,13.7677ZM14.8193,9.7674L10.5144,13.7674L11.8758,15.2326L16.1807,11.2326L14.8193,9.7674Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.87"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_shield_on_white.xml b/app/src/main/res/drawable/ic_shield_on_white.xml
new file mode 100644
index 0000000..ecc27b4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shield_on_white.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+  <group>
+    <clip-path
+        android:pathData="M12,1.5796L3,5.5796V11.5796C3,17.1296 6.84,22.3196 12,23.5796C17.16,22.3196 21,17.1296 21,11.5796V5.5796L12,1.5796Z"/>
+    <path
+        android:pathData="M12,1.5796L12.8123,-0.248L12,-0.609L11.1877,-0.248L12,1.5796ZM3,5.5796L2.1877,3.752L1,4.2798V5.5796H3ZM12,23.5796L11.5256,25.5225L12,25.6384L12.4744,25.5225L12,23.5796ZM21,5.5796H23V4.2798L21.8123,3.752L21,5.5796ZM11.1877,-0.248L2.1877,3.752L3.8123,7.4072L12.8123,3.4072L11.1877,-0.248ZM1,5.5796V11.5796H5V5.5796H1ZM1,11.5796C1,17.9684 5.3919,24.0247 11.5256,25.5225L12.4744,21.6367C8.2881,20.6144 5,16.2907 5,11.5796H1ZM12.4744,25.5225C18.6081,24.0247 23,17.9684 23,11.5796H19C19,16.2907 15.7119,20.6144 11.5256,21.6367L12.4744,25.5225ZM23,11.5796V5.5796H19V11.5796H23ZM21.8123,3.752L12.8123,-0.248L11.1877,3.4072L20.1877,7.4072L21.8123,3.752Z"
+        android:fillColor="#ffffff"
+        android:fillAlpha="0.87"/>
+  </group>
+  <path
+      android:pathData="M10.6951,14.5796L10.0141,15.3118L10.6948,15.9449L11.3758,15.3122L10.6951,14.5796ZM9.681,12.2708L8.9488,11.5897L7.5867,13.0542L8.319,13.7353L9.681,12.2708ZM15.6807,11.3122L16.4133,10.6315L15.0519,9.1663L14.3193,9.847L15.6807,11.3122ZM11.3762,13.8473L9.681,12.2708L8.319,13.7353L10.0141,15.3118L11.3762,13.8473ZM14.3193,9.847L10.0144,13.847L11.3758,15.3122L15.6807,11.3122L14.3193,9.847Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.87"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cf293e1..1fc7841 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_state_title_on">Your online privacy is protected</string>
     <string name="dashboard_state_title_off">Your online privacy is unprotected</string>
+    <string name="dashboard_state_title_custom">Custom privacy settings applied</string>
     <string name="dashboard_state_trackers_label">Trackers:</string>
     <string name="dashboard_state_trackers_off">Vulnerable</string>
     <string name="dashboard_state_trackers_on">Denied</string>
@@ -25,6 +26,7 @@
     <string name="dashboard_graph_label">Personal data leakage:</string>
     <string name="dashboard_graph_period">Today</string>
     <string name="dashboard_graph_trackers_legend">%s trackers have profiled you in the last 24 hours</string>
+    <string name="dashboard_first_ipscrambling_activation">While your IP is faked, your internet speed is likely to be reduced.</string>
 
     <string name="dashboard_am_i_tracked_title">Manage apps\' trackers</string>
     <string name="dashboard_am_i_tracked_subtitle">%1$d app trackers, %2$d active trackers</string>
@@ -126,6 +128,7 @@
     <string name="widget_title">@string/app_name</string>
     <string name="widget_state_title_on">Your online privacy is protected</string>
     <string name="widget_state_title_off">Your online privacy is unprotected</string>
+    <string name="widget_state_title_custom">Custom privacy settings applied</string>
     <string name="widget_state_trackers_label">@string/dashboard_state_trackers_label</string>
     <string name="widget_state_trackers_off">@string/dashboard_state_trackers_off</string>
     <string name="widget_state_trackers_on">@string/dashboard_state_trackers_on</string>