From fcfb9fad01ba390f810c5c18112156657191afe4 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 3 Feb 2023 09:45:13 -0400
Subject: [PATCH] Add svg assets to username education screen.

---
 app/src/main/res/drawable/link_color_48.xml   | 14 +++++++++++
 app/src/main/res/drawable/lock_color_48.xml   | 25 +++++++++++++++++++
 app/src/main/res/drawable/number_color_48.xml | 14 +++++++++++
 .../layout/username_education_fragment.xml    |  9 ++++---
 4 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/link_color_48.xml
 create mode 100644 app/src/main/res/drawable/lock_color_48.xml
 create mode 100644 app/src/main/res/drawable/number_color_48.xml

diff --git a/app/src/main/res/drawable/link_color_48.xml b/app/src/main/res/drawable/link_color_48.xml
new file mode 100644
index 000000000..3708bba5e
--- /dev/null
+++ b/app/src/main/res/drawable/link_color_48.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M30.972,28.061C30.444,27.521 30.444,26.647 30.972,26.108L35.436,21.55C38.078,18.854 38.078,14.481 35.436,11.785C32.795,9.088 28.512,9.088 25.87,11.785L21.406,16.342C20.877,16.881 20.021,16.881 19.493,16.342C18.964,15.803 18.964,14.928 19.493,14.389L23.957,9.832C27.655,6.056 33.651,6.056 37.35,9.832C41.048,13.607 41.048,19.728 37.35,23.503L32.885,28.061C32.357,28.6 31.5,28.6 30.972,28.061ZM15.028,20.899C15.557,21.439 15.557,22.313 15.028,22.853L10.564,27.41C7.923,30.107 7.923,34.479 10.564,37.175C13.206,39.872 17.489,39.872 20.131,37.175L24.595,32.618C25.123,32.079 25.98,32.079 26.508,32.618C27.036,33.158 27.036,34.032 26.508,34.571L22.044,39.129C18.346,42.904 12.349,42.904 8.651,39.129C4.953,35.353 4.953,29.232 8.651,25.457L13.115,20.899C13.644,20.36 14.5,20.36 15.028,20.899ZM27.783,21.551C28.312,21.011 28.312,20.137 27.783,19.598C27.255,19.058 26.398,19.058 25.87,19.598L18.217,27.41C17.689,27.949 17.689,28.824 18.217,29.363C18.745,29.903 19.602,29.903 20.13,29.363L27.783,21.551Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M18.064,12.989L22.528,8.432C27.011,3.856 34.296,3.856 38.778,8.432C43.238,12.985 43.238,20.35 38.778,24.903L34.314,29.46C33.001,30.8 30.856,30.8 29.543,29.46C28.253,28.143 28.253,26.025 29.543,24.708L34.008,20.151C35.888,18.232 35.888,15.103 34.008,13.184C32.15,11.288 29.156,11.288 27.299,13.184L22.834,17.742C21.522,19.081 19.376,19.081 18.064,17.742C16.774,16.425 16.774,14.306 18.064,12.989ZM29.212,22.95L21.559,30.763C20.246,32.103 18.101,32.103 16.788,30.763C15.498,29.446 15.498,27.327 16.788,26.011L24.441,18.198C25.754,16.858 27.899,16.858 29.212,18.198C30.502,19.515 30.502,21.633 29.212,22.95ZM27.783,21.551L20.13,29.363C19.602,29.903 18.745,29.903 18.217,29.363C17.689,28.824 17.689,27.949 18.217,27.41L25.87,19.598C26.398,19.058 27.255,19.058 27.783,19.598C28.312,20.137 28.312,21.011 27.783,21.551ZM16.457,19.5C17.747,20.817 17.747,22.935 16.457,24.252L11.993,28.809C10.113,30.729 10.113,33.857 11.993,35.776C13.85,37.672 16.844,37.672 18.702,35.776L23.166,31.219C24.479,29.879 26.624,29.879 27.937,31.219M27.937,31.219C29.227,32.536 29.227,34.654 27.937,35.971L23.472,40.528C18.99,45.104 11.705,45.104 7.222,40.528C2.762,35.975 2.762,28.61 7.222,24.057L11.686,19.5C12.999,18.16 15.145,18.16 16.457,19.5M30.972,26.108C30.444,26.647 30.444,27.521 30.972,28.061C31.5,28.6 32.357,28.6 32.885,28.061L37.35,23.503C41.048,19.728 41.048,13.607 37.35,9.832C33.651,6.056 27.655,6.056 23.957,9.832L19.493,14.389C18.964,14.928 18.964,15.803 19.493,16.342C20.021,16.881 20.877,16.881 21.406,16.342L25.87,11.785C28.512,9.088 32.795,9.088 35.436,11.785C38.078,14.481 38.078,18.854 35.436,21.55L30.972,26.108ZM15.028,22.853C15.557,22.313 15.557,21.439 15.028,20.899C14.5,20.36 13.644,20.36 13.115,20.899L8.651,25.457C4.953,29.232 4.953,35.353 8.651,39.129C12.349,42.904 18.346,42.904 22.044,39.129L26.508,34.571C27.036,34.032 27.036,33.158 26.508,32.618C25.98,32.079 25.123,32.079 24.595,32.618L20.131,37.175C17.489,39.872 13.206,39.872 10.564,37.175C7.923,34.479 7.923,30.107 10.564,27.41L15.028,22.853Z"
+      android:fillColor="#647392"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/lock_color_48.xml b/app/src/main/res/drawable/lock_color_48.xml
new file mode 100644
index 000000000..c0a24b827
--- /dev/null
+++ b/app/src/main/res/drawable/lock_color_48.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M14,19.102C14.1,19.091 14.203,19.081 14.308,19.073C14.99,19.017 15.804,19.004 16.8,19.001V13.2C16.8,9.224 20.024,6 24,6C27.976,6 31.2,9.224 31.2,13.2V19.001C32.195,19.004 33.01,19.017 33.692,19.073C33.797,19.081 33.9,19.091 34,19.102V13C34,7.477 29.523,3 24,3C18.477,3 14,7.477 14,13V19.102Z"
+      android:fillColor="#FFE3A5"/>
+  <path
+      android:pathData="M12.988,21.4C13.287,21.246 13.701,21.13 14.472,21.066C15.26,21.001 16.278,21 17.76,21H30.24C31.722,21 32.739,21.001 33.528,21.066C34.299,21.13 34.713,21.246 35.013,21.4C35.697,21.751 36.254,22.312 36.603,23.002C36.756,23.304 36.871,23.721 36.934,24.497C36.999,25.292 37,26.317 37,27.809V36.19C37,37.683 36.999,38.708 36.934,39.503C36.871,40.279 36.756,40.696 36.603,40.998C36.254,41.688 35.697,42.249 35.013,42.6C34.713,42.754 34.299,42.87 33.528,42.934C32.739,42.999 31.722,43 30.24,43H17.76C16.278,43 15.26,42.999 14.472,42.934C13.701,42.87 13.287,42.754 12.988,42.6C12.303,42.249 11.746,41.688 11.397,40.998C11.244,40.696 11.129,40.279 11.066,39.503C11.001,38.708 11,37.683 11,36.19V27.809C11,26.317 11.001,25.292 11.066,24.497C11.129,23.721 11.244,23.304 11.397,23.002C11.746,22.312 12.303,21.751 12.988,21.4Z"
+      android:fillColor="#FFE3A5"/>
+  <path
+      android:pathData="M17.738,19C16.301,19 15.193,19 14.308,19.073C13.413,19.146 12.705,19.297 12.074,19.62C11.012,20.166 10.151,21.034 9.612,22.099C9.293,22.729 9.145,23.437 9.072,24.335C9,25.226 9,26.34 9,27.789V36.21C9,37.66 9,38.774 9.072,39.665C9.145,40.563 9.293,41.271 9.612,41.901C10.151,42.966 11.012,43.834 12.074,44.38C12.705,44.703 13.413,44.854 14.308,44.927C15.193,45 16.301,45 17.738,45H30.262C31.699,45 32.807,45 33.692,44.927C34.587,44.854 35.296,44.703 35.926,44.38C36.988,43.834 37.849,42.966 38.388,41.901C38.707,41.271 38.855,40.563 38.928,39.665C39,38.774 39,37.66 39,36.21V27.79C39,26.34 39,25.226 38.928,24.335C38.855,23.437 38.707,22.729 38.388,22.099C37.849,21.034 36.988,20.166 35.926,19.62C35.296,19.297 34.587,19.146 33.692,19.073C32.807,19 31.699,19 30.262,19H17.738ZM14.472,21.066C13.701,21.13 13.287,21.246 12.988,21.4C12.303,21.751 11.746,22.312 11.397,23.002C11.244,23.304 11.129,23.721 11.066,24.497C11.001,25.292 11,26.317 11,27.809V36.19C11,37.683 11.001,38.708 11.066,39.503C11.129,40.279 11.244,40.696 11.397,40.998C11.746,41.688 12.303,42.249 12.988,42.6C13.287,42.754 13.701,42.87 14.472,42.934C15.26,42.999 16.278,43 17.76,43H30.24C31.722,43 32.739,42.999 33.528,42.934C34.299,42.87 34.713,42.754 35.013,42.6C35.697,42.249 36.254,41.688 36.603,40.998C36.756,40.696 36.871,40.279 36.934,39.503C36.999,38.708 37,37.683 37,36.19V27.809C37,26.317 36.999,25.292 36.934,24.497C36.871,23.721 36.756,23.304 36.603,23.002C36.254,22.312 35.697,21.751 35.013,21.4C34.713,21.246 34.299,21.13 33.528,21.066C32.739,21.001 31.722,21 30.24,21H17.76C16.278,21 15.26,21.001 14.472,21.066Z"
+      android:fillColor="#B0831E"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22.5,31.599C21.603,31.08 21,30.11 21,29C21,27.343 22.343,26 24,26C25.657,26 27,27.343 27,29C27,30.11 26.397,31.08 25.5,31.599V34.75C25.5,35.578 24.828,36.25 24,36.25C23.172,36.25 22.5,35.578 22.5,34.75V31.599Z"
+      android:fillColor="#B0831E"/>
+  <path
+      android:pathData="M34,19.102V13C34,7.477 29.523,3 24,3C18.477,3 14,7.477 14,13V19.102C13.248,19.184 12.63,19.335 12.074,19.62C12.049,19.633 12.025,19.646 12,19.659V13C12,6.373 17.373,1 24,1C30.627,1 36,6.373 36,13V19.659C35.975,19.646 35.951,19.633 35.926,19.62C35.369,19.335 34.752,19.184 34,19.102Z"
+      android:fillColor="#B3841C"/>
+  <path
+      android:pathData="M31.2,19.001C30.904,19 30.592,19 30.262,19H29.2V13.2C29.2,10.328 26.872,8 24,8C21.128,8 18.8,10.328 18.8,13.2V19H17.738C17.408,19 17.096,19 16.8,19.001V13.2C16.8,9.224 20.024,6 24,6C27.976,6 31.2,9.224 31.2,13.2V19.001Z"
+      android:fillColor="#B3841C"/>
+</vector>
diff --git a/app/src/main/res/drawable/number_color_48.xml b/app/src/main/res/drawable/number_color_48.xml
new file mode 100644
index 000000000..9ee7d9c84
--- /dev/null
+++ b/app/src/main/res/drawable/number_color_48.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M35.709,8.374C35.916,7.43 35.318,6.497 34.374,6.29C33.43,6.084 32.497,6.682 32.29,7.626L30.623,15.25L21.205,15.25L22.71,8.374C22.916,7.43 22.318,6.497 21.374,6.29C20.43,6.084 19.497,6.682 19.29,7.626L17.623,15.25H11C10.033,15.25 9.25,16.034 9.25,17C9.25,17.966 10.033,18.75 11,18.75H16.857L14.56,29.25H8C7.034,29.25 6.25,30.034 6.25,31C6.25,31.966 7.034,32.75 8,32.75H13.795L12.29,39.626C12.084,40.57 12.682,41.503 13.626,41.71C14.57,41.916 15.503,41.318 15.71,40.374L17.377,32.75H26.795L25.29,39.626C25.084,40.57 25.682,41.503 26.626,41.71C27.57,41.916 28.503,41.318 28.709,40.374L30.377,32.75H37C37.966,32.75 38.75,31.966 38.75,31C38.75,30.034 37.966,29.25 37,29.25H31.143L33.44,18.75H40C40.966,18.75 41.75,17.966 41.75,17C41.75,16.034 40.966,15.25 40,15.25H34.205L35.709,8.374ZM29.857,18.75H20.44L18.143,29.25H27.56L29.857,18.75Z"
+      android:fillColor="#CCD1FF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M34.801,4.337C36.825,4.779 38.106,6.778 37.663,8.801L36.69,13.25H40C42.071,13.25 43.75,14.929 43.75,17C43.75,19.071 42.071,20.75 40,20.75H35.049L33.628,27.25H37C39.071,27.25 40.75,28.929 40.75,31C40.75,33.071 39.071,34.75 37,34.75H31.987L30.663,40.801C30.221,42.825 28.222,44.106 26.199,43.663C24.175,43.221 22.894,41.222 23.337,39.199L24.31,34.75H18.987L17.663,40.801C17.221,42.825 15.222,44.106 13.199,43.663C11.175,43.221 9.894,41.222 10.337,39.199L11.31,34.75H8C5.929,34.75 4.25,33.071 4.25,31C4.25,28.929 5.929,27.25 8,27.25H12.95L14.372,20.75H11C8.929,20.75 7.25,19.071 7.25,17C7.25,14.929 8.929,13.25 11,13.25H16.013L17.337,7.199C17.779,5.175 19.778,3.894 21.801,4.337C23.825,4.779 25.106,6.778 24.663,8.801L23.69,13.25L29.013,13.25L30.337,7.199C30.779,5.175 32.778,3.894 34.801,4.337ZM30.623,15.25L32.29,7.626C32.497,6.682 33.43,6.084 34.374,6.29C35.318,6.497 35.916,7.43 35.709,8.374L34.205,15.25H40C40.966,15.25 41.75,16.034 41.75,17C41.75,17.966 40.966,18.75 40,18.75H33.44L31.143,29.25H37C37.966,29.25 38.75,30.034 38.75,31C38.75,31.966 37.966,32.75 37,32.75H30.377L28.709,40.374C28.503,41.318 27.57,41.916 26.626,41.71C25.682,41.503 25.084,40.57 25.29,39.626L26.795,32.75H17.377L15.71,40.374C15.503,41.318 14.57,41.916 13.626,41.71C12.682,41.503 12.084,40.57 12.29,39.626L13.795,32.75H8C7.034,32.75 6.25,31.966 6.25,31C6.25,30.034 7.034,29.25 8,29.25H14.56L16.857,18.75H11C10.033,18.75 9.25,17.966 9.25,17C9.25,16.034 10.033,15.25 11,15.25H17.623L19.29,7.626C19.497,6.682 20.43,6.084 21.374,6.29C22.318,6.497 22.916,7.43 22.71,8.374L21.205,15.25L30.623,15.25ZM22.05,20.75L20.628,27.25H25.95L27.372,20.75H22.05ZM20.44,18.75L18.143,29.25H27.56L29.857,18.75H20.44Z"
+      android:fillColor="#6771CC"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/username_education_fragment.xml b/app/src/main/res/layout/username_education_fragment.xml
index 8496863bb..4101b28b5 100644
--- a/app/src/main/res/layout/username_education_fragment.xml
+++ b/app/src/main/res/layout/username_education_fragment.xml
@@ -56,7 +56,8 @@
             android:layout_marginTop="40dp"
             android:importantForAccessibility="no"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title" />
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:srcCompat="@drawable/number_color_48" />
 
         <TextView
             android:id="@+id/username_education_text_1"
@@ -79,7 +80,8 @@
             android:layout_marginTop="36dp"
             android:importantForAccessibility="no"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/username_education_icon_1" />
+            app:layout_constraintTop_toBottomOf="@id/username_education_icon_1"
+            app:srcCompat="@drawable/link_color_48" />
 
         <TextView
             android:id="@+id/username_education_text_2"
@@ -102,7 +104,8 @@
             android:layout_marginTop="36dp"
             android:importantForAccessibility="no"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/username_education_icon_2" />
+            app:layout_constraintTop_toBottomOf="@id/username_education_icon_2"
+            app:srcCompat="@drawable/lock_color_48" />
 
         <TextView
             android:id="@+id/username_education_text_3"