From 75213738ab94c4cb29bf2817ee124b23a884f014 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Sat, 10 Jul 2021 21:26:14 -0400
Subject: [PATCH] colour fixes and whatnot

---
 app/src/main/res/color/ic_read_button_tint.xml   |  2 +-
 .../res/drawable/ic_sticker_curved_outlines.xml  | 16 ++++++++++++++++
 app/src/main/res/drawable/ic_story_sticker.xml   | 10 ----------
 .../main/res/layout/fragment_story_viewer.xml    |  2 +-
 app/src/main/res/layout/record_view_layout.xml   |  2 +-
 5 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_sticker_curved_outlines.xml
 delete mode 100644 app/src/main/res/drawable/ic_story_sticker.xml

diff --git a/app/src/main/res/color/ic_read_button_tint.xml b/app/src/main/res/color/ic_read_button_tint.xml
index a9d12381..c04c3c8b 100644
--- a/app/src/main/res/color/ic_read_button_tint.xml
+++ b/app/src/main/res/color/ic_read_button_tint.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/grey_600" android:state_enabled="false" />
+    <item android:color="@color/grey_600_a20" android:state_enabled="false" />
     <item android:color="?colorControlNormal" />
 </selector>
diff --git a/app/src/main/res/drawable/ic_sticker_curved_outlines.xml b/app/src/main/res/drawable/ic_sticker_curved_outlines.xml
new file mode 100644
index 00000000..ac75b937
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sticker_curved_outlines.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M22.684,10.469C22.755,10.97 22.792,11.481 22.792,12C22.792,17.956 17.956,22.792 12,22.792C6.044,22.792 1.208,17.956 1.208,12C1.208,6.044 6.044,1.208 12,1.208C12.302,1.208 12.601,1.22 12.897,1.245C14.309,2.434 21.296,9.14 22.684,10.469Z"
+      android:strokeWidth="1.73"
+      android:strokeColor="@android:color/white"/>
+  <path
+      android:pathData="M22.684,10.469C19.595,11.407 16.333,11.7 14,9.469C11.769,7.336 11.975,4.191 12.897,1.245"
+      android:strokeWidth="1.73"
+      android:fillColor="@android:color/white"
+      android:strokeColor="@android:color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_story_sticker.xml b/app/src/main/res/drawable/ic_story_sticker.xml
deleted file mode 100644
index a9079fe0..00000000
--- a/app/src/main/res/drawable/ic_story_sticker.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M22,10l-6,-6L4,4c-1.1,0 -2,0.9 -2,2v12.01c0,1.1 0.9,1.99 2,1.99l16,-0.01c1.1,0 2,-0.89 2,-1.99v-8zM15,5.5l5.5,5.5L15,11L15,5.5z"/>
-</vector>
diff --git a/app/src/main/res/layout/fragment_story_viewer.xml b/app/src/main/res/layout/fragment_story_viewer.xml
index bbce26f2..ab390f3c 100644
--- a/app/src/main/res/layout/fragment_story_viewer.xml
+++ b/app/src/main/res/layout/fragment_story_viewer.xml
@@ -100,7 +100,7 @@
         android:layout_height="48dp"
         android:enabled="false"
         android:visibility="visible"
-        app:icon="@drawable/ic_story_sticker"
+        app:icon="@drawable/ic_sticker_curved_outlines"
         app:iconGravity="textStart"
         app:iconPadding="0dp"
         app:iconSize="24dp"
diff --git a/app/src/main/res/layout/record_view_layout.xml b/app/src/main/res/layout/record_view_layout.xml
index 03ee04f4..a910b1f0 100644
--- a/app/src/main/res/layout/record_view_layout.xml
+++ b/app/src/main/res/layout/record_view_layout.xml
@@ -44,7 +44,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/white"
+        app:tint="?attr/colorOnPrimary"
         tools:srcCompat="@drawable/recv_basket_animated"
         tools:visibility="visible" />