From 73c4ead2c05609b20bd1a6cabb45f4fe61a9b042 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Thu, 24 Sep 2020 22:27:05 +0800
Subject: Add favorite subreddits to the navigation drawer. Add favorite and
 subscriptions header to the navigation drawer.

---
 .../main/res/layout/fragment_customize_main_page_tabs.xml   | 13 +++++++++++++
 app/src/main/res/values/strings.xml                         |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

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

diff --git a/app/src/main/res/layout/fragment_customize_main_page_tabs.xml b/app/src/main/res/layout/fragment_customize_main_page_tabs.xml
index c9991b92..f20ec4d3 100644
--- a/app/src/main/res/layout/fragment_customize_main_page_tabs.xml
+++ b/app/src/main/res/layout/fragment_customize_main_page_tabs.xml
@@ -447,6 +447,19 @@
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family" />
 
+        <TextView
+            android:id="@+id/more_tabs_info_text_view_customize_main_page_tabs_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:drawablePadding="32dp"
+            android:text="@string/settings_more_tabs_info_summary"
+            android:textColor="@color/settingsSubtitleColor"
+            android:gravity="center_vertical"
+            android:textSize="?attr/font_default"
+            android:fontFamily="?attr/font_family"
+            app:drawableStartCompat="@drawable/ic_info_preference_24dp" />
+
         <LinearLayout
             android:id="@+id/show_favorite_subscribed_subreddits_linear_layout_customize_main_page_tabs_fragment"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b0341de1..5a30de5a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -341,7 +341,7 @@
     <string name="settings_start_autoplay_visible_area_offset_landscape_title">Autoplay Videos Visible Area Offset (Landscape)</string>
     <string name="settings_start_autoplay_visible_area_offset_landscape_summary">Start autoplaying videos when %1$d%% of them are visible</string>
     <string name="settings_immersive_interface_title">Immersive Interface</string>
-    <string name="settings_immersive_interface_summary">Does Not Apply to All Pages\nMay Not Work On Android 11</string>
+    <string name="settings_immersive_interface_summary">Does Not Apply to All Pages</string>
     <string name="settings_immersive_interface_ignore_nav_bar_title">Ignore Navigation Bar in Immersive Interface</string>
     <string name="settings_immersive_interface_ignore_nav_bar_summary">Prevent the Bottom Navigation Bar Having Extra Padding</string>
     <string name="settings_customize_tabs_in_main_page_title">Customize Tabs in Main Page</string>
@@ -453,6 +453,7 @@
     <string name="settings_tab_2_summary">Tab 2</string>
     <string name="settings_tab_3_summary">Tab 3</string>
     <string name="settings_more_tabs_summary">More Tabs</string>
+    <string name="settings_more_tabs_info_summary">Enabling the following options will cause an unintended behaviour:\nTabs may lose all the content after switching to others. This is the same as refreshing the page.</string>
     <string name="settings_more_tabs_show_favorite_subscribed_subreddits_title">Show Favorite Subscribed Subreddits</string>
     <string name="settings_more_tabs_show_subscribed_subreddits_title">Show Subscribed Subreddits</string>
     <string name="settings_tab_title">Title</string>
-- 
cgit v1.2.3