From 2f72e654eb9b3f92fc03a5b877a4ebcacbdcdab2 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sat, 18 Apr 2020 14:00:37 +0800
Subject: Show the number of awards in PostRecyclerView instead.

---
 app/src/main/res/layout/item_post.xml | 25 +++++++++++++------------
 app/src/main/res/values/strings.xml   |  2 ++
 app/src/main/res/values/styles.xml    |  4 +---
 3 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index b2030d63..5f2b0d15 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -94,8 +94,7 @@
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:textSize="?attr/title_font_18"
-            android:textColor="?attr/primaryTextColor" />
+            android:textSize="?attr/title_font_18" />
 
         <TextView
             android:id="@+id/content_text_view_item_post"
@@ -123,7 +122,6 @@
                 android:layout_height="wrap_content"
                 android:padding="4dp"
                 android:textSize="?attr/font_12"
-                android:textColor="@android:color/white"
                 app:lib_setRadius="3dp"
                 app:lib_setRoundedView="true"
                 app:lib_setShape="rectangle" />
@@ -135,7 +133,6 @@
                 android:layout_gravity="center"
                 android:text="@string/spoiler"
                 android:textSize="?attr/font_12"
-                android:textColor="@android:color/white"
                 android:padding="4dp"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
@@ -149,7 +146,6 @@
                 android:padding="4dp"
                 android:text="@string/nsfw"
                 android:textSize="?attr/font_12"
-                android:textColor="@android:color/white"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
                 app:lib_setRoundedView="true"
@@ -161,13 +157,24 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:textSize="?attr/font_12"
-                android:textColor="@android:color/white"
                 android:padding="4dp"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
                 app:lib_setRoundedView="true"
                 app:lib_setShape="rectangle" />
 
+            <com.libRG.CustomTextView
+                android:id="@+id/awards_text_view_item_post"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
+                android:textSize="?attr/font_12"
+                android:textColor="#EEAB02"
+                android:visibility="gone"
+                app:lib_setRadius="3dp"
+                app:lib_setRoundedView="true"
+                app:lib_setShape="rectangle" />
+
             <ImageView
                 android:id="@+id/archived_image_view_item_post"
                 android:layout_width="24dp"
@@ -189,12 +196,6 @@
                 android:src="@drawable/crosspost"
                 android:visibility="gone" />
 
-            <TextView
-                android:id="@+id/awards_text_view_item_post"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
         </com.nex3z.flowlayout.FlowLayout>
 
         <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38a1ab79..80a32a3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -687,4 +687,6 @@
     <string name="edit_multi_reddit">Edit Multireddit</string>
     <string name="delete_multi_reddit">Delete Multireddit</string>
 
+    <string name="n_awards">%1$d Awards</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 68f78baa..47efff57 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -38,9 +38,7 @@
         <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
-        <!--<item name="android:textColorPrimary">?attr/toolbarPrimaryTextAndIconColor</item>-->
-    </style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" />
 
-- 
cgit v1.2.3