From cf1d14264d305f079f6d1aaa93dd0d499eb48ade Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Thu, 24 Sep 2020 15:20:11 +0800
Subject: Support showing subscribed subreddits in the main page.

---
 app/src/main/res/layout/app_bar_main.xml           |  1 -
 .../layout/fragment_customize_main_page_tabs.xml   | 67 +++++++++++++++++++---
 .../main/res/layout/fragment_nsfw_and_spoiler.xml  |  6 +-
 3 files changed, 61 insertions(+), 13 deletions(-)

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

diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 023ee042..5272b575 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -40,7 +40,6 @@
             app:layout_scrollFlags="scroll|enterAlways"
             app:tabGravity="fill"
             app:tabIndicatorHeight="3dp"
-            app:tabMode="fixed"
             app:tabRippleColor="?attr/colorControlHighlight"
             app:tabUnboundedRipple="false" />
 
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 a6803e7f..bd91d961 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
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/settings_tab_title"
                 android:textColor="@color/primaryTextColor"
-                android:textSize="?attr/font_18"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <TextView
@@ -91,7 +91,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/settings_tab_post_type"
                 android:textColor="@color/primaryTextColor"
-                android:textSize="?attr/font_18"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <TextView
@@ -123,7 +123,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/primaryTextColor"
-                android:textSize="?attr/font_18"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <TextView
@@ -172,7 +172,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/settings_tab_title"
                 android:textColor="@color/primaryTextColor"
-                android:textSize="?attr/font_18"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <TextView
@@ -203,7 +203,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/settings_tab_post_type"
                 android:textColor="@color/primaryTextColor"
-                android:textSize="?attr/font_18"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <TextView
@@ -235,7 +235,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/primaryTextColor"
-                android:textSize="?attr/font_18"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <TextView
@@ -284,7 +284,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/settings_tab_title"
                 android:textColor="@color/primaryTextColor"
-                android:textSize="?attr/font_18"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <TextView
@@ -315,7 +315,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/settings_tab_post_type"
                 android:textColor="@color/primaryTextColor"
-                android:textSize="?attr/font_18"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <TextView
@@ -347,7 +347,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/primaryTextColor"
-                android:textSize="?attr/font_18"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <TextView
@@ -360,6 +360,55 @@
 
         </LinearLayout>
 
+        <View
+            android:id="@+id/divider_4_customize_main_page_tabs_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/dividerColor" />
+
+        <TextView
+            android:id="@+id/more_tabs_group_summary_customize_main_page_tabs_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingStart="72dp"
+            android:paddingEnd="16dp"
+            android:text="@string/settings_more_tabs_summary"
+            android:textColor="@color/colorAccent"
+            android:textSize="?attr/font_default"
+            android:fontFamily="?attr/font_family" />
+
+        <LinearLayout
+            android:id="@+id/show_subscribed_subreddits_linear_layout_customize_main_page_tabs_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:paddingStart="72dp"
+            android:paddingEnd="16dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackground">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginEnd="16dp"
+                android:layout_gravity="center_vertical"
+                android:text="@string/settings_more_tabs_show_subscribed_subreddits_title"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="?attr/font_16"
+                android:fontFamily="?attr/font_family" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/show_subscribed_subreddits_switch_material_customize_main_page_tabs_fragment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml b/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml
index a1f53ee2..ccb9ff66 100644
--- a/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml
+++ b/app/src/main/res/layout/fragment_nsfw_and_spoiler.xml
@@ -34,7 +34,7 @@
                 android:drawablePadding="32dp"
                 android:text="@string/settings_enable_nsfw_title"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="?attr/font_default"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <com.google.android.material.switchmaterial.SwitchMaterial
@@ -66,7 +66,7 @@
                 android:layout_gravity="center_vertical"
                 android:text="@string/settings_blur_nsfw_title"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="?attr/font_default"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <com.google.android.material.switchmaterial.SwitchMaterial
@@ -97,7 +97,7 @@
                 android:layout_gravity="center_vertical"
                 android:text="@string/settings_blur_spoiler_title"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="?attr/font_default"
+                android:textSize="?attr/font_16"
                 android:fontFamily="?attr/font_family" />
 
             <com.google.android.material.switchmaterial.SwitchMaterial
-- 
cgit v1.2.3