From fd2d1359ac2ecd6919396869a30f3229ae7c1a22 Mon Sep 17 00:00:00 2001
From: wbarnard <31840796+wbarnard@users.noreply.github.com>
Date: Thu, 11 Jul 2019 01:57:14 +0800
Subject: [PATCH] Add sort by year section thumb text (#659)

---
 .../kore/ui/RecyclerViewCursorAdapter.java    | 25 ++++++++++++++++++-
 .../ui/sections/audio/AlbumListFragment.java  | 20 ++++++++++++++-
 .../ui/sections/video/MovieListFragment.java  | 20 ++++++++++++++-
 .../ui/sections/video/TVShowListFragment.java | 20 ++++++++++++++-
 4 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java b/app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java
index a32abc9..0e73041 100644
--- a/app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java
+++ b/app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java
@@ -30,6 +30,11 @@ abstract public class RecyclerViewCursorAdapter
     private int rowIDColumn;
     protected Cursor cursor;
 
+    // Section types
+    public static final int SECTION_TYPE_ALPHANUMERIC = 0,
+            SECTION_TYPE_YEAR_INTEGER = 1,
+            SECTION_TYPE_DATE_STRING = 2;
+
     @Override
     public void onBindViewHolder(CursorViewHolder holder, int position) {
         if (!dataValid) {
@@ -71,7 +76,21 @@ abstract public class RecyclerViewCursorAdapter
             throw new IllegalStateException("Could not move cursor to position " + position);
         }
 
-        return cursor.getString(getSectionColumnIdx()).substring(0, 1).toUpperCase();
+        int sectionType = getSectionType();
+        int sectionColumnIdx = getSectionColumnIdx();
+        String sectionName = "";
+        if (sectionType == SECTION_TYPE_YEAR_INTEGER) {
+            sectionName = String.format("%02d", cursor.getInt(sectionColumnIdx) % 100);
+        } else if (sectionType == SECTION_TYPE_DATE_STRING) {
+            String dateStr = cursor.getString(sectionColumnIdx);
+            if (dateStr.length() >= 4) {
+                sectionName = dateStr.substring(2, 4);
+            }
+        } else {
+            sectionName = cursor.getString(sectionColumnIdx).substring(0, 1).toUpperCase();
+        }
+
+        return sectionName;
     }
 
     /**
@@ -82,6 +101,10 @@ abstract public class RecyclerViewCursorAdapter
      */
     abstract protected int getSectionColumnIdx();
 
+    protected int getSectionType() {
+        return SECTION_TYPE_ALPHANUMERIC;
+    }
+
     public void swapCursor(Cursor newCursor) {
         if (newCursor == cursor) {
             return;
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java
index 76096c5..592b627 100644
--- a/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java
@@ -333,7 +333,25 @@ public class AlbumListFragment extends AbstractCursorListFragment {
             }
         };
 
-        protected int getSectionColumnIdx() { return AlbumListQuery.TITLE; }
+        protected int getSectionColumnIdx() {
+            int sortOrder = PreferenceManager.getDefaultSharedPreferences(fragment.getContext())
+                    .getInt(Settings.KEY_PREF_ALBUMS_SORT_ORDER, Settings.DEFAULT_PREF_ALBUMS_SORT_ORDER);
+            if (sortOrder == Settings.SORT_BY_YEAR) {
+                return AlbumListQuery.YEAR;
+            } else {
+                return AlbumListQuery.TITLE;
+            }
+        }
+
+        protected int getSectionType() {
+            int sortOrder = PreferenceManager.getDefaultSharedPreferences(fragment.getContext())
+                    .getInt(Settings.KEY_PREF_ALBUMS_SORT_ORDER, Settings.DEFAULT_PREF_ALBUMS_SORT_ORDER);
+            if (sortOrder == Settings.SORT_BY_YEAR) {
+                return RecyclerViewCursorAdapter.SECTION_TYPE_YEAR_INTEGER;
+            } else {
+                return RecyclerViewCursorAdapter.SECTION_TYPE_ALPHANUMERIC;
+            }
+        }
     }
 
     /**
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
index a5dfa79..f1b5a7e 100644
--- a/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java
@@ -362,7 +362,25 @@ public class MovieListFragment extends AbstractCursorListFragment {
             return new ViewHolder(view, getContext(), themeAccentColor, dimmedNeutralColor, hostManager, artWidth, artHeight);
         }
 
-        protected int getSectionColumnIdx() { return MovieListQuery.TITLE; }
+        protected int getSectionColumnIdx() {
+            int sortOrder = PreferenceManager.getDefaultSharedPreferences(getContext())
+                    .getInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.DEFAULT_PREF_MOVIES_SORT_ORDER);
+            if (sortOrder == Settings.SORT_BY_YEAR) {
+                return MovieListQuery.YEAR;
+            } else {
+                return MovieListQuery.TITLE;
+            }
+        }
+
+        protected int getSectionType() {
+            int sortOrder = PreferenceManager.getDefaultSharedPreferences(getContext())
+                    .getInt(Settings.KEY_PREF_MOVIES_SORT_ORDER, Settings.DEFAULT_PREF_MOVIES_SORT_ORDER);
+            if (sortOrder == Settings.SORT_BY_YEAR) {
+                return RecyclerViewCursorAdapter.SECTION_TYPE_YEAR_INTEGER;
+            } else {
+                return RecyclerViewCursorAdapter.SECTION_TYPE_ALPHANUMERIC;
+            }
+        }
     }
 
     /**
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
index 39f0c49..a148bcd 100644
--- a/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java
@@ -354,7 +354,25 @@ public class TVShowListFragment extends AbstractCursorListFragment {
             return viewHolder;
         }
 
-        protected int getSectionColumnIdx() { return TVShowListQuery.TITLE; }
+        protected int getSectionColumnIdx() {
+            int sortOrder = PreferenceManager.getDefaultSharedPreferences(getContext())
+                    .getInt(Settings.KEY_PREF_TVSHOWS_SORT_ORDER, Settings.DEFAULT_PREF_TVSHOWS_SORT_ORDER);
+            if (sortOrder == Settings.SORT_BY_YEAR) {
+                return TVShowListQuery.PREMIERED;
+            } else {
+                return TVShowListQuery.TITLE;
+            }
+        }
+
+        protected int getSectionType() {
+            int sortOrder = PreferenceManager.getDefaultSharedPreferences(getContext())
+                    .getInt(Settings.KEY_PREF_TVSHOWS_SORT_ORDER, Settings.DEFAULT_PREF_TVSHOWS_SORT_ORDER);
+            if (sortOrder == Settings.SORT_BY_YEAR) {
+                return RecyclerViewCursorAdapter.SECTION_TYPE_DATE_STRING;
+            } else {
+                return RecyclerViewCursorAdapter.SECTION_TYPE_ALPHANUMERIC;
+            }
+        }
     }
 
     /**