From 95a9215ec8159c01bada1d07bb7b647372016b80 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Thu, 12 Nov 2020 12:07:35 +0800
Subject: Disable swipe action when there are more than 1 column in
 PostFragment.

---
 app/src/main/res/values/strings.xml               | 1 +
 app/src/main/res/xml/swipe_action_preferences.xml | 5 +++++
 app/src/main/res/xml/theme_preferences.xml        | 5 ++---
 3 files changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02dfa6f9..ecc9b8a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -506,6 +506,7 @@
     <string name="settings_disable_image_preview_title">Disable Image Preview in Data Saving Mode</string>
     <string name="settings_swipe_action_swipe_left_title">Swipe Left</string>
     <string name="settings_swipe_action_swipe_right_title">Swipe Right</string>
+    <string name="settings_swipe_action_info_summary">Not applicable to post feed with more than 1 column.</string>
 
     <string name="no_link_available">Cannot get the link</string>
 
diff --git a/app/src/main/res/xml/swipe_action_preferences.xml b/app/src/main/res/xml/swipe_action_preferences.xml
index c15330b6..efdbed67 100644
--- a/app/src/main/res/xml/swipe_action_preferences.xml
+++ b/app/src/main/res/xml/swipe_action_preferences.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <Preference
+        app:icon="@drawable/ic_info_preference_24dp"
+        app:summary="@string/settings_swipe_action_info_summary"
+        app:enabled="false" />
+
     <SwitchPreference
         app:defaultValue="false"
         app:key="enable_swipe_action"
diff --git a/app/src/main/res/xml/theme_preferences.xml b/app/src/main/res/xml/theme_preferences.xml
index a520fc49..f4fb02a8 100644
--- a/app/src/main/res/xml/theme_preferences.xml
+++ b/app/src/main/res/xml/theme_preferences.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     
     <ListPreference
         app:defaultValue="2"
@@ -42,7 +41,7 @@
         app:title="@string/settings_manage_themes_title" />
 
     <Preference
-        android:icon="@drawable/ic_info_preference_24dp"
+        app:icon="@drawable/ic_info_preference_24dp"
         app:summary="@string/settings_custom_theme_cannot_apply_to_settings_page_summary"
         app:enabled="false" />
 
-- 
cgit v1.2.3