Merge pull request #228 from afarra/master

Ability to sort bookmarks and tags
quran · Dec 26, 2012 · db54e9f · db54e9f
2 parents 7becb16 + 48cfbe7
commit db54e9f
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 0 deletions.
diff --git a/app/res/drawable-hdpi/ic_sort.png b/app/res/drawable-hdpi/ic_sort.png
diff --git a/app/res/drawable-mdpi/ic_sort.png b/app/res/drawable-mdpi/ic_sort.png
diff --git a/app/res/drawable-xhdpi/ic_sort.png b/app/res/drawable-xhdpi/ic_sort.png
diff --git a/app/res/menu/home_menu.xml b/app/res/menu/home_menu.xml
@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/sort"
+          android:icon="@drawable/ic_sort"
+          android:title="@string/menu_sort"
+          android:visible="false"
+          android:enabled="false"
+          android:showAsAction="ifRoom" >
+          <menu>
+              <item android:id="@+id/sort_date"
+                    android:title="@string/menu_sort_date"
+                    android:showAsAction="withText" />
+              <item android:id="@+id/sort_location"
+                    android:title="@string/menu_sort_location"
+                    android:visible="false"
+                    android:enabled="false"
+                    android:showAsAction="withText" />
+              <item android:id="@+id/sort_alphabetical"
+                    android:title="@string/menu_sort_alphabetical"
+                    android:visible="false"
+                    android:enabled="false"
+                    android:showAsAction="withText" />
+          </menu>
+    </item>
     <item android:id="@+id/last_page"
           android:icon="@drawable/ic_goto_quran"
           android:title="@string/menu_jump_last_page"

diff --git a/app/res/values-ar/strings.xml b/app/res/values-ar/strings.xml
@@ -17,6 +17,10 @@
     <string name="menu_bookmarks">المرجعيات</string>
     <string name="menu_bookmarks_page">مرجعيات الصفحات</string>
     <string name="menu_bookmarks_ayah">مرجعيات الآيات</string>
+    <string name="menu_sort">تغير الترتيب</string>
+    <string name="menu_sort_date">تاريخ الإضافة</string>
+    <string name="menu_sort_location">موقعها في القرآن</string>
+    <string name="menu_sort_alphabetical">أبجدي</string>
     <string name="menu_translation">التفسير/الترجمة</string>
     <string name="menu_back_to_page">إلى التلاوة</string>
     <string name="menu_help">مساعدة</string>

diff --git a/app/res/values-fa/strings.xml b/app/res/values-fa/strings.xml
@@ -16,6 +16,10 @@
     <string name="menu_bookmarks">نشانکها</string>
     <string name="menu_bookmarks_page">صفحه نشانکها</string>
     <string name="menu_bookmarks_ayah">نشانکهاي آيه</string>
+    <string name="menu_sort">Sort</string>
+    <string name="menu_sort_date">Date Added</string>
+    <string name="menu_sort_location">Location in Quran</string>
+    <string name="menu_sort_alphabetical">Alphabetical</string>
     <string name="menu_translation">مشاهده ترجمه</string>
     <string name="menu_back_to_page">مشاهده قرآن</string>
     <string name="menu_help">راهنما</string>

diff --git a/app/res/values-ru/strings.xml b/app/res/values-ru/strings.xml
@@ -19,6 +19,10 @@
     <string name="menu_bookmarks">Закладки</string>
     <string name="menu_bookmarks_page">Закладки страниц</string>
     <string name="menu_bookmarks_ayah">Закладки аятов</string>
+    <string name="menu_sort">Sort</string>
+    <string name="menu_sort_date">Date Added</string>
+    <string name="menu_sort_location">Location in Quran</string>
+    <string name="menu_sort_alphabetical">Alphabetical</string>
     <string name="menu_translation">Показать перевод</string>
     <string name="menu_back_to_page">Показать Коран</string>
     <string name="menu_help">Помощь</string>

diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
@@ -19,6 +19,10 @@
     <string name="menu_bookmarks">Bookmarks</string>
     <string name="menu_bookmarks_page">Page Bookmarks</string>
     <string name="menu_bookmarks_ayah">Ayah Bookmarks</string>
+    <string name="menu_sort">Sort</string>
+    <string name="menu_sort_date">Date Added</string>
+    <string name="menu_sort_location">Location in Quran</string>
+    <string name="menu_sort_alphabetical">Alphabetical</string>
     <string name="menu_translation">Show Translation</string>
     <string name="menu_back_to_page">Show Quran</string>
     <string name="menu_help">Help</string>