From bc27f077d60ba451c121436723d0794ac69e6233 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sat, 10 Apr 2021 10:32:23 +0800
Subject: Fix cannot tap to retry in PostFragment. Show correct title in
 AdvancedPreferenceFragment.

---
 .../activities/SettingsActivity.java               |  3 +++
 app/src/main/res/layout/fragment_post.xml          | 26 +++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java
index 20e215e7..b4a70c30 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SettingsActivity.java
@@ -27,6 +27,7 @@ import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
 import ml.docilealligator.infinityforreddit.events.RecreateActivityEvent;
 import ml.docilealligator.infinityforreddit.settings.AboutPreferenceFragment;
+import ml.docilealligator.infinityforreddit.settings.AdvancedPreferenceFragment;
 import ml.docilealligator.infinityforreddit.settings.CustomizeBottomAppBarFragment;
 import ml.docilealligator.infinityforreddit.settings.CustomizeMainPageTabsFragment;
 import ml.docilealligator.infinityforreddit.settings.FontPreferenceFragment;
@@ -107,6 +108,8 @@ public class SettingsActivity extends BaseActivity implements
                 setTitle(R.string.settings_gestures_and_buttons_title);
             } else if (fragment instanceof PostPreferenceFragment) {
                 setTitle(R.string.settings_category_post_title);
+            } else if (fragment instanceof AdvancedPreferenceFragment) {
+                setTitle(R.string.settings_advanced_master_title);
             }
         });
     }
diff --git a/app/src/main/res/layout/fragment_post.xml b/app/src/main/res/layout/fragment_post.xml
index 22a662c2..cfd4b958 100644
--- a/app/src/main/res/layout/fragment_post.xml
+++ b/app/src/main/res/layout/fragment_post.xml
@@ -4,6 +4,19 @@
     android:layout_height="match_parent"
     tools:application="ml.docilealligator.infinityforreddit.fragments.PostFragment">
 
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_refresh_layout_post_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ml.docilealligator.infinityforreddit.customviews.CustomToroContainer
+            android:id="@+id/recycler_view_post_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false" />
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
     <LinearLayout
         android:id="@+id/fetch_post_info_linear_layout_post_fragment"
         android:layout_width="match_parent"
@@ -30,17 +43,4 @@
 
     </LinearLayout>
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh_layout_post_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ml.docilealligator.infinityforreddit.customviews.CustomToroContainer
-            android:id="@+id/recycler_view_post_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false" />
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
-- 
cgit v1.2.3