From 84e4dd09c3bb585c4cfc4166c9f9207610458cf2 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 28 Oct 2020 08:59:57 +0800
Subject: Add an option to filter subreddits in popular and all.

---
 .../activity_subreddit_filter_popular_and_all.xml  | 52 ++++++++++++++++++++++
 .../main/res/layout/item_selected_subreddit.xml    |  6 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout/activity_subreddit_filter_popular_and_all.xml

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

diff --git a/app/src/main/res/layout/activity_subreddit_filter_popular_and_all.xml b/app/src/main/res/layout/activity_subreddit_filter_popular_and_all.xml
new file mode 100644
index 00000000..6a342718
--- /dev/null
+++ b/app/src/main/res/layout/activity_subreddit_filter_popular_and_all.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/coordinator_layout_subreddit_filter_popular_and_all_activity"
+    tools:context=".Activity.SubredditFilterPopularAndAllActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_layout_subreddit_filter_popular_and_all_activity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar_layout_subreddit_filter_popular_and_all_activity"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:titleEnabled="false"
+            app:toolbarId="@+id/toolbar_subreddit_filter_popular_and_all_activity">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar_subreddit_filter_popular_and_all_activity"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
+                app:popupTheme="@style/AppTheme.PopupOverlay"
+                app:navigationIcon="?attr/homeAsUpIndicator" />
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view_subreddit_filter_popular_and_all_activity"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_subreddit_filter_popular_and_all_activity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/fab_margin"
+        android:layout_gravity="bottom|end"
+        app:backgroundTint="?attr/colorPrimaryLightTheme"
+        app:srcCompat="@drawable/ic_add_day_night_24dp"
+        app:tint="@android:color/white" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_selected_subreddit.xml b/app/src/main/res/layout/item_selected_subreddit.xml
index 6e1a570a..2e8ae1c9 100644
--- a/app/src/main/res/layout/item_selected_subreddit.xml
+++ b/app/src/main/res/layout/item_selected_subreddit.xml
@@ -15,6 +15,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="16dp"
         android:textSize="?attr/font_default"
+        android:textColor="?attr/primaryTextColor"
         android:fontFamily="?attr/font_family" />
 
     <ImageView
@@ -22,6 +23,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_delete_24dp" />
+        android:src="@drawable/ic_delete_24dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?attr/selectableItemBackground" />
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3