From 604c65c7fb2191c3f8bdc0b2552660126ae04c8f Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 10 Mar 2022 13:21:16 -0400
Subject: [PATCH] Add finalized story icon assets.

---
 .../securesms/stories/landing/StoriesLandingItem.kt |  2 --
 .../main/res/drawable-night/ic_chat_message_24.xml  | 13 +++++++++++++
 app/src/main/res/drawable-night/ic_stories_24.xml   | 12 ++++++++++++
 .../res/drawable/ic_add_reaction_outline_24.xml     | 10 ++++++++++
 app/src/main/res/drawable/ic_chat_message_24.xml    |  9 +++++++++
 app/src/main/res/drawable/ic_messages_solid_20.xml  | 12 ++++++++++++
 app/src/main/res/drawable/ic_stories_24.xml         | 10 ++++++++++
 app/src/main/res/layout/conversation_list_tabs.xml  |  4 ++--
 app/src/main/res/layout/stories_landing_item.xml    |  4 ++--
 .../stories_reply_to_story_composer_content.xml     | 10 +---------
 10 files changed, 71 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable-night/ic_chat_message_24.xml
 create mode 100644 app/src/main/res/drawable-night/ic_stories_24.xml
 create mode 100644 app/src/main/res/drawable/ic_add_reaction_outline_24.xml
 create mode 100644 app/src/main/res/drawable/ic_chat_message_24.xml
 create mode 100644 app/src/main/res/drawable/ic_messages_solid_20.xml
 create mode 100644 app/src/main/res/drawable/ic_stories_24.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
index cd2ecb3354..eedce99e7f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
@@ -138,8 +138,6 @@ object StoriesLandingItem {
       }
 
       icon.visible = model.data.hasReplies || model.data.hasRepliesFromSelf
-      // TODO [stories] -- Set actual image resource
-      icon.setImageDrawable(ColorDrawable(Color.RED))
 
       listOf(avatarView, storyPreview, storyMulti, sender, date, icon).forEach {
         it.alpha = if (model.data.isHidden) 0.5f else 1f
diff --git a/app/src/main/res/drawable-night/ic_chat_message_24.xml b/app/src/main/res/drawable-night/ic_chat_message_24.xml
new file mode 100644
index 0000000000..c00fb3e3a8
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_chat_message_24.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M12,2.5C6.2,2.5 1.5,6.529 1.5,11.5C1.5197,13.5188 2.2868,15.4586 3.653,16.945L3.014,20.781C2.924,21.323 3.277,21.625 3.798,21.451L8.356,19.932C9.5342,20.3077 10.7633,20.4993 12,20.5C17.8,20.5 22.5,16.471 22.5,11.5C22.5,6.529 17.727,2.5 12,2.5Z"
+        android:fillColor="#000000"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_stories_24.xml b/app/src/main/res/drawable-night/ic_stories_24.xml
new file mode 100644
index 0000000000..6b548c27fd
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_stories_24.xml
@@ -0,0 +1,12 @@
+<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="M10.0762,0.9539C8.4193,0.9539 7.0762,2.297 7.0762,3.9539V19.9539C7.0762,21.6107 8.4193,22.9539 10.0762,22.9539H18.0762C19.733,22.9539 21.0762,21.6107 21.0762,19.9539V3.9539C21.0762,2.297 19.733,0.9539 18.0762,0.9539H10.0762Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M5,4C5,3.6547 5.0437,3.3196 5.126,3H5C3.8954,3 3,3.8954 3,5V19C3,20.1046 3.8954,21 5,21H5.126C5.0437,20.6804 5,20.3453 5,20V4Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_add_reaction_outline_24.xml b/app/src/main/res/drawable/ic_add_reaction_outline_24.xml
new file mode 100644
index 0000000000..455fcddb06
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_reaction_outline_24.xml
@@ -0,0 +1,10 @@
+<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="M14.5833,2.9167C15.4673,2.9167 16.3152,3.2679 16.9403,3.893C17.5654,4.5181 17.9166,5.366 17.9166,6.25C17.9166,7.4622 17.4819,8.7413 16.7977,10H18.2101C18.7986,8.7713 19.1666,7.5023 19.1666,6.25C19.1666,5.0345 18.6837,3.8687 17.8242,3.0091C16.9646,2.1496 15.7989,1.6667 14.5833,1.6667C13.9809,1.666 13.3843,1.7844 12.8278,2.015C12.2714,2.2457 11.766,2.5842 11.3408,3.0109C10.8486,3.4848 10.3999,4.0019 10,4.5559C9.6,4.0019 9.1513,3.4848 8.6591,3.0109C8.0183,2.3694 7.2017,1.9325 6.3125,1.7552C5.4233,1.578 4.5015,1.6685 3.6638,2.0153C2.826,2.362 2.1099,2.9494 1.6061,3.7032C1.1022,4.457 0.8333,5.3433 0.8333,6.25C0.8333,11.2172 6.6233,16.4476 9,18.3854V16.7649C6.1643,14.315 2.0833,9.9728 2.0833,6.25C2.0833,5.59 2.2792,4.9448 2.6462,4.3962C3.0133,3.8476 3.5349,3.4204 4.1451,3.1686C4.7552,2.9168 5.4264,2.8519 6.0735,2.9819C6.7206,3.112 7.3145,3.4312 7.78,3.8992C8.2121,4.3162 8.6077,4.7695 8.9625,5.2542L9.995,6.78L11.0349,5.2575C11.3919,4.7699 11.79,4.3138 12.2249,3.8942C12.5339,3.5834 12.9014,3.337 13.3062,3.1693C13.711,3.0015 14.1451,2.9156 14.5833,2.9167ZM16.25,13H17.75V17H22V18.5H17.75V23H16.25V18.5H12V17H16.25V13Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_chat_message_24.xml b/app/src/main/res/drawable/ic_chat_message_24.xml
new file mode 100644
index 0000000000..9be74b2494
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chat_message_24.xml
@@ -0,0 +1,9 @@
+<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,4C16.963,4 21,7.364 21,11.5C21,15.636 16.963,19 12,19C10.9173,18.9982 9.8413,18.8296 8.81,18.5L8.345,18.352L7.881,18.507L4.739,19.556L5.133,17.191L5.251,16.484L4.774,15.948C3.6509,14.737 3.0185,13.1515 3,11.5C3,7.364 7.037,4 12,4ZM12,2.5C6.2,2.5 1.5,6.529 1.5,11.5C1.5197,13.5188 2.2868,15.4586 3.653,16.945L3.014,20.781C2.941,21.219 3.158,21.5 3.519,21.5C3.614,21.4985 3.7082,21.482 3.798,21.451L8.356,19.932C9.5342,20.3077 10.7633,20.4993 12,20.5C17.8,20.5 22.5,16.471 22.5,11.5C22.5,6.529 17.727,2.5 12,2.5Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_messages_solid_20.xml b/app/src/main/res/drawable/ic_messages_solid_20.xml
new file mode 100644
index 0000000000..61e66a735a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_messages_solid_20.xml
@@ -0,0 +1,12 @@
+<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="M1.5,9C1.5,5.686 4.6333,3 8.5,3C11.3471,3 13.8406,4.4937 14.9246,6.6276C14.4647,6.5439 13.9882,6.5 13.5,6.5C9.682,6.5 6.5,9.2566 6.5,12.6578C6.5,13.4296 6.6613,14.1681 6.9559,14.8489C6.6572,14.79 6.3616,14.7141 6.0707,14.6213L3.032,15.634C2.6847,15.75 2.4493,15.5486 2.5093,15.1873L2.9353,12.63C2.0245,11.6391 1.5132,10.3458 1.5,9Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M13.5,8.3334C16.2619,8.3334 18.5,10.2418 18.5,12.5965C18.4906,13.5527 18.1253,14.4716 17.4748,15.1757L17.779,16.9927C17.8219,17.2494 17.6538,17.3925 17.4057,17.31L15.2352,16.5905C14.6742,16.7685 14.0889,16.8592 13.5,16.8596C10.7381,16.8596 8.5,14.9511 8.5,12.5965C8.5,10.2418 10.7729,8.3334 13.5,8.3334Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_stories_24.xml b/app/src/main/res/drawable/ic_stories_24.xml
new file mode 100644
index 0000000000..ed518e716f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stories_24.xml
@@ -0,0 +1,10 @@
+<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="M10.0762,1.2039C8.5574,1.2039 7.3262,2.4351 7.3262,3.9539V19.9539C7.3262,21.4726 8.5574,22.7039 10.0762,22.7039H18.0762C19.595,22.7039 20.8262,21.4726 20.8262,19.9539V3.9539C20.8262,2.4351 19.595,1.2039 18.0762,1.2039H10.0762ZM8.8262,3.9539C8.8262,3.2635 9.3858,2.7039 10.0762,2.7039H18.0762C18.7665,2.7039 19.3262,3.2635 19.3262,3.9539V19.9539C19.3262,20.6442 18.7665,21.2039 18.0762,21.2039H10.0762C9.3858,21.2039 8.8262,20.6442 8.8262,19.9539V3.9539ZM4.5,4C4.5,3.6679 4.5405,3.3452 4.6168,3.0367C3.6955,3.2154 3,4.0265 3,5V19C3,19.9735 3.6955,20.7845 4.6168,20.9633C4.5405,20.6548 4.5,20.3321 4.5,20V4Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/conversation_list_tabs.xml b/app/src/main/res/layout/conversation_list_tabs.xml
index 8894026a0d..6dc77b9ef0 100644
--- a/app/src/main/res/layout/conversation_list_tabs.xml
+++ b/app/src/main/res/layout/conversation_list_tabs.xml
@@ -42,7 +42,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        app:srcCompat="@drawable/ic_message_24" />
+        app:srcCompat="@drawable/ic_chat_message_24" />
 
     <TextView
         android:id="@+id/chats_tab_label"
@@ -76,7 +76,7 @@
         app:layout_constraintStart_toEndOf="@id/tabs_center_guide"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        app:srcCompat="@drawable/ic_wallpaper_24" />
+        app:srcCompat="@drawable/ic_stories_24" />
 
     <TextView
         android:id="@+id/stories_tab_label"
diff --git a/app/src/main/res/layout/stories_landing_item.xml b/app/src/main/res/layout/stories_landing_item.xml
index 781e935f33..429f886ce4 100644
--- a/app/src/main/res/layout/stories_landing_item.xml
+++ b/app/src/main/res/layout/stories_landing_item.xml
@@ -78,8 +78,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/avatar"
         app:layout_constraintTop_toBottomOf="@id/date"
-        tools:srcCompat="@drawable/ic_reply"
-        tools:tint="@color/signal_text_secondary" />
+        app:srcCompat="@drawable/ic_messages_solid_20"
+        app:tint="@color/signal_text_secondary" />
 
     <org.thoughtcrime.securesms.components.ThumbnailView
         android:id="@+id/story_multi"
diff --git a/app/src/main/res/layout/stories_reply_to_story_composer_content.xml b/app/src/main/res/layout/stories_reply_to_story_composer_content.xml
index c28ebe6efe..9c7ab22f69 100644
--- a/app/src/main/res/layout/stories_reply_to_story_composer_content.xml
+++ b/app/src/main/res/layout/stories_reply_to_story_composer_content.xml
@@ -103,7 +103,7 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/StoryReplyComposer__react_to_this_story"
             android:scaleType="centerInside"
-            app:srcCompat="@drawable/ic_heart_24" />
+            app:srcCompat="@drawable/ic_add_reaction_outline_24" />
 
         <ImageView
             android:id="@+id/reply"
@@ -117,12 +117,4 @@
             app:srcCompat="@drawable/ic_send_24" />
     </ViewSwitcher>
 
-    <!--    <androidx.fragment.app.FragmentContainerView-->
-    <!--        android:id="@+id/mentions_picker_container"-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="0dp"-->
-    <!--        android:layout_gravity="bottom"-->
-    <!--        app:layout_constraintBottom_toTopOf="@id/input_barrier"-->
-    <!--        app:layout_constraintTop_toTopOf="parent" />-->
-
 </androidx.constraintlayout.widget.ConstraintLayout>