From 5feebeba01bd6955315daad618a8fb6c11415baa Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 Jun 2019 15:01:46 +0200
Subject: [PATCH] Integrate new icons for preference root screen

---
 .../main/res/drawable/ic_settings_general.xml | 22 ----------------
 .../src/main/res/drawable/ic_settings_lab.xml | 14 ----------
 .../res/drawable/ic_settings_root_call.xml    | 14 ++++++++++
 .../res/drawable/ic_settings_root_flair.xml   | 22 ++++++++++++++++
 .../res/drawable/ic_settings_root_general.xml | 22 ++++++++++++++++
 .../drawable/ic_settings_root_help_about.xml  | 22 ++++++++++++++++
 .../res/drawable/ic_settings_root_labs.xml    | 14 ++++++++++
 .../res/drawable/ic_settings_root_legacy.xml  | 14 ++++++++++
 .../ic_settings_root_notification.xml         | 14 ++++++++++
 .../drawable/ic_settings_root_preferences.xml | 14 ++++++++++
 .../ic_settings_root_security_privacy.xml     | 22 ++++++++++++++++
 vector/src/main/res/values/strings_riotX.xml  |  2 ++
 .../xml/vector_settings_preferences_root.xml  | 26 ++++++++++++++-----
 13 files changed, 179 insertions(+), 43 deletions(-)
 delete mode 100644 vector/src/main/res/drawable/ic_settings_general.xml
 delete mode 100644 vector/src/main/res/drawable/ic_settings_lab.xml
 create mode 100644 vector/src/main/res/drawable/ic_settings_root_call.xml
 create mode 100644 vector/src/main/res/drawable/ic_settings_root_flair.xml
 create mode 100644 vector/src/main/res/drawable/ic_settings_root_general.xml
 create mode 100644 vector/src/main/res/drawable/ic_settings_root_help_about.xml
 create mode 100644 vector/src/main/res/drawable/ic_settings_root_labs.xml
 create mode 100644 vector/src/main/res/drawable/ic_settings_root_legacy.xml
 create mode 100644 vector/src/main/res/drawable/ic_settings_root_notification.xml
 create mode 100644 vector/src/main/res/drawable/ic_settings_root_preferences.xml
 create mode 100644 vector/src/main/res/drawable/ic_settings_root_security_privacy.xml

diff --git a/vector/src/main/res/drawable/ic_settings_general.xml b/vector/src/main/res/drawable/ic_settings_general.xml
deleted file mode 100644
index 97b060f6..00000000
--- a/vector/src/main/res/drawable/ic_settings_general.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="14dp"
-    android:viewportWidth="14"
-    android:viewportHeight="14">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M7,7m-1.636,0a1.636,1.636 0,1 1,3.272 0a1.636,1.636 0,1 1,-3.272 0"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-  <path
-      android:strokeWidth="1"
-      android:pathData="M11.036,8.636a0.9,0.9 0,0 0,0.18 0.993l0.033,0.033a1.09,1.09 0,1 1,-1.544 1.543l-0.032,-0.032a0.9,0.9 0,0 0,-0.993 -0.18,0.9 0.9,0 0,0 -0.545,0.823v0.093a1.09,1.09 0,1 1,-2.182 0v-0.049a0.9,0.9 0,0 0,-0.59 -0.824,0.9 0.9,0 0,0 -0.992,0.18l-0.033,0.033a1.09,1.09 0,1 1,-1.543 -1.544l0.032,-0.032a0.9,0.9 0,0 0,0.18 -0.993,0.9 0.9,0 0,0 -0.823,-0.545L2.09,8.135a1.09,1.09 0,1 1,0 -2.182h0.049a0.9,0.9 0,0 0,0.824 -0.59,0.9 0.9,0 0,0 -0.18,-0.992l-0.033,-0.033a1.09,1.09 0,1 1,1.544 -1.543l0.032,0.032a0.9,0.9 0,0 0,0.993 0.18h0.044a0.9,0.9 0,0 0,0.545 -0.823L5.908,2.09a1.09,1.09 0,0 1,2.182 0v0.049a0.9,0.9 0,0 0,0.545 0.824,0.9 0.9,0 0,0 0.993,-0.18l0.033,-0.033a1.09,1.09 0,1 1,1.543 1.544l-0.032,0.032a0.9,0.9 0,0 0,-0.18 0.993v0.044a0.9,0.9 0,0 0,0.823 0.545h0.093a1.09,1.09 0,1 1,0 2.182h-0.049a0.9,0.9 0,0 0,-0.824 0.545z"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_lab.xml b/vector/src/main/res/drawable/ic_settings_lab.xml
deleted file mode 100644
index d1f5aca7..00000000
--- a/vector/src/main/res/drawable/ic_settings_lab.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="11dp"
-    android:height="14dp"
-    android:viewportWidth="11"
-    android:viewportHeight="14">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M0.588,8.8s0.588,-0.6 2.353,-0.6c1.765,0 2.941,1.2 4.706,1.2C9.412,9.4 10,8.8 10,8.8V1.6s-0.588,0.6 -2.353,0.6C5.882,2.2 4.706,1 2.941,1c-1.765,0 -2.353,0.6 -2.353,0.6v7.2zM0.588,13V8.8"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_call.xml b/vector/src/main/res/drawable/ic_settings_root_call.xml
new file mode 100644
index 00000000..b29ef895
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_call.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M21,15.92v3a2,2 0,0 1,-2.18 2,19.79 19.79,0 0,1 -8.63,-3.07 19.5,19.5 0,0 1,-6 -6,19.79 19.79,0 0,1 -3.07,-8.67A2,2 0,0 1,3.11 1h3a2,2 0,0 1,2 1.72c0.127,0.96 0.361,1.903 0.7,2.81a2,2 0,0 1,-0.45 2.11L7.09,8.91a16,16 0,0 0,6 6l1.27,-1.27a2,2 0,0 1,2.11 -0.45c0.907,0.339 1.85,0.573 2.81,0.7A2,2 0,0 1,21 15.92z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_flair.xml b/vector/src/main/res/drawable/ic_settings_root_flair.xml
new file mode 100644
index 00000000..889b2f7e
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_flair.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="24dp"
+    android:viewportWidth="16"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8,8m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M4.21,13.89L3,23l5,-3 5,3 -1.21,-9.12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_general.xml b/vector/src/main/res/drawable/ic_settings_root_general.xml
new file mode 100644
index 00000000..c70ec666
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_general.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19.4,15a1.65,1.65 0,0 0,0.33 1.82l0.06,0.06a2,2 0,1 1,-2.83 2.83l-0.06,-0.06a1.65,1.65 0,0 0,-1.82 -0.33,1.65 1.65,0 0,0 -1,1.51L14.08,21a2,2 0,1 1,-4 0v-0.09A1.65,1.65 0,0 0,9 19.4a1.65,1.65 0,0 0,-1.82 0.33l-0.06,0.06a2,2 0,1 1,-2.83 -2.83l0.06,-0.06a1.65,1.65 0,0 0,0.33 -1.82,1.65 1.65,0 0,0 -1.51,-1L3,14.08a2,2 0,1 1,0 -4h0.09A1.65,1.65 0,0 0,4.6 9a1.65,1.65 0,0 0,-0.33 -1.82l-0.06,-0.06a2,2 0,1 1,2.83 -2.83l0.06,0.06a1.65,1.65 0,0 0,1.82 0.33L9,4.68a1.65,1.65 0,0 0,1 -1.51L10,3a2,2 0,1 1,4 0v0.09a1.65,1.65 0,0 0,1 1.51,1.65 1.65,0 0,0 1.82,-0.33l0.06,-0.06a2,2 0,1 1,2.83 2.83l-0.06,0.06a1.65,1.65 0,0 0,-0.33 1.82L19.32,9c0.26,0.604 0.852,0.997 1.51,1L21,10a2,2 0,1 1,0 4h-0.09a1.65,1.65 0,0 0,-1.51 1z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_help_about.xml b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
new file mode 100644
index 00000000..9260a777
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11,11m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M8.09,8a3,3 0,0 1,5.83 1c0,2 -3,3 -3,3M11,15.991"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_labs.xml b/vector/src/main/res/drawable/ic_settings_root_labs.xml
new file mode 100644
index 00000000..f44a0c91
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_labs.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="22dp"
+    android:viewportWidth="18"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M1,14s1,-1 4,-1 5,2 8,2 4,-1 4,-1V2s-1,1 -4,1 -5,-2 -8,-2 -4,1 -4,1v12zM1,21v-7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_legacy.xml b/vector/src/main/res/drawable/ic_settings_root_legacy.xml
new file mode 100644
index 00000000..c56a7d31
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_legacy.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M21,6v13H3V6M1,1h22v5H1zM10,10h4"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_notification.xml b/vector/src/main/res/drawable/ic_settings_root_notification.xml
new file mode 100644
index 00000000..ae1cba08
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_notification.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="22dp"
+    android:viewportWidth="20"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M16,7A6,6 0,1 0,4 7c0,7 -3,9 -3,9h18s-3,-2 -3,-9M11.73,20a2,2 0,0 1,-3.46 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_preferences.xml b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
new file mode 100644
index 00000000..2a57f927
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M4,19v-7M4,8V1M12,19v-9M12,6V1M20,19v-5M20,10V1M1,12h6M9,6h6M17,14h6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
new file mode 100644
index 00000000..eb5bdc83
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="22dp"
+    android:viewportWidth="20"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M3,10L17,10A2,2 0,0 1,19 12L19,19A2,2 0,0 1,17 21L3,21A2,2 0,0 1,1 19L1,12A2,2 0,0 1,3 10z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5,10L5,6a5,5 0,1 1,10 0v4"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#7E899C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 7ff01489..28a539eb 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -29,5 +29,7 @@
     <string name="push_gateway_item_format">Format:</string>
 
     <string name="preference_root_legacy">Legacy</string>
+    <string name="preference_voice_and_video">Voice &amp; Video</string>
+    <string name="preference_root_help_about">Help &amp; About</string>
 
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_preferences_root.xml b/vector/src/main/res/xml/vector_settings_preferences_root.xml
index 968aa68c..4e8051af 100644
--- a/vector/src/main/res/xml/vector_settings_preferences_root.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences_root.xml
@@ -4,45 +4,57 @@
 
     <im.vector.riotredesign.core.preference.VectorPreference
         android:layout_width="match_parent"
-        android:icon="@drawable/ic_settings_general"
+        android:icon="@drawable/ic_settings_root_general"
         android:title="@string/settings_general_title"
         app:fragment="com.example.SyncFragment" />
 
     <im.vector.riotredesign.core.preference.VectorPreference
         android:layout_width="match_parent"
-        android:icon="@drawable/ic_flair"
+        android:icon="@drawable/ic_settings_root_flair"
         android:title="@string/settings_flair"
         app:fragment="com.example.SyncFragment" />
 
     <im.vector.riotredesign.core.preference.VectorPreference
         android:layout_width="match_parent"
-        android:icon="@drawable/ic_bell"
+        android:icon="@drawable/ic_settings_root_notification"
         android:key="SETTINGS_NOTIFICATIONS_KEY"
         android:title="@string/settings_notifications"
         app:fragment="im.vector.riotredesign.features.settings.VectorSettingsNotificationPreferenceFragment" />
 
     <im.vector.riotredesign.core.preference.VectorPreference
         android:layout_width="match_parent"
-        android:icon="@drawable/ic_sliders"
+        android:icon="@drawable/ic_settings_root_preferences"
         android:title="@string/settings_preferences"
         app:fragment="com.example.SyncFragment" />
 
     <im.vector.riotredesign.core.preference.VectorPreference
         android:layout_width="match_parent"
-        android:icon="@drawable/ic_lock"
+        android:icon="@drawable/ic_settings_root_call"
+        android:title="@string/preference_voice_and_video"
+        app:fragment="com.example.SyncFragment" />
+
+    <im.vector.riotredesign.core.preference.VectorPreference
+        android:layout_width="match_parent"
+        android:icon="@drawable/ic_settings_root_security_privacy"
         android:title="@string/settings_security_and_privacy"
         app:fragment="com.example.SyncFragment" />
 
     <im.vector.riotredesign.core.preference.VectorPreference
         android:layout_width="match_parent"
-        android:icon="@drawable/ic_settings_lab"
+        android:icon="@drawable/ic_settings_root_labs"
         android:title="@string/room_settings_labs_pref_title"
         app:fragment="com.example.SyncFragment" />
 
     <im.vector.riotredesign.core.preference.VectorPreference
         android:layout_width="match_parent"
-        android:icon="@drawable/ic_devices_info"
+        android:icon="@drawable/ic_settings_root_legacy"
         android:title="@string/preference_root_legacy"
         app:fragment="com.example.SyncFragment" />
 
+    <im.vector.riotredesign.core.preference.VectorPreference
+        android:layout_width="match_parent"
+        android:icon="@drawable/ic_settings_root_help_about"
+        android:title="@string/preference_root_help_about"
+        app:fragment="com.example.SyncFragment" />
+
 </androidx.preference.PreferenceScreen>
\ No newline at end of file