From bbfcce2e90d6d85342dfb9ec4f8d537d77f00b7e Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 10 Nov 2020 15:35:22 +0800
Subject: Selecting swipe actions is available. Fix issues in swipe aciton. Add
 two icons for advanced and about in settings.

---
 app/src/main/res/xml/main_preferences.xml         |  2 ++
 app/src/main/res/xml/swipe_action_preferences.xml | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

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

diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 1dea4177..f318d83d 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -69,10 +69,12 @@
         app:fragment="ml.docilealligator.infinityforreddit.Settings.MiscellaneousPreferenceFragment"/>
 
     <Preference
+        android:icon="@drawable/ic_advanced_24dp"
         app:title="@string/settings_advanced_master_title"
         app:fragment="ml.docilealligator.infinityforreddit.Settings.AdvancedPreferenceFragment" />
 
     <Preference
+        android:icon="@drawable/ic_about_24dp"
         app:title="@string/settings_about_master_title"
         app:fragment="ml.docilealligator.infinityforreddit.Settings.AboutPreferenceFragment" />
 
diff --git a/app/src/main/res/xml/swipe_action_preferences.xml b/app/src/main/res/xml/swipe_action_preferences.xml
index 36326765..c15330b6 100644
--- a/app/src/main/res/xml/swipe_action_preferences.xml
+++ b/app/src/main/res/xml/swipe_action_preferences.xml
@@ -22,22 +22,22 @@
         app:title="@string/settings_swipe_action_swipe_right_title"
         app:useSimpleSummaryProvider="true" />
 
+    <ListPreference
+        app:defaultValue="0.3"
+        app:entries="@array/settings_swipe_action_threshold"
+        app:entryValues="@array/settings_swipe_action_threshold"
+        app:key="swipe_action_threshold"
+        app:title="@string/settings_swipe_action_threshold"
+        app:useSimpleSummaryProvider="true" />
+
     <SwitchPreference
         app:defaultValue="true"
         app:key="vibrate_when_action_triggered"
-        app:title="@string/settings_vibrate_when_action_triggered_title" />
+        app:title="@string/settings_swipe_action_haptic_feedback_title" />
 
     <SwitchPreference
         app:defaultValue="false"
         app:key="disable_swiping_between_tabs"
         app:title="@string/settings_disable_swiping_between_tabs_title" />
 
-    <ListPreference
-        app:defaultValue="0.3"
-        app:entries="@array/settings_swipe_action_threshold"
-        app:entryValues="@array/settings_swipe_action_threshold"
-        app:key="swipe_action_threshold"
-        app:title="@string/settings_swipe_action_threshold"
-        app:useSimpleSummaryProvider="true" />
-
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3