From 2849e1f8465a874fa82bb8b0ffc959ba7517d2a5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 15 Nov 2019 09:59:19 +0100
Subject: [PATCH] Login screens: Splash: update icons

---
 .../res/drawable/ic_login_splash_lock.xml     | 22 ++++++++++++++++++
 .../ic_login_splash_message_circle.xml        | 14 +++++++++++
 .../res/drawable/ic_login_splash_sliders.xml  | 14 +++++++++++
 .../main/res/layout/fragment_login_splash.xml | 23 +++++++++----------
 4 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 vector/src/main/res/drawable/ic_login_splash_lock.xml
 create mode 100644 vector/src/main/res/drawable/ic_login_splash_message_circle.xml
 create mode 100644 vector/src/main/res/drawable/ic_login_splash_sliders.xml

diff --git a/vector/src/main/res/drawable/ic_login_splash_lock.xml b/vector/src/main/res/drawable/ic_login_splash_lock.xml
new file mode 100644
index 0000000000..26470cefce
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_login_splash_lock.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="1.5"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#61708B"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5,10L5,6a5,5 0,1 1,10 0v4"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#61708B"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_login_splash_message_circle.xml b/vector/src/main/res/drawable/ic_login_splash_message_circle.xml
new file mode 100644
index 0000000000..81b5e9476a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_login_splash_message_circle.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M19,9.5a8.38,8.38 0,0 1,-0.9 3.8,8.5 8.5,0 0,1 -7.6,4.7 8.38,8.38 0,0 1,-3.8 -0.9L1,19l1.9,-5.7A8.38,8.38 0,0 1,2 9.5a8.5,8.5 0,0 1,4.7 -7.6,8.38 8.38,0 0,1 3.8,-0.9h0.5a8.48,8.48 0,0 1,8 8v0.5z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#61708B"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_login_splash_sliders.xml b/vector/src/main/res/drawable/ic_login_splash_sliders.xml
new file mode 100644
index 0000000000..b7c850eea7
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_login_splash_sliders.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="1.5"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#61708B"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index e49270ea51..b77493f6d1 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -31,13 +31,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/loginSplashLogo" />
 
-        <!-- TODO icon src -->
         <!-- TODO check relative dimension -->
         <ImageView
             android:id="@+id/loginSplashPicto1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_settings_x"
+            android:layout_marginStart="2dp"
+            android:src="@drawable/ic_login_splash_message_circle"
             android:tint="?vctr_notice_secondary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/loginSplashText1" />
@@ -46,22 +46,22 @@
             android:id="@+id/loginSplashText1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
+            android:layout_marginStart="36dp"
             android:layout_marginTop="32dp"
             android:gravity="start"
             android:text="@string/login_splash_text1"
             android:textAppearance="@style/TextAppearance.Vector.Login.Text"
             app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/loginSplashTitle" />
 
-        <!-- TODO icon src -->
         <ImageView
             android:id="@+id/loginSplashPicto2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_settings_x"
+            android:layout_marginStart="2dp"
+            android:src="@drawable/ic_login_splash_lock"
             android:tint="?vctr_notice_secondary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/loginSplashText2" />
@@ -70,22 +70,21 @@
             android:id="@+id/loginSplashText2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
+            android:layout_marginStart="36dp"
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text2"
             android:textAppearance="@style/TextAppearance.Vector.Login.Text"
             app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/loginSplashPicto2"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/loginSplashText1" />
 
-        <!-- TODO icon src -->
         <ImageView
             android:id="@+id/loginSplashPicto3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_settings_x"
+            android:src="@drawable/ic_login_splash_sliders"
             android:tint="?vctr_notice_secondary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/loginSplashText3" />
@@ -94,14 +93,14 @@
             android:id="@+id/loginSplashText3"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
+            android:layout_marginStart="36dp"
             android:layout_marginTop="16dp"
             android:gravity="start"
             android:text="@string/login_splash_text3"
             android:textAppearance="@style/TextAppearance.Vector.Login.Text"
             app:layout_constraintBottom_toTopOf="@+id/loginSplashSubmit"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/loginSplashPicto3"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/loginSplashText2" />
 
         <com.google.android.material.button.MaterialButton