From bb2793dbea61f8961801d8d5710038030dd45e00 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 6 Nov 2020 11:16:00 +0900 Subject: [PATCH] change the default sort methods --- .../gramophone/ui/activities/SettingsActivity.java | 2 +- .../ui/activities/base/AbsThemeActivity.java | 2 +- .../com/dkanada/gramophone/util/PreferenceUtil.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 c5529d12..c1ed2a3c 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 @@ -162,7 +162,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia ThemeStore.markChanged(requireActivity()); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { // set the new theme so that updateAppShortcuts can pull it - requireActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue(themeName)); + requireActivity().setTheme(PreferenceUtil.getThemeResource(themeName)); new DynamicShortcutManager(getActivity()).updateDynamicShortcuts(); } diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java index 9a7bdb57..fa0b8cb2 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java @@ -18,7 +18,7 @@ import com.dkanada.gramophone.util.Util; public abstract class AbsThemeActivity extends ATHToolbarActivity { @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(PreferenceUtil.getInstance(this).getGeneralTheme()); + setTheme(PreferenceUtil.getInstance(this).getTheme()); super.onCreate(savedInstanceState); MaterialDialogsUtil.updateMaterialDialogsThemeSingleton(this); 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 9d61f153..5743a737 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java @@ -110,12 +110,12 @@ public final class PreferenceUtil { } @StyleRes - public int getGeneralTheme() { - return getThemeResFromPrefValue(mPreferences.getString(GENERAL_THEME, "dark")); + public int getTheme() { + return getThemeResource(mPreferences.getString(GENERAL_THEME, "dark")); } @StyleRes - public static int getThemeResFromPrefValue(String themePrefValue) { + public static int getThemeResource(String themePrefValue) { switch (themePrefValue) { case "light": return R.style.Theme_Phonograph_Light; @@ -239,7 +239,7 @@ public final class PreferenceUtil { } public final String getAlbumSortMethod() { - return mPreferences.getString(ALBUM_SORT_METHOD, SortMethod.NAME); + return mPreferences.getString(ALBUM_SORT_METHOD, SortMethod.RANDOM); } public void setAlbumSortMethod(final String sortMethod) { @@ -249,7 +249,7 @@ public final class PreferenceUtil { } public final String getSongSortMethod() { - return mPreferences.getString(SONG_SORT_METHOD, SortMethod.NAME); + return mPreferences.getString(SONG_SORT_METHOD, SortMethod.RANDOM); } public void setSongSortMethod(final String sortMethod) {