From 518352f7a032b7a9673ac9b56e7feda21616680e Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sat, 29 Aug 2020 19:11:40 +0900
Subject: [PATCH] prepare for new library preference

---
 ...{LibraryPreference.java => CategoryPreference.java} | 10 +++++-----
 ...erenceDialog.java => CategoryPreferenceDialog.java} |  6 +++---
 .../gramophone/ui/activities/SettingsActivity.java     | 10 +++++-----
 .../com/dkanada/gramophone/util/PreferenceUtil.java    |  8 ++++----
 app/src/main/res/xml/pref_library.xml                  |  2 +-
 ...ref_now_playing_screen.xml => pref_now_playing.xml} |  0
 6 files changed, 18 insertions(+), 18 deletions(-)
 rename app/src/main/java/com/dkanada/gramophone/preferences/{LibraryPreference.java => CategoryPreference.java} (50%)
 rename app/src/main/java/com/dkanada/gramophone/preferences/{LibraryPreferenceDialog.java => CategoryPreferenceDialog.java} (94%)
 rename app/src/main/res/xml/{pref_now_playing_screen.xml => pref_now_playing.xml} (100%)

diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/LibraryPreference.java b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreference.java
similarity index 50%
rename from app/src/main/java/com/dkanada/gramophone/preferences/LibraryPreference.java
rename to app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreference.java
index a9ed5955..b9df08a5 100644
--- a/app/src/main/java/com/dkanada/gramophone/preferences/LibraryPreference.java
+++ b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreference.java
@@ -5,20 +5,20 @@ import android.util.AttributeSet;
 
 import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEDialogPreference;
 
-public class LibraryPreference extends ATEDialogPreference {
-    public LibraryPreference(Context context) {
+public class CategoryPreference extends ATEDialogPreference {
+    public CategoryPreference(Context context) {
         super(context);
     }
 
-    public LibraryPreference(Context context, AttributeSet attrs) {
+    public CategoryPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public LibraryPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    public CategoryPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
-    public LibraryPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public CategoryPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 }
diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/LibraryPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java
similarity index 94%
rename from app/src/main/java/com/dkanada/gramophone/preferences/LibraryPreferenceDialog.java
rename to app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java
index d221e76e..c6698db8 100644
--- a/app/src/main/java/com/dkanada/gramophone/preferences/LibraryPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java
@@ -17,9 +17,9 @@ import com.dkanada.gramophone.util.PreferenceUtil;
 import java.util.ArrayList;
 import java.util.List;
 
-public class LibraryPreferenceDialog extends DialogFragment {
-    public static LibraryPreferenceDialog newInstance() {
-        return new LibraryPreferenceDialog();
+public class CategoryPreferenceDialog extends DialogFragment {
+    public static CategoryPreferenceDialog newInstance() {
+        return new CategoryPreferenceDialog();
     }
 
     private CategoryInfoAdapter adapter;
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
index 7f62871b..170b84e6 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java
@@ -24,8 +24,8 @@ import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceFragment
 import com.kabouzeid.appthemehelper.util.ColorUtil;
 import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.shortcuts.DynamicShortcutManager;
-import com.dkanada.gramophone.preferences.LibraryPreference;
-import com.dkanada.gramophone.preferences.LibraryPreferenceDialog;
+import com.dkanada.gramophone.preferences.CategoryPreference;
+import com.dkanada.gramophone.preferences.CategoryPreferenceDialog;
 import com.dkanada.gramophone.preferences.NowPlayingScreenPreference;
 import com.dkanada.gramophone.preferences.NowPlayingScreenPreferenceDialog;
 import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
@@ -120,7 +120,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
             addPreferencesFromResource(R.xml.pref_library);
             addPreferencesFromResource(R.xml.pref_colors);
             addPreferencesFromResource(R.xml.pref_notification);
-            addPreferencesFromResource(R.xml.pref_now_playing_screen);
+            addPreferencesFromResource(R.xml.pref_now_playing);
             addPreferencesFromResource(R.xml.pref_lockscreen);
             addPreferencesFromResource(R.xml.pref_audio);
             addPreferencesFromResource(R.xml.pref_images);
@@ -131,8 +131,8 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
         public DialogFragment onCreatePreferenceDialog(Preference preference) {
             if (preference instanceof NowPlayingScreenPreference) {
                 return NowPlayingScreenPreferenceDialog.newInstance();
-            } else if (preference instanceof LibraryPreference) {
-                return LibraryPreferenceDialog.newInstance();
+            } else if (preference instanceof CategoryPreference) {
+                return CategoryPreferenceDialog.newInstance();
             } else if (preference instanceof DirectPlayPreference) {
                 return DirectPlayPreferenceDialog.newInstance();
             }
diff --git a/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java
index 1aa56e85..67c29331 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java
@@ -123,14 +123,14 @@ public final class PreferenceUtil {
         }
     }
 
-    public final boolean getRememberLastTab() {
-        return mPreferences.getBoolean(REMEMBER_LAST_TAB, true);
-    }
-
     public final int getPageSize() {
         return Integer.parseInt(mPreferences.getString(PAGE_SIZE, "100"));
     }
 
+    public final boolean getRememberLastTab() {
+        return mPreferences.getBoolean(REMEMBER_LAST_TAB, true);
+    }
+
     public final int getLastTab() {
         return mPreferences.getInt(LAST_TAB, 0);
     }
diff --git a/app/src/main/res/xml/pref_library.xml b/app/src/main/res/xml/pref_library.xml
index c240836b..c5d62097 100644
--- a/app/src/main/res/xml/pref_library.xml
+++ b/app/src/main/res/xml/pref_library.xml
@@ -3,7 +3,7 @@
 
     <com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="@string/pref_header_library">
 
-        <com.dkanada.gramophone.preferences.LibraryPreference
+        <com.dkanada.gramophone.preferences.CategoryPreference
             app:iconSpaceReserved="false"
             android:key="library_categories"
             android:summary="@string/pref_summary_library_categories"
diff --git a/app/src/main/res/xml/pref_now_playing_screen.xml b/app/src/main/res/xml/pref_now_playing.xml
similarity index 100%
rename from app/src/main/res/xml/pref_now_playing_screen.xml
rename to app/src/main/res/xml/pref_now_playing.xml