From 77a31056b2213999acc94cd5dad1a24c5b006f90 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 9 Oct 2019 16:40:45 +0800
Subject: Favorite and unfavorite subreddits are now available.

---
 app/src/main/res/drawable/ic_favorite_24dp.xml               |  9 +++++++++
 app/src/main/res/drawable/ic_favorite_border_24dp.xml        |  9 +++++++++
 app/src/main/res/layout/item_favorite_subreddits_divider.xml | 12 ++++++++++++
 app/src/main/res/layout/item_subscribed_thing.xml            | 10 +++++++++-
 app/src/main/res/values/strings.xml                          |  3 +++
 5 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_favorite_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_favorite_border_24dp.xml
 create mode 100644 app/src/main/res/layout/item_favorite_subreddits_divider.xml

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

diff --git a/app/src/main/res/drawable/ic_favorite_24dp.xml b/app/src/main/res/drawable/ic_favorite_24dp.xml
new file mode 100644
index 00000000..64afd4b3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_favorite_24dp.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:fillColor="#FFEE0264"
+      android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_favorite_border_24dp.xml b/app/src/main/res/drawable/ic_favorite_border_24dp.xml
new file mode 100644
index 00000000..48a506b1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_favorite_border_24dp.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:fillColor="#FFEE0264"
+      android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_favorite_subreddits_divider.xml b/app/src/main/res/layout/item_favorite_subreddits_divider.xml
new file mode 100644
index 00000000..7b3f34a8
--- /dev/null
+++ b/app/src/main/res/layout/item_favorite_subreddits_divider.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/divider_text_view_item_favorite_subreddits_divider"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_subscribed_thing.xml b/app/src/main/res/layout/item_subscribed_thing.xml
index 92e381aa..bb76a5fb 100644
--- a/app/src/main/res/layout/item_subscribed_thing.xml
+++ b/app/src/main/res/layout/item_subscribed_thing.xml
@@ -17,10 +17,18 @@
 
     <TextView
         android:id="@+id/subreddit_name_text_view_item_subscribed_subreddit"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
         android:textColor="@color/primaryTextColor"
         android:textSize="?attr/font_default"
         android:layout_gravity="center_vertical" />
 
+    <ImageView
+        android:id="@+id/favorite_image_view_item_subscribed_subreddit"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="end|center_vertical"
+        android:layout_marginStart="32dp" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 24407978..bcd99f75 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -332,4 +332,7 @@
     <string name="comment_saved_failed">Unable to save comment</string>
     <string name="comment_unsaved_success">Comment unsaved</string>
     <string name="comment_unsaved_failed">Unable to unsave comment</string>
+
+    <string name="favorites">Favorites</string>
+    <string name="all">All</string>
 </resources>
-- 
cgit v1.2.3