From 01c255abca5e49291e3147ee0a5fe28b8ae180c0 Mon Sep 17 00:00:00 2001
From: Nicholas Narsing <soren121@sorenstudios.com>
Date: Sat, 28 Apr 2018 00:39:35 -0400
Subject: [PATCH 1/8] Set fastscroll section name correctly by sort preference

---
 .../adapter/album/AlbumAdapter.java           | 18 ++++++++++++-
 .../adapter/artist/ArtistAdapter.java         | 12 ++++++++-
 .../gramophone/adapter/song/SongAdapter.java  | 26 ++++++++++++++++++-
 .../gramophone/helper/SortOrder.java          |  6 ++---
 4 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
index dfb79b95..eefbbe7a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
@@ -26,6 +26,8 @@ import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
+import com.kabouzeid.gramophone.util.PreferenceUtil;
+import com.kabouzeid.gramophone.helper.SortOrder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -186,7 +188,21 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
     @NonNull
     @Override
     public String getSectionName(int position) {
-        return MusicUtil.getSectionName(dataSet.get(position).getTitle());
+        @Nullable String sectionName = null;
+        switch (PreferenceUtil.getInstance(activity).getAlbumSortOrder()) {
+            case SortOrder.AlbumSortOrder.ALBUM_A_Z:
+            case SortOrder.AlbumSortOrder.ALBUM_Z_A:
+                sectionName = dataSet.get(position).getTitle();
+                break;
+            case SortOrder.AlbumSortOrder.ALBUM_ARTIST:
+                sectionName = dataSet.get(position).getArtistName();
+                break;
+            case SortOrder.AlbumSortOrder.ALBUM_YEAR:
+                sectionName = Integer.toString(dataSet.get(position).getYear());
+                break;
+        }
+
+        return MusicUtil.getSectionName(sectionName);
     }
 
     public class ViewHolder extends MediaEntryViewHolder {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
index 89c69df9..1d89aee6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
@@ -19,12 +19,14 @@ import com.kabouzeid.gramophone.adapter.base.AbsMultiSelectAdapter;
 import com.kabouzeid.gramophone.adapter.base.MediaEntryViewHolder;
 import com.kabouzeid.gramophone.glide.ArtistGlideRequest;
 import com.kabouzeid.gramophone.glide.PhonographColoredTarget;
+import com.kabouzeid.gramophone.helper.SortOrder;
 import com.kabouzeid.gramophone.helper.menu.SongsMenuHelper;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.model.Artist;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
+import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
 import java.util.ArrayList;
@@ -173,7 +175,15 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
     @NonNull
     @Override
     public String getSectionName(int position) {
-        return MusicUtil.getSectionName(dataSet.get(position).getName());
+        @Nullable String sectionName = null;
+        switch (PreferenceUtil.getInstance(activity).getArtistSortOrder()) {
+            case SortOrder.ArtistSortOrder.ARTIST_A_Z:
+            case SortOrder.ArtistSortOrder.ARTIST_Z_A:
+                sectionName = dataSet.get(position).getName();
+                break;
+        }
+
+        return MusicUtil.getSectionName(sectionName);
     }
 
     public class ViewHolder extends MediaEntryViewHolder {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
index ea109446..d117b07c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
@@ -21,12 +21,14 @@ import com.kabouzeid.gramophone.adapter.base.MediaEntryViewHolder;
 import com.kabouzeid.gramophone.glide.PhonographColoredTarget;
 import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
+import com.kabouzeid.gramophone.helper.SortOrder;
 import com.kabouzeid.gramophone.helper.menu.SongMenuHelper;
 import com.kabouzeid.gramophone.helper.menu.SongsMenuHelper;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.NavigationUtil;
+import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
 import java.util.ArrayList;
@@ -184,7 +186,29 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
     @NonNull
     @Override
     public String getSectionName(int position) {
-        return showSectionName ? MusicUtil.getSectionName(dataSet.get(position).title) : "";
+        if (!showSectionName) {
+            return "";
+        }
+
+//        @Nullable String sectionName = null;
+//        switch (PreferenceUtil.getInstance(activity).getSongSortOrder()) {
+//            case SortOrder.SongSortOrder.SONG_A_Z:
+//            case SortOrder.SongSortOrder.SONG_Z_A:
+//                sectionName = dataSet.get(position).title;
+//                break;
+//            case SortOrder.SongSortOrder.SONG_ALBUM:
+//                sectionName = dataSet.get(position).albumName;
+//                break;
+//            case SortOrder.SongSortOrder.SONG_ARTIST:
+//                sectionName = dataSet.get(position).artistName;
+//                break;
+//            case SortOrder.SongSortOrder.SONG_YEAR:
+//                sectionName = Integer.toString(dataSet.get(position).year);
+//                break;
+//        }
+
+        String sectionName = dataSet.get(position).title;
+        return MusicUtil.getSectionName(sectionName);
     }
 
     public class ViewHolder extends MediaEntryViewHolder {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java b/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
index ae805959..9736c206 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
@@ -60,7 +60,7 @@ public final class SortOrder {
                 + " DESC";
 
         /* Album sort order artist */
-        String ALBUM_ARTIST = MediaStore.Audio.Albums.ARTIST;
+        String ALBUM_ARTIST = MediaStore.Audio.Artists.DEFAULT_SORT_ORDER;
 
         /* Album sort order year */
         String ALBUM_YEAR = MediaStore.Audio.Albums.FIRST_YEAR + " DESC";
@@ -78,10 +78,10 @@ public final class SortOrder {
         String SONG_Z_A = SONG_A_Z + " DESC";
 
         /* Song sort order artist */
-        String SONG_ARTIST = MediaStore.Audio.Media.ARTIST;
+        String SONG_ARTIST = MediaStore.Audio.Artists.DEFAULT_SORT_ORDER;
 
         /* Song sort order album */
-        String SONG_ALBUM = MediaStore.Audio.Media.ALBUM;
+        String SONG_ALBUM = MediaStore.Audio.Albums.DEFAULT_SORT_ORDER;
 
         /* Song sort order year */
         String SONG_YEAR = MediaStore.Audio.Media.YEAR + " DESC";

From 32da438ac41e8762e0b7f74806fcea00c4d9fb06 Mon Sep 17 00:00:00 2001
From: Nicholas Narsing <soren121@sorenstudios.com>
Date: Sat, 28 Apr 2018 02:07:52 -0400
Subject: [PATCH 2/8] Add sort order menu for artist & album

---
 .../mainactivity/library/LibraryFragment.java | 57 +++++++++++++++++++
 ...gerRecyclerViewCustomGridSizeFragment.java | 17 ++++++
 .../library/pager/AlbumsFragment.java         | 12 ++++
 .../library/pager/ArtistsFragment.java        | 12 ++++
 .../library/pager/SongsFragment.java          | 10 ++++
 .../gramophone/util/PreferenceUtil.java       | 12 ++++
 app/src/main/res/menu/menu_main.xml           |  7 +++
 app/src/main/res/values/ids.xml               |  6 ++
 app/src/main/res/values/strings.xml           |  5 ++
 9 files changed, 138 insertions(+)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
index 4ca97716..572c2bed 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
@@ -29,6 +29,7 @@ import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.adapter.MusicLibraryPagerAdapter;
 import com.kabouzeid.gramophone.dialogs.CreatePlaylistDialog;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
+import com.kabouzeid.gramophone.helper.SortOrder;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.loader.SongLoader;
 import com.kabouzeid.gramophone.ui.activities.MainActivity;
@@ -36,6 +37,8 @@ import com.kabouzeid.gramophone.ui.activities.SearchActivity;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.AbsMainActivityFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment;
+import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment;
+import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.kabouzeid.gramophone.util.Util;
@@ -197,6 +200,23 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
 
             menu.findItem(R.id.action_colored_footers).setChecked(absLibraryRecyclerViewCustomGridSizeFragment.usePalette());
             menu.findItem(R.id.action_colored_footers).setEnabled(absLibraryRecyclerViewCustomGridSizeFragment.canUsePalette());
+
+            if (currentFragment instanceof AlbumsFragment) {
+                SubMenu sortOrderMenu = menu.findItem(R.id.action_sort_order).getSubMenu();
+                String currentSortOrder = absLibraryRecyclerViewCustomGridSizeFragment.getSortOrder();
+                sortOrderMenu.clear();
+                sortOrderMenu.add(0, R.id.action_album_sort_asc, 0, R.string.sort_a_z).setChecked(currentSortOrder == SortOrder.AlbumSortOrder.ALBUM_A_Z);
+                sortOrderMenu.add(0, R.id.action_album_sort_desc, 1, R.string.sort_z_a).setChecked(currentSortOrder == SortOrder.AlbumSortOrder.ALBUM_Z_A);
+                sortOrderMenu.add(0, R.id.action_album_sort_artist, 2, R.string.sort_artist).setChecked(currentSortOrder == SortOrder.AlbumSortOrder.ALBUM_ARTIST);
+                sortOrderMenu.setGroupCheckable(0, true, true);
+            } else if (currentFragment instanceof ArtistsFragment) {
+                SubMenu sortOrderMenu = menu.findItem(R.id.action_sort_order).getSubMenu();
+                String currentSortOrder = absLibraryRecyclerViewCustomGridSizeFragment.getSortOrder();
+                sortOrderMenu.clear();
+                sortOrderMenu.add(0, R.id.action_artist_sort_asc, 0, R.string.sort_a_z).setChecked(currentSortOrder == SortOrder.ArtistSortOrder.ARTIST_A_Z);
+                sortOrderMenu.add(0, R.id.action_artist_sort_desc, 1, R.string.sort_z_a).setChecked(currentSortOrder == SortOrder.ArtistSortOrder.ARTIST_Z_A);
+                sortOrderMenu.setGroupCheckable(0, true, true);
+            }
         } else {
             menu.removeItem(R.id.action_grid_size);
             menu.removeItem(R.id.action_colored_footers);
@@ -228,6 +248,9 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
             if (handleGridSizeMenuItem(absLibraryRecyclerViewCustomGridSizeFragment, item)) {
                 return true;
             }
+            if (handleSortOrderMenuItem(absLibraryRecyclerViewCustomGridSizeFragment, item)) {
+                return true;
+            }
         }
 
         int id = item.getItemId();
@@ -330,6 +353,40 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         return false;
     }
 
+    private boolean handleSortOrderMenuItem(@NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, @NonNull MenuItem item) {
+        String sortOrder = null;
+        if (fragment instanceof AlbumsFragment) {
+            switch (item.getItemId()) {
+                case R.id.action_album_sort_asc:
+                    sortOrder = SortOrder.AlbumSortOrder.ALBUM_A_Z;
+                    break;
+                case R.id.action_album_sort_desc:
+                    sortOrder = SortOrder.AlbumSortOrder.ALBUM_Z_A;
+                    break;
+                case R.id.action_album_sort_artist:
+                    sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST;
+                    break;
+            }
+        } else if (fragment instanceof ArtistsFragment) {
+            switch (item.getItemId()) {
+                case R.id.action_artist_sort_asc:
+                    sortOrder = SortOrder.ArtistSortOrder.ARTIST_A_Z;
+                    break;
+                case R.id.action_artist_sort_desc:
+                    sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A;
+                    break;
+            }
+        }
+
+        if (sortOrder != null) {
+            item.setChecked(true);
+            fragment.setAndSaveSortOrder(sortOrder);
+            return true;
+        }
+
+        return false;
+    }
+
     @Override
     public boolean handleBackPress() {
         if (cab != null && cab.isActive()) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
index 17261755..95078f46 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
@@ -14,6 +14,7 @@ import com.kabouzeid.gramophone.util.Util;
  */
 public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extends RecyclerView.Adapter, LM extends RecyclerView.LayoutManager> extends AbsLibraryPagerRecyclerViewFragment<A, LM> {
     private int gridSize;
+    private String sortOrder;
 
     private boolean usePaletteInitialized;
     private boolean usePalette;
@@ -49,6 +50,13 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
         return usePalette;
     }
 
+    public final String getSortOrder() {
+        if (sortOrder == null) {
+            sortOrder = loadSortOrder();
+        }
+        return sortOrder;
+    }
+
     public void setAndSaveGridSize(final int gridSize) {
         int oldLayoutRes = getItemLayoutRes();
         this.gridSize = gridSize;
@@ -72,6 +80,11 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
         setUsePalette(usePalette);
     }
 
+    public void setAndSaveSortOrder(final String sortOrder) {
+        this.sortOrder = sortOrder;
+        saveSortOrder(sortOrder);
+    }
+
     /**
      * @return whether the palette option should be available for the current item layout or not
      */
@@ -132,6 +145,10 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
 
     protected abstract void setGridSize(int gridSize);
 
+    protected abstract String loadSortOrder();
+
+    protected abstract void saveSortOrder(String sortOrder);
+
     protected int getMaxGridSizeForList() {
         if (isLandscape()) {
             return getActivity().getResources().getInteger(R.integer.default_list_columns_land);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
index 0837e08d..1f5aa317 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
@@ -55,6 +55,18 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
         return R.string.no_albums;
     }
 
+    @Override
+    protected String loadSortOrder() {
+        return PreferenceUtil.getInstance(getActivity()).getAlbumSortOrder();
+    }
+
+    @Override
+    protected void saveSortOrder(String sortOrder) {
+        PreferenceUtil.getInstance(getActivity()).setAlbumSortOrder(sortOrder);
+        onMediaStoreChanged();
+        getAdapter().notifyDataSetChanged();
+    }
+
     @Override
     public boolean loadUsePalette() {
         return PreferenceUtil.getInstance(getActivity()).albumColoredFooters();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
index b4dbc956..f719758c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
@@ -62,6 +62,18 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
         getLoaderManager().restartLoader(LOADER_ID, null, this);
     }
 
+    @Override
+    protected String loadSortOrder() {
+        return PreferenceUtil.getInstance(getActivity()).getArtistSortOrder();
+    }
+
+    @Override
+    protected void saveSortOrder(String sortOrder) {
+        PreferenceUtil.getInstance(getActivity()).setArtistSortOrder(sortOrder);
+        onMediaStoreChanged();
+        getAdapter().notifyDataSetChanged();
+    }
+
     @Override
     protected int loadGridSize() {
         return PreferenceUtil.getInstance(getActivity()).getArtistGridSize(getActivity());
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
index 0b9e3023..295d97f6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
@@ -73,6 +73,16 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
         getLoaderManager().restartLoader(LOADER_ID, null, this);
     }
 
+    @Override
+    protected String loadSortOrder() {
+        return PreferenceUtil.getInstance(getActivity()).getSongSortOrder();
+    }
+
+    @Override
+    protected void saveSortOrder(String sortOrder) {
+        //PreferenceUtil.getInstance(getActivity()).setSongSortOrder(sortOrder);
+    }
+
     @Override
     protected int loadGridSize() {
         return PreferenceUtil.getInstance(getActivity()).getSongGridSize(getActivity());
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
index f3109a70..258e12cc 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
@@ -222,6 +222,12 @@ public final class PreferenceUtil {
         return mPreferences.getString(ARTIST_SORT_ORDER, SortOrder.ArtistSortOrder.ARTIST_A_Z);
     }
 
+    public void setArtistSortOrder(final String sortOrder) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(ARTIST_SORT_ORDER, sortOrder);
+        editor.apply();
+    }
+
     public final String getArtistSongSortOrder() {
         return mPreferences.getString(ARTIST_SONG_SORT_ORDER, SortOrder.ArtistSongSortOrder.SONG_A_Z);
     }
@@ -234,6 +240,12 @@ public final class PreferenceUtil {
         return mPreferences.getString(ALBUM_SORT_ORDER, SortOrder.AlbumSortOrder.ALBUM_A_Z);
     }
 
+    public void setAlbumSortOrder(final String sortOrder) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(ALBUM_SORT_ORDER, sortOrder);
+        editor.apply();
+    }
+
     public final String getAlbumSongSortOrder() {
         return mPreferences.getString(ALBUM_SONG_SORT_ORDER, SortOrder.AlbumSongSortOrder.SONG_TRACK_LIST);
     }
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 86a9051d..39396fdf 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -50,6 +50,13 @@
         </menu>
     </item>
 
+    <item
+        android:id="@+id/action_sort_order"
+        android:title="@string/action_sort">
+        <menu>
+        </menu>
+    </item>
+
     <item
         android:id="@+id/action_colored_footers"
         android:checkable="true"
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 6ac8ad2b..b1a163af 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -2,4 +2,10 @@
 <resources>
     <item name="action_new_playlist" type="id" />
     <item name="action_show_lyrics" type="id" />
+
+    <item name="action_album_sort_asc" type="id" />
+    <item name="action_album_sort_desc" type="id" />
+    <item name="action_album_sort_artist" type="id" />
+    <item name="action_artist_sort_asc" type="id" />
+    <item name="action_artist_sort_desc" type="id" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08b52471..789952f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -294,4 +294,9 @@
     <string name="library_categories">Library categories</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
+    <string name="action_sort">Sort order</string>
+    <string name="sort_a_z">Ascending</string>
+    <string name="sort_z_a">Descending</string>
+    <string name="sort_artist">Artist</string>
+    <string name="sort_album">Album</string>
 </resources>

From 3b62a4578f208fb4f1af0bc6570d0035b0f9008d Mon Sep 17 00:00:00 2001
From: Nicholas Narsing <soren121@sorenstudios.com>
Date: Sat, 28 Apr 2018 11:07:05 -0400
Subject: [PATCH 3/8] Change album,artist sort; fix menu selection bug

---
 .../gramophone/helper/SortOrder.java          |  3 +-
 .../mainactivity/library/LibraryFragment.java | 39 +++++++++++--------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java b/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
index 9736c206..6226ae24 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
@@ -60,7 +60,8 @@ public final class SortOrder {
                 + " DESC";
 
         /* Album sort order artist */
-        String ALBUM_ARTIST = MediaStore.Audio.Artists.DEFAULT_SORT_ORDER;
+        String ALBUM_ARTIST = MediaStore.Audio.Artists.DEFAULT_SORT_ORDER
+                + ", " + MediaStore.Audio.Albums.DEFAULT_SORT_ORDER;
 
         /* Album sort order year */
         String ALBUM_YEAR = MediaStore.Audio.Albums.FIRST_YEAR + " DESC";
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
index 572c2bed..45d22e65 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
@@ -201,25 +201,11 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
             menu.findItem(R.id.action_colored_footers).setChecked(absLibraryRecyclerViewCustomGridSizeFragment.usePalette());
             menu.findItem(R.id.action_colored_footers).setEnabled(absLibraryRecyclerViewCustomGridSizeFragment.canUsePalette());
 
-            if (currentFragment instanceof AlbumsFragment) {
-                SubMenu sortOrderMenu = menu.findItem(R.id.action_sort_order).getSubMenu();
-                String currentSortOrder = absLibraryRecyclerViewCustomGridSizeFragment.getSortOrder();
-                sortOrderMenu.clear();
-                sortOrderMenu.add(0, R.id.action_album_sort_asc, 0, R.string.sort_a_z).setChecked(currentSortOrder == SortOrder.AlbumSortOrder.ALBUM_A_Z);
-                sortOrderMenu.add(0, R.id.action_album_sort_desc, 1, R.string.sort_z_a).setChecked(currentSortOrder == SortOrder.AlbumSortOrder.ALBUM_Z_A);
-                sortOrderMenu.add(0, R.id.action_album_sort_artist, 2, R.string.sort_artist).setChecked(currentSortOrder == SortOrder.AlbumSortOrder.ALBUM_ARTIST);
-                sortOrderMenu.setGroupCheckable(0, true, true);
-            } else if (currentFragment instanceof ArtistsFragment) {
-                SubMenu sortOrderMenu = menu.findItem(R.id.action_sort_order).getSubMenu();
-                String currentSortOrder = absLibraryRecyclerViewCustomGridSizeFragment.getSortOrder();
-                sortOrderMenu.clear();
-                sortOrderMenu.add(0, R.id.action_artist_sort_asc, 0, R.string.sort_a_z).setChecked(currentSortOrder == SortOrder.ArtistSortOrder.ARTIST_A_Z);
-                sortOrderMenu.add(0, R.id.action_artist_sort_desc, 1, R.string.sort_z_a).setChecked(currentSortOrder == SortOrder.ArtistSortOrder.ARTIST_Z_A);
-                sortOrderMenu.setGroupCheckable(0, true, true);
-            }
+            setUpSortOrderMenu(absLibraryRecyclerViewCustomGridSizeFragment, menu.findItem(R.id.action_sort_order).getSubMenu());
         } else {
             menu.removeItem(R.id.action_grid_size);
             menu.removeItem(R.id.action_colored_footers);
+            menu.removeItem(R.id.action_sort_order);
         }
         Activity activity = getActivity();
         if (activity == null) return;
@@ -353,6 +339,27 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         return false;
     }
 
+    private void setUpSortOrderMenu(@NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, @NonNull SubMenu sortOrderMenu) {
+        String currentSortOrder = fragment.getSortOrder();
+        sortOrderMenu.clear();
+
+        if (fragment instanceof AlbumsFragment) {
+            sortOrderMenu.add(0, R.id.action_album_sort_asc, 0, R.string.sort_a_z)
+                    .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_A_Z));
+            sortOrderMenu.add(0, R.id.action_album_sort_desc, 1, R.string.sort_z_a)
+                    .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_Z_A));
+            sortOrderMenu.add(0, R.id.action_album_sort_artist, 2, R.string.sort_artist)
+                    .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_ARTIST));
+        } else if (fragment instanceof ArtistsFragment) {
+            sortOrderMenu.add(0, R.id.action_artist_sort_asc, 0, R.string.sort_a_z)
+                    .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_A_Z));
+            sortOrderMenu.add(0, R.id.action_artist_sort_desc, 1, R.string.sort_z_a)
+                    .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_Z_A));
+        }
+
+        sortOrderMenu.setGroupCheckable(0, true, true);
+    }
+
     private boolean handleSortOrderMenuItem(@NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment, @NonNull MenuItem item) {
         String sortOrder = null;
         if (fragment instanceof AlbumsFragment) {

From 60cb868beb1803e2ecb80a815a4659249ef311cc Mon Sep 17 00:00:00 2001
From: Nicholas Narsing <soren121@sorenstudios.com>
Date: Sat, 28 Apr 2018 11:47:05 -0400
Subject: [PATCH 4/8] Support song ordering; add/fix album year sort

---
 .../adapter/album/AlbumAdapter.java           |  3 +-
 .../gramophone/adapter/song/SongAdapter.java  | 32 ++++++++---------
 .../gramophone/helper/SortOrder.java          |  3 +-
 .../mainactivity/library/LibraryFragment.java | 35 +++++++++++++++++++
 .../library/pager/SongsFragment.java          |  4 ++-
 .../gramophone/util/PreferenceUtil.java       |  6 ++++
 app/src/main/res/values/ids.xml               |  6 ++++
 app/src/main/res/values/strings.xml           |  1 +
 8 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
index eefbbe7a..8fc86c44 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
@@ -198,8 +198,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
                 sectionName = dataSet.get(position).getArtistName();
                 break;
             case SortOrder.AlbumSortOrder.ALBUM_YEAR:
-                sectionName = Integer.toString(dataSet.get(position).getYear());
-                break;
+                return Integer.toString(dataSet.get(position).getYear());
         }
 
         return MusicUtil.getSectionName(sectionName);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
index d117b07c..1faa6f07 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
@@ -190,24 +190,22 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
             return "";
         }
 
-//        @Nullable String sectionName = null;
-//        switch (PreferenceUtil.getInstance(activity).getSongSortOrder()) {
-//            case SortOrder.SongSortOrder.SONG_A_Z:
-//            case SortOrder.SongSortOrder.SONG_Z_A:
-//                sectionName = dataSet.get(position).title;
-//                break;
-//            case SortOrder.SongSortOrder.SONG_ALBUM:
-//                sectionName = dataSet.get(position).albumName;
-//                break;
-//            case SortOrder.SongSortOrder.SONG_ARTIST:
-//                sectionName = dataSet.get(position).artistName;
-//                break;
-//            case SortOrder.SongSortOrder.SONG_YEAR:
-//                sectionName = Integer.toString(dataSet.get(position).year);
-//                break;
-//        }
+        @Nullable String sectionName = null;
+        switch (PreferenceUtil.getInstance(activity).getSongSortOrder()) {
+            case SortOrder.SongSortOrder.SONG_A_Z:
+            case SortOrder.SongSortOrder.SONG_Z_A:
+                sectionName = dataSet.get(position).title;
+                break;
+            case SortOrder.SongSortOrder.SONG_ALBUM:
+                sectionName = dataSet.get(position).albumName;
+                break;
+            case SortOrder.SongSortOrder.SONG_ARTIST:
+                sectionName = dataSet.get(position).artistName;
+                break;
+            case SortOrder.SongSortOrder.SONG_YEAR:
+                return Integer.toString(dataSet.get(position).year);
+        }
 
-        String sectionName = dataSet.get(position).title;
         return MusicUtil.getSectionName(sectionName);
     }
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java b/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
index 6226ae24..89e750e2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/SortOrder.java
@@ -64,8 +64,7 @@ public final class SortOrder {
                 + ", " + MediaStore.Audio.Albums.DEFAULT_SORT_ORDER;
 
         /* Album sort order year */
-        String ALBUM_YEAR = MediaStore.Audio.Albums.FIRST_YEAR + " DESC";
-
+        String ALBUM_YEAR = MediaStore.Audio.Media.YEAR + " DESC";
     }
 
     /**
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
index 45d22e65..ec8b42a9 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
@@ -39,6 +39,7 @@ import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AbsLibra
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment;
+import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.SongsFragment;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.kabouzeid.gramophone.util.Util;
@@ -350,11 +351,24 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_Z_A));
             sortOrderMenu.add(0, R.id.action_album_sort_artist, 2, R.string.sort_artist)
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_ARTIST));
+            sortOrderMenu.add(0, R.id.action_album_sort_year, 3, R.string.sort_year)
+                    .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_YEAR));
         } else if (fragment instanceof ArtistsFragment) {
             sortOrderMenu.add(0, R.id.action_artist_sort_asc, 0, R.string.sort_a_z)
                     .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_A_Z));
             sortOrderMenu.add(0, R.id.action_artist_sort_desc, 1, R.string.sort_z_a)
                     .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_Z_A));
+        } else if (fragment instanceof SongsFragment) {
+            sortOrderMenu.add(0, R.id.action_song_sort_asc, 0, R.string.sort_a_z)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_A_Z));
+            sortOrderMenu.add(0, R.id.action_song_sort_desc, 1, R.string.sort_z_a)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_Z_A));
+            sortOrderMenu.add(0, R.id.action_song_sort_artist, 2, R.string.sort_artist)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ARTIST));
+            sortOrderMenu.add(0, R.id.action_song_sort_album, 3, R.string.sort_album)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ALBUM));
+            sortOrderMenu.add(0, R.id.action_song_sort_year, 4, R.string.sort_year)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_YEAR));
         }
 
         sortOrderMenu.setGroupCheckable(0, true, true);
@@ -373,6 +387,9 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                 case R.id.action_album_sort_artist:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST;
                     break;
+                case R.id.action_album_sort_year:
+                    sortOrder = SortOrder.AlbumSortOrder.ALBUM_YEAR;
+                    break;
             }
         } else if (fragment instanceof ArtistsFragment) {
             switch (item.getItemId()) {
@@ -383,6 +400,24 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                     sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A;
                     break;
             }
+        } else if (fragment instanceof SongsFragment) {
+            switch (item.getItemId()) {
+                case R.id.action_song_sort_asc:
+                    sortOrder = SortOrder.SongSortOrder.SONG_A_Z;
+                    break;
+                case R.id.action_song_sort_desc:
+                    sortOrder = SortOrder.SongSortOrder.SONG_Z_A;
+                    break;
+                case R.id.action_song_sort_artist:
+                    sortOrder = SortOrder.SongSortOrder.SONG_ARTIST;
+                    break;
+                case R.id.action_song_sort_album:
+                    sortOrder = SortOrder.SongSortOrder.SONG_ALBUM;
+                    break;
+                case R.id.action_song_sort_year:
+                    sortOrder = SortOrder.SongSortOrder.SONG_YEAR;
+                    break;
+            }
         }
 
         if (sortOrder != null) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
index 295d97f6..63f1a6bd 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
@@ -80,7 +80,9 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
 
     @Override
     protected void saveSortOrder(String sortOrder) {
-        //PreferenceUtil.getInstance(getActivity()).setSongSortOrder(sortOrder);
+        PreferenceUtil.getInstance(getActivity()).setSongSortOrder(sortOrder);
+        onMediaStoreChanged();
+        getAdapter().notifyDataSetChanged();
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
index 258e12cc..b00ff57b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
@@ -254,6 +254,12 @@ public final class PreferenceUtil {
         return mPreferences.getString(SONG_SORT_ORDER, SortOrder.SongSortOrder.SONG_A_Z);
     }
 
+    public void setSongSortOrder(final String sortOrder) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(SONG_SORT_ORDER, sortOrder);
+        editor.apply();
+    }
+
     public final String getGenreSortOrder() {
         return mPreferences.getString(GENRE_SORT_ORDER, SortOrder.GenreSortOrder.GENRE_A_Z);
     }
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index b1a163af..ce45f3f7 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -6,6 +6,12 @@
     <item name="action_album_sort_asc" type="id" />
     <item name="action_album_sort_desc" type="id" />
     <item name="action_album_sort_artist" type="id" />
+    <item name="action_album_sort_year" type="id" />
     <item name="action_artist_sort_asc" type="id" />
     <item name="action_artist_sort_desc" type="id" />
+    <item name="action_song_sort_asc" type="id" />
+    <item name="action_song_sort_desc" type="id" />
+    <item name="action_song_sort_artist" type="id" />
+    <item name="action_song_sort_album" type="id" />
+    <item name="action_song_sort_year" type="id" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 789952f1..727ab34e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -299,4 +299,5 @@
     <string name="sort_z_a">Descending</string>
     <string name="sort_artist">Artist</string>
     <string name="sort_album">Album</string>
+    <string name="sort_year">Year</string>
 </resources>

From 83c9e941adb7dd386bfdd13d5e21eb7b052896f7 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sun, 29 Apr 2018 22:39:27 +0200
Subject: [PATCH 5/8] Rename string identifier

---
 app/src/main/res/menu/menu_main.xml | 2 +-
 app/src/main/res/values/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 39396fdf..0f41b280 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -52,7 +52,7 @@
 
     <item
         android:id="@+id/action_sort_order"
-        android:title="@string/action_sort">
+        android:title="@string/action_sort_order">
         <menu>
         </menu>
     </item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3e7bbe41..6696f524 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -295,7 +295,7 @@
     <string name="library_categories">Library categories</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="action_sort">Sort order</string>
+    <string name="action_sort_order">Sort order</string>
     <string name="sort_a_z">Ascending</string>
     <string name="sort_z_a">Descending</string>
     <string name="sort_artist">Artist</string>

From 2fe07913ac85d3f1a1c1207ce12f069b16db2e62 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sun, 29 Apr 2018 23:19:50 +0200
Subject: [PATCH 6/8] Refactoring of some names

---
 .../mainactivity/library/LibraryFragment.java | 46 +++++++++----------
 ...gerRecyclerViewCustomGridSizeFragment.java |  3 ++
 .../library/pager/AlbumsFragment.java         |  7 ++-
 .../library/pager/ArtistsFragment.java        |  7 ++-
 .../library/pager/SongsFragment.java          |  7 ++-
 .../gramophone/util/PreferenceUtil.java       |  6 +--
 app/src/main/res/values/ids.xml               | 22 ++++-----
 app/src/main/res/values/strings.xml           | 10 ++--
 8 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
index ec8b42a9..6991be37 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
@@ -36,9 +36,9 @@ import com.kabouzeid.gramophone.ui.activities.MainActivity;
 import com.kabouzeid.gramophone.ui.activities.SearchActivity;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.AbsMainActivityFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
-import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment;
+import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.PlaylistsFragment;
 import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.SongsFragment;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
@@ -345,29 +345,29 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         sortOrderMenu.clear();
 
         if (fragment instanceof AlbumsFragment) {
-            sortOrderMenu.add(0, R.id.action_album_sort_asc, 0, R.string.sort_a_z)
+            sortOrderMenu.add(0, R.id.action_album_sort_order_asc, 0, R.string.sort_order_a_z)
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_A_Z));
-            sortOrderMenu.add(0, R.id.action_album_sort_desc, 1, R.string.sort_z_a)
+            sortOrderMenu.add(0, R.id.action_album_sort_order_desc, 1, R.string.sort_order_z_a)
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_Z_A));
-            sortOrderMenu.add(0, R.id.action_album_sort_artist, 2, R.string.sort_artist)
+            sortOrderMenu.add(0, R.id.action_album_sort_order_artist, 2, R.string.sort_order_artist)
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_ARTIST));
-            sortOrderMenu.add(0, R.id.action_album_sort_year, 3, R.string.sort_year)
+            sortOrderMenu.add(0, R.id.action_album_sort_order_year, 3, R.string.sort_order_year)
                     .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_YEAR));
         } else if (fragment instanceof ArtistsFragment) {
-            sortOrderMenu.add(0, R.id.action_artist_sort_asc, 0, R.string.sort_a_z)
+            sortOrderMenu.add(0, R.id.action_artist_sort_order_asc, 0, R.string.sort_order_a_z)
                     .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_A_Z));
-            sortOrderMenu.add(0, R.id.action_artist_sort_desc, 1, R.string.sort_z_a)
+            sortOrderMenu.add(0, R.id.action_artist_sort_order_desc, 1, R.string.sort_order_z_a)
                     .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_Z_A));
         } else if (fragment instanceof SongsFragment) {
-            sortOrderMenu.add(0, R.id.action_song_sort_asc, 0, R.string.sort_a_z)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_asc, 0, R.string.sort_order_a_z)
                     .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_A_Z));
-            sortOrderMenu.add(0, R.id.action_song_sort_desc, 1, R.string.sort_z_a)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_desc, 1, R.string.sort_order_z_a)
                     .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_Z_A));
-            sortOrderMenu.add(0, R.id.action_song_sort_artist, 2, R.string.sort_artist)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_artist, 2, R.string.sort_order_artist)
                     .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ARTIST));
-            sortOrderMenu.add(0, R.id.action_song_sort_album, 3, R.string.sort_album)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_album, 3, R.string.sort_order_album)
                     .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ALBUM));
-            sortOrderMenu.add(0, R.id.action_song_sort_year, 4, R.string.sort_year)
+            sortOrderMenu.add(0, R.id.action_song_sort_order_year, 4, R.string.sort_order_year)
                     .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_YEAR));
         }
 
@@ -378,43 +378,43 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         String sortOrder = null;
         if (fragment instanceof AlbumsFragment) {
             switch (item.getItemId()) {
-                case R.id.action_album_sort_asc:
+                case R.id.action_album_sort_order_asc:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_A_Z;
                     break;
-                case R.id.action_album_sort_desc:
+                case R.id.action_album_sort_order_desc:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_Z_A;
                     break;
-                case R.id.action_album_sort_artist:
+                case R.id.action_album_sort_order_artist:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST;
                     break;
-                case R.id.action_album_sort_year:
+                case R.id.action_album_sort_order_year:
                     sortOrder = SortOrder.AlbumSortOrder.ALBUM_YEAR;
                     break;
             }
         } else if (fragment instanceof ArtistsFragment) {
             switch (item.getItemId()) {
-                case R.id.action_artist_sort_asc:
+                case R.id.action_artist_sort_order_asc:
                     sortOrder = SortOrder.ArtistSortOrder.ARTIST_A_Z;
                     break;
-                case R.id.action_artist_sort_desc:
+                case R.id.action_artist_sort_order_desc:
                     sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A;
                     break;
             }
         } else if (fragment instanceof SongsFragment) {
             switch (item.getItemId()) {
-                case R.id.action_song_sort_asc:
+                case R.id.action_song_sort_order_asc:
                     sortOrder = SortOrder.SongSortOrder.SONG_A_Z;
                     break;
-                case R.id.action_song_sort_desc:
+                case R.id.action_song_sort_order_desc:
                     sortOrder = SortOrder.SongSortOrder.SONG_Z_A;
                     break;
-                case R.id.action_song_sort_artist:
+                case R.id.action_song_sort_order_artist:
                     sortOrder = SortOrder.SongSortOrder.SONG_ARTIST;
                     break;
-                case R.id.action_song_sort_album:
+                case R.id.action_song_sort_order_album:
                     sortOrder = SortOrder.SongSortOrder.SONG_ALBUM;
                     break;
-                case R.id.action_song_sort_year:
+                case R.id.action_song_sort_order_year:
                     sortOrder = SortOrder.SongSortOrder.SONG_YEAR;
                     break;
             }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
index 95078f46..a5b69d78 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
@@ -83,6 +83,7 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
     public void setAndSaveSortOrder(final String sortOrder) {
         this.sortOrder = sortOrder;
         saveSortOrder(sortOrder);
+        setSortOrder(sortOrder);
     }
 
     /**
@@ -149,6 +150,8 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
 
     protected abstract void saveSortOrder(String sortOrder);
 
+    protected abstract void setSortOrder(String sortOrder);
+
     protected int getMaxGridSizeForList() {
         if (isLandscape()) {
             return getActivity().getResources().getInteger(R.integer.default_list_columns_land);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
index 1f5aa317..5c5939a6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
@@ -63,8 +63,11 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
     @Override
     protected void saveSortOrder(String sortOrder) {
         PreferenceUtil.getInstance(getActivity()).setAlbumSortOrder(sortOrder);
-        onMediaStoreChanged();
-        getAdapter().notifyDataSetChanged();
+    }
+
+    @Override
+    protected void setSortOrder(String sortOrder) {
+        getLoaderManager().restartLoader(LOADER_ID, null, this);
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
index f719758c..06687d38 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
@@ -70,8 +70,11 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
     @Override
     protected void saveSortOrder(String sortOrder) {
         PreferenceUtil.getInstance(getActivity()).setArtistSortOrder(sortOrder);
-        onMediaStoreChanged();
-        getAdapter().notifyDataSetChanged();
+    }
+
+    @Override
+    protected void setSortOrder(String sortOrder) {
+        getLoaderManager().restartLoader(LOADER_ID, null, this);
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
index 63f1a6bd..076fe4f3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
@@ -81,8 +81,11 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
     @Override
     protected void saveSortOrder(String sortOrder) {
         PreferenceUtil.getInstance(getActivity()).setSongSortOrder(sortOrder);
-        onMediaStoreChanged();
-        getAdapter().notifyDataSetChanged();
+    }
+
+    @Override
+    protected void setSortOrder(String sortOrder) {
+        getLoaderManager().restartLoader(LOADER_ID, null, this);
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
index b00ff57b..5b85cbe7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
@@ -225,7 +225,7 @@ public final class PreferenceUtil {
     public void setArtistSortOrder(final String sortOrder) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putString(ARTIST_SORT_ORDER, sortOrder);
-        editor.apply();
+        editor.commit();
     }
 
     public final String getArtistSongSortOrder() {
@@ -243,7 +243,7 @@ public final class PreferenceUtil {
     public void setAlbumSortOrder(final String sortOrder) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putString(ALBUM_SORT_ORDER, sortOrder);
-        editor.apply();
+        editor.commit();
     }
 
     public final String getAlbumSongSortOrder() {
@@ -257,7 +257,7 @@ public final class PreferenceUtil {
     public void setSongSortOrder(final String sortOrder) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putString(SONG_SORT_ORDER, sortOrder);
-        editor.apply();
+        editor.commit();
     }
 
     public final String getGenreSortOrder() {
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index ce45f3f7..ef5fe97a 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -3,15 +3,15 @@
     <item name="action_new_playlist" type="id" />
     <item name="action_show_lyrics" type="id" />
 
-    <item name="action_album_sort_asc" type="id" />
-    <item name="action_album_sort_desc" type="id" />
-    <item name="action_album_sort_artist" type="id" />
-    <item name="action_album_sort_year" type="id" />
-    <item name="action_artist_sort_asc" type="id" />
-    <item name="action_artist_sort_desc" type="id" />
-    <item name="action_song_sort_asc" type="id" />
-    <item name="action_song_sort_desc" type="id" />
-    <item name="action_song_sort_artist" type="id" />
-    <item name="action_song_sort_album" type="id" />
-    <item name="action_song_sort_year" type="id" />
+    <item name="action_album_sort_order_asc" type="id" />
+    <item name="action_album_sort_order_desc" type="id" />
+    <item name="action_album_sort_order_artist" type="id" />
+    <item name="action_album_sort_order_year" type="id" />
+    <item name="action_artist_sort_order_asc" type="id" />
+    <item name="action_artist_sort_order_desc" type="id" />
+    <item name="action_song_sort_order_asc" type="id" />
+    <item name="action_song_sort_order_desc" type="id" />
+    <item name="action_song_sort_order_artist" type="id" />
+    <item name="action_song_sort_order_album" type="id" />
+    <item name="action_song_sort_order_year" type="id" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6696f524..a9cdfb07 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -296,9 +296,9 @@
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="action_sort_order">Sort order</string>
-    <string name="sort_a_z">Ascending</string>
-    <string name="sort_z_a">Descending</string>
-    <string name="sort_artist">Artist</string>
-    <string name="sort_album">Album</string>
-    <string name="sort_year">Year</string>
+    <string name="sort_order_a_z">Ascending</string>
+    <string name="sort_order_z_a">Descending</string>
+    <string name="sort_order_artist">Artist</string>
+    <string name="sort_order_album">Album</string>
+    <string name="sort_order_year">Year</string>
 </resources>

From be54afd38b2cda9fd4094c9d474743258efea347 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Mon, 30 Apr 2018 00:08:23 +0200
Subject: [PATCH 7/8] Fix track sorting bug

---
 .../kabouzeid/gramophone/loader/AlbumLoader.java    | 13 ++++++++++++-
 .../kabouzeid/gramophone/loader/ArtistLoader.java   |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java
index 89657a62..69669c99 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java
@@ -10,6 +10,8 @@ import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
@@ -45,7 +47,9 @@ public class AlbumLoader {
     @NonNull
     public static Album getAlbum(@NonNull final Context context, int albumId) {
         ArrayList<Song> songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, AudioColumns.ALBUM_ID + "=?", new String[]{String.valueOf(albumId)}, getSongLoaderSortOrder(context)));
-        return new Album(songs);
+        Album album = new Album(songs);
+        sortSongsByTrackNumber(album);
+        return album;
     }
 
     @NonNull
@@ -56,6 +60,9 @@ public class AlbumLoader {
                 getOrCreateAlbum(albums, song.albumId).songs.add(song);
             }
         }
+        for (Album album : albums) {
+            sortSongsByTrackNumber(album);
+        }
         return albums;
     }
 
@@ -69,4 +76,8 @@ public class AlbumLoader {
         albums.add(album);
         return album;
     }
+
+    private static void sortSongsByTrackNumber(Album album) {
+        Collections.sort(album.songs, (o1, o2) -> o1.trackNumber - o2.trackNumber);
+    }
 }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java
index 566c64f7..6c3ea062 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java
@@ -70,8 +70,8 @@ public class ArtistLoader {
                 return artist;
             }
         }
-        Artist album = new Artist();
-        artists.add(album);
-        return album;
+        Artist artist = new Artist();
+        artists.add(artist);
+        return artist;
     }
 }

From cd04a13896dcd4d0278f8303bc3a3135d7dcc6fe Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Mon, 30 Apr 2018 13:22:00 +0200
Subject: [PATCH 8/8] Remove unused import.

---
 .../main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java
index 69669c99..e47cb7f6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java
@@ -11,7 +11,6 @@ import com.kabouzeid.gramophone.util.PreferenceUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)