From 54e0b2f3327e8858a3f4640eeda5f3d8ec223890 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 5 Jan 2021 16:00:45 +0800
Subject: Directly adding subreddit to multireddit is available.

---
 .../res/layout/activity_multireddit_selection.xml  | 41 ++++++++++++++++++++++
 .../res/menu/view_subreddit_detail_activity.xml    |  8 ++++-
 app/src/main/res/values/strings.xml                |  6 ++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout/activity_multireddit_selection.xml

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

diff --git a/app/src/main/res/layout/activity_multireddit_selection.xml b/app/src/main/res/layout/activity_multireddit_selection.xml
new file mode 100644
index 00000000..4c114742
--- /dev/null
+++ b/app/src/main/res/layout/activity_multireddit_selection.xml
@@ -0,0 +1,41 @@
+<?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_multireddit_selection_activity"
+    tools:application=".MultiredditSelectionActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_layout_multireddit_selection_activity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:titleEnabled="false"
+            app:toolbarId="@+id/toolbar_multireddit_selection_activity">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar_multireddit_selection_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>
+
+    <FrameLayout
+        android:id="@+id/frame_layout_multireddit_selection_activity"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/view_subreddit_detail_activity.xml b/app/src/main/res/menu/view_subreddit_detail_activity.xml
index f9a8cffc..1144d8e7 100644
--- a/app/src/main/res/menu/view_subreddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml
@@ -41,8 +41,14 @@
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_share_view_subreddit_detail_activity"
+        android:id="@+id/action_add_to_multireddit_view_subreddit_detail_activity"
         android:orderInCategory="7"
+        android:title="@string/action_add_to_multireddit"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_share_view_subreddit_detail_activity"
+        android:orderInCategory="8"
         android:title="@string/action_share"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9658a65a..d845d04c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,6 +37,8 @@
     <string name="customize_post_filter_activity_label">Customize Post Filter</string>
     <string name="filtered_posts_activity_subtitle">Filtered Posts</string>
     <string name="post_filter_preference_activity_label">Post Filter</string>
+    <string name="search_users_result_activity_label">Users</string>
+    <string name="multireddit_selection_activity_label">Select a Multireddit</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -76,6 +78,7 @@
     <string name="action_give_award">Give Award</string>
     <string name="action_save_to_database">Save to Database</string>
     <string name="action_read_all_messages">Read All Messages</string>
+    <string name="action_add_to_multireddit">Add to Multireddit</string>
 
     <string name="parse_json_response_error">Error occurred when parsing the JSON response</string>
     <string name="retrieve_token_error">Error Retrieving the token</string>
@@ -998,4 +1001,7 @@
     <string name="read_all_messages_success">Read all messages successfully</string>
     <string name="read_all_messages_failed">Unable to read all messages</string>
 
+    <string name="add_subreddit_or_user_to_multireddit_success">%1$s is added to multireddit %2$s</string>
+    <string name="add_subreddit_or_user_to_multireddit_failed">Unable to add %1$s to multireddit %2$s</string>
+
 </resources>
-- 
cgit v1.2.3