From 0e2d38010ef03379cd61b22f7c12710938cb5175 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 12 Aug 2019 13:06:23 +0300
Subject: simplify descriptions and reorder some headline-related prefs

---
 org.fox.ttrss/src/main/res/xml/preferences.xml | 53 +++++++++++++-------------
 1 file changed, 26 insertions(+), 27 deletions(-)

(limited to 'org.fox.ttrss/src/main/res/xml')

diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 15340386..40e327cf 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -68,32 +68,6 @@
         android:key="category_headlines"
         android:title="@string/headlines" >
 
-        <org.fox.ttrss.util.LessBrokenSwitchPreference
-            android:defaultValue="true"
-            android:key="headlines_show_content"
-            android:summary="@string/pref_headlines_show_content_long"
-            android:title="@string/pref_headlines_show_content" />
-
-        <org.fox.ttrss.util.LessBrokenSwitchPreference
-            android:defaultValue="true"
-            android:dependency="headlines_mark_read_scroll"
-            android:key="headlines_swipe_to_dismiss"
-            android:summary="@string/pref_headlines_swipe_to_dismiss_long"
-            android:title="@string/pref_headlines_swipe_to_dismiss" />
-
-        <org.fox.ttrss.util.LessBrokenSwitchPreference
-            android:defaultValue="false"
-            android:disableDependentsState="true"
-            android:key="headlines_mark_read_scroll"
-            android:summary="@string/pref_headlines_mark_read_scroll_long"
-            android:title="@string/pref_headlines_mark_read_scroll" />
-
-        <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference
-            android:defaultValue="false"
-            android:key="enable_condensed_fonts"
-            android:summary="@string/pref_headlines_use_condensed_fonts_long"
-            android:title="@string/pref_headlines_use_condensed_fonts" /> -->
-
         <org.fox.ttrss.util.FontSizeDialogPreference
             android:defaultValue="13"
             android:key="headlines_font_size_sp"
@@ -111,8 +85,33 @@
         <org.fox.ttrss.util.LessBrokenSwitchPreference
             android:defaultValue="false"
             android:key="headline_images_wifi_only"
+            android:summary="@string/prefs_headline_images_wifi_only_long"
             android:title="@string/prefs_headline_images_wifi_only" />
 
+        <org.fox.ttrss.util.LessBrokenSwitchPreference
+            android:defaultValue="true"
+            android:key="headlines_show_content"
+            android:title="@string/pref_headlines_show_content" />
+
+        <org.fox.ttrss.util.LessBrokenSwitchPreference
+            android:defaultValue="false"
+            android:disableDependentsState="true"
+            android:key="headlines_mark_read_scroll"
+            android:title="@string/pref_headlines_mark_read_scroll" />
+
+        <org.fox.ttrss.util.LessBrokenSwitchPreference
+            android:defaultValue="true"
+            android:dependency="headlines_mark_read_scroll"
+            android:key="headlines_swipe_to_dismiss"
+            android:summary="@string/pref_headlines_swipe_to_dismiss_long"
+            android:title="@string/pref_headlines_swipe_to_dismiss" />
+
+        <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference
+            android:defaultValue="false"
+            android:key="enable_condensed_fonts"
+            android:summary="@string/pref_headlines_use_condensed_fonts_long"
+            android:title="@string/pref_headlines_use_condensed_fonts" /> -->
+
         <ListPreference
             android:defaultValue="15"
             android:entries="@array/pref_headlines_request_values"
@@ -124,7 +123,7 @@
         <org.fox.ttrss.util.LessBrokenSwitchPreference
             android:defaultValue="false"
             android:key="inline_video_player"
-            android:summary="Experimental: play videos inside headlines list. Long tap to open separate player"
+            android:summary="@string/prefs_inline_video_player"
             android:title="Inline video player" />
 
     </PreferenceCategory>
-- 
cgit v1.2.3