From 36c24e5846cffb9ed5928b59bcca2b184343f7dc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 4 Nov 2014 17:27:11 +0300
Subject: implement support for article sorting modes instead of previous
 preference options

---
 org.fox.ttrss/src/main/res/values/strings.xml  | 5 +++++
 org.fox.ttrss/src/main/res/xml/preferences.xml | 9 ---------
 2 files changed, 5 insertions(+), 9 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index b4f81543..0752ff54 100644
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -244,5 +244,10 @@
     <string name="error_loading_image">Error loading image.</string>
     <string name="open_parent">Open parent</string>
     <string name="toggle_sort_order">Toggle oldest first</string>
+    <string name="headlines_sort_default">Default</string>
+    <string name="headlines_sort_newest_first">Newest first</string>
+    <string name="headlines_sort_oldest_first">Oldest first</string>
+    <string name="headlines_sort_title">Title</string>
+    <string name="headlines_sort_articles_title">Sort articles</string>
 
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 7ee21f84..ec1c6418 100644
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -104,11 +104,6 @@
             android:summary="@string/pref_headlines_full_content_long"
             android:title="@string/pref_headlines_full_content" /> -->
         
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="oldest_first"
-            android:summary="@string/requires_api5"
-            android:title="@string/offline_oldest_first" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="headlines_mark_read_scroll"
@@ -171,10 +166,6 @@
             android:key="offline_image_cache_enabled"
             android:summary="@string/offline_image_cache_enabled_summary"
             android:title="@string/offline_image_cache_enabled" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="offline_oldest_first"
-            android:title="@string/offline_oldest_first" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/debugging" >
         <CheckBoxPreference
-- 
cgit v1.2.3