From 2c341f450fc94da6484d376ca98669bcb51a952e Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 4 Apr 2022 16:09:20 -0300
Subject: [PATCH] Add finalized private story icons.

---
 app/src/main/res/drawable/ic_lock_16.xml                 | 9 +++++++++
 app/src/main/res/drawable/ic_lock_24.xml                 | 4 ++--
 app/src/main/res/drawable/ic_lock_40.xml                 | 9 +++++++++
 .../res/layout/stories_create_story_name_field_item.xml  | 3 ++-
 app/src/main/res/layout/stories_private_story_item.xml   | 4 ++--
 app/src/main/res/layout/stories_viewer_fragment_page.xml | 2 +-
 6 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_lock_16.xml
 create mode 100644 app/src/main/res/drawable/ic_lock_40.xml

diff --git a/app/src/main/res/drawable/ic_lock_16.xml b/app/src/main/res/drawable/ic_lock_16.xml
new file mode 100644
index 000000000..812356aa9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M11.429,6.8539H11.24V5.5759C11.2831,4.6209 10.9613,3.6853 10.34,2.9589C10.0468,2.6314 9.6852,2.3724 9.2809,2.2001C8.8765,2.0278 8.4393,1.9465 8,1.9619C7.5609,1.9462 7.1237,2.0277 6.7197,2.2006C6.3157,2.3734 5.9549,2.6334 5.663,2.9619C5.0462,3.6904 4.7279,4.6253 4.772,5.5789V6.8539H4.572C4.425,6.8537 4.2793,6.8826 4.1435,6.9387C4.0076,6.9949 3.8841,7.0773 3.7801,7.1813C3.6761,7.2852 3.5936,7.4086 3.5373,7.5444C3.481,7.6802 3.452,7.8258 3.452,7.9729V12.9199C3.452,13.2166 3.5699,13.5013 3.7797,13.7111C3.9896,13.921 4.2742,14.0389 4.571,14.0389H11.429C11.7258,14.0389 12.0104,13.921 12.2202,13.7111C12.4301,13.5013 12.548,13.2166 12.548,12.9199V7.9729C12.548,7.6761 12.4301,7.3915 12.2202,7.1816C12.0104,6.9717 11.7258,6.8539 11.429,6.8539V6.8539ZM6.205,5.4639C6.1773,4.9096 6.3534,4.3643 6.7,3.9309C6.8594,3.7435 7.0592,3.5946 7.2843,3.4954C7.5095,3.3962 7.7541,3.3491 8,3.3579C8.2474,3.3477 8.4938,3.394 8.7206,3.4933C8.9474,3.5926 9.1487,3.7422 9.309,3.9309C9.6527,4.3657 9.8272,4.9103 9.8,5.4639V6.8469H6.205V5.4639Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_24.xml b/app/src/main/res/drawable/ic_lock_24.xml
index c014e057d..386838613 100644
--- a/app/src/main/res/drawable/ic_lock_24.xml
+++ b/app/src/main/res/drawable/ic_lock_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/signal_icon_tint_primary"
-      android:pathData="M17,9L17,6A5,5 0,0 0,7 6L7,9a3,3 0,0 0,-3 3v7a3,3 0,0 0,3 3L17,22a3,3 0,0 0,3 -3L20,12A3,3 0,0 0,17 9ZM8.5,6a3.5,3.5 0,0 1,7 0L15.5,9h-7ZM18.5,19A1.5,1.5 0,0 1,17 20.5L7,20.5A1.5,1.5 0,0 1,5.5 19L5.5,12A1.5,1.5 0,0 1,7 10.5L17,10.5A1.5,1.5 0,0 1,18.5 12ZM12.75,15.792L12.75,18h-1.5L11.25,15.792a1.5,1.5 0,1 1,1.5 0Z"/>
+      android:pathData="M16.854,10.222V7.5C16.854,6.8626 16.7284,6.2314 16.4845,5.6424C16.2406,5.0535 15.883,4.5184 15.4323,4.0677C14.9816,3.617 14.4465,3.2594 13.8575,3.0155C13.2686,2.7715 12.6374,2.646 12,2.646C11.3626,2.646 10.7314,2.7715 10.1425,3.0155C9.5535,3.2594 9.0184,3.617 8.5677,4.0677C8.117,4.5184 7.7594,5.0535 7.5155,5.6424C7.2716,6.2314 7.146,6.8626 7.146,7.5V10.222C6.6835,10.2899 6.2607,10.5214 5.9543,10.8744C5.6479,11.2274 5.4782,11.6786 5.476,12.146V19.4C5.4773,19.9178 5.6836,20.4141 6.0498,20.7802C6.4159,21.1464 6.9122,21.3527 7.43,21.354H16.57C17.0878,21.3527 17.5841,21.1464 17.9502,20.7802C18.3164,20.4141 18.5227,19.9178 18.524,19.4V12.146C18.5218,11.6786 18.3521,11.2274 18.0457,10.8744C17.7393,10.5214 17.3165,10.2899 16.854,10.222ZM12,4.146C12.8892,4.147 13.7417,4.5008 14.3705,5.1295C14.9992,5.7583 15.3529,6.6108 15.354,7.5V10.193H8.646V7.5C8.6471,6.6108 9.0008,5.7583 9.6295,5.1295C10.2583,4.5008 11.1108,4.147 12,4.146V4.146ZM17.024,19.4C17.0224,19.5198 16.9741,19.6343 16.8892,19.7189C16.8044,19.8036 16.6898,19.8517 16.57,19.853H7.43C7.3102,19.8517 7.1956,19.8036 7.1108,19.7189C7.0259,19.6343 6.9776,19.5198 6.976,19.4V12.146C6.9778,12.0262 7.0263,11.9119 7.111,11.8273C7.1958,11.7427 7.3102,11.6945 7.43,11.693H16.57C16.6898,11.6945 16.8042,11.7427 16.889,11.8273C16.9737,11.9119 17.0222,12.0262 17.024,12.146V19.4Z"
+      android:fillColor="#000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock_40.xml b/app/src/main/res/drawable/ic_lock_40.xml
new file mode 100644
index 000000000..249ce49b5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_40.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M28.09,17.0342V12.5002C28.09,10.3546 27.2377,8.2968 25.7205,6.7797C24.2033,5.2625 22.1456,4.4102 20,4.4102C17.8544,4.4102 15.7967,5.2625 14.2795,6.7797C12.7624,8.2968 11.91,10.3546 11.91,12.5002V17.0342C11.1408,17.1419 10.436,17.5231 9.9249,18.108C9.4138,18.6929 9.1306,19.4424 9.127,20.2192V32.3592C9.1297,33.2153 9.4709,34.0355 10.0763,34.6409C10.6816,35.2463 11.5019,35.5875 12.358,35.5902H27.642C28.4981,35.5875 29.3184,35.2463 29.9238,34.6409C30.5291,34.0355 30.8704,33.2153 30.873,32.3592V20.2192C30.8695,19.4424 30.5862,18.6929 30.0751,18.108C29.564,17.5231 28.8593,17.1419 28.09,17.0342V17.0342ZM20,6.1602C21.6809,6.162 23.2924,6.8306 24.481,8.0191C25.6696,9.2077 26.3382,10.8193 26.34,12.5002V16.9882H13.66V12.5002C13.6619,10.8193 14.3304,9.2077 15.519,8.0191C16.7076,6.8306 18.3191,6.162 20,6.1602V6.1602ZM29.123,32.3602C29.1227,32.7529 28.9666,33.1294 28.6889,33.4071C28.4113,33.6848 28.0347,33.8409 27.642,33.8412H12.358C11.9653,33.8409 11.5888,33.6848 11.3111,33.4071C11.0334,33.1294 10.8773,32.7529 10.877,32.3602V20.2192C10.8775,19.8265 11.0337,19.4501 11.3114,19.1725C11.589,18.8949 11.9654,18.7387 12.358,18.7382H27.642C28.0346,18.7387 28.411,18.8949 28.6887,19.1725C28.9663,19.4501 29.1225,19.8265 29.123,20.2192V32.3602Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/stories_create_story_name_field_item.xml b/app/src/main/res/layout/stories_create_story_name_field_item.xml
index 1e146343c..30862e6b6 100644
--- a/app/src/main/res/layout/stories_create_story_name_field_item.xml
+++ b/app/src/main/res/layout/stories_create_story_name_field_item.xml
@@ -17,7 +17,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
-        app:srcCompat="@drawable/ic_group_24" />
+        app:srcCompat="@drawable/ic_lock_40"
+        app:tint="@color/signal_icon_tint_primary" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/edit_text_wrapper"
diff --git a/app/src/main/res/layout/stories_private_story_item.xml b/app/src/main/res/layout/stories_private_story_item.xml
index a25a2129a..682e87711 100644
--- a/app/src/main/res/layout/stories_private_story_item.xml
+++ b/app/src/main/res/layout/stories_private_story_item.xml
@@ -9,7 +9,6 @@
     android:orientation="horizontal"
     android:paddingHorizontal="@dimen/dsl_settings_gutter">
 
-    <!-- TODO - Final art asset -->
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="40dp"
@@ -19,7 +18,8 @@
         android:importantForAccessibility="no"
         android:scaleType="centerInside"
         app:backgroundTint="@color/signal_background_secondary"
-        app:srcCompat="@drawable/ic_emoji_people_20" />
+        app:srcCompat="@drawable/ic_lock_24"
+        app:tint="@color/signal_icon_tint_primary" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/label"
diff --git a/app/src/main/res/layout/stories_viewer_fragment_page.xml b/app/src/main/res/layout/stories_viewer_fragment_page.xml
index bb2555811..1e78deed2 100644
--- a/app/src/main/res/layout/stories_viewer_fragment_page.xml
+++ b/app/src/main/res/layout/stories_viewer_fragment_page.xml
@@ -215,7 +215,7 @@
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Signal.Subtitle"
         android:visibility="gone"
-        app:drawableStartCompat="@drawable/ic_update_group_16"
+        app:drawableStartCompat="@drawable/ic_lock_16"
         app:drawableTint="@color/transparent_white_80"
         app:layout_constraintBottom_toTopOf="@id/progress"
         app:layout_constraintEnd_toStartOf="@id/more"