tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring of some names

Browse source
This commit is contained in:
Karim Abou Zeid 2018-04-29 23:19:50 +02:00
commit 2fe07913ac
8 changed files with 60 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
View file

@ -36,9 +36,9 @@ import com.kabouzeid.gramophone.ui.activities.MainActivity;
import com.kabouzeid.gramophone.ui.activities.SearchActivity; import com.kabouzeid.gramophone.ui.activities.SearchActivity;
import com.kabouzeid.gramophone.ui.fragments.mainactivity.AbsMainActivityFragment; 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.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.AlbumsFragment;
import com.kabouzeid.gramophone.ui.fragments.mainactivity.library.pager.ArtistsFragment; 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.ui.fragments.mainactivity.library.pager.SongsFragment;
import com.kabouzeid.gramophone.util.PhonographColorUtil; import com.kabouzeid.gramophone.util.PhonographColorUtil;
import com.kabouzeid.gramophone.util.PreferenceUtil; import com.kabouzeid.gramophone.util.PreferenceUtil;
@ -345,29 +345,29 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
sortOrderMenu.clear(); sortOrderMenu.clear();
if (fragment instanceof AlbumsFragment) { 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)); .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)); .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)); .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)); .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_YEAR));
} else if (fragment instanceof ArtistsFragment) { } 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)); .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)); .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_Z_A));
} else if (fragment instanceof SongsFragment) { } 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)); .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)); .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)); .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)); .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)); .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_YEAR));
} }
@ -378,43 +378,43 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
String sortOrder = null; String sortOrder = null;
if (fragment instanceof AlbumsFragment) { if (fragment instanceof AlbumsFragment) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_album_sort_asc: case R.id.action_album_sort_order_asc:
sortOrder = SortOrder.AlbumSortOrder.ALBUM_A_Z; sortOrder = SortOrder.AlbumSortOrder.ALBUM_A_Z;
break; break;
case R.id.action_album_sort_desc: case R.id.action_album_sort_order_desc:
sortOrder = SortOrder.AlbumSortOrder.ALBUM_Z_A; sortOrder = SortOrder.AlbumSortOrder.ALBUM_Z_A;
break; break;
case R.id.action_album_sort_artist: case R.id.action_album_sort_order_artist:
sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST; sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST;
break; break;
case R.id.action_album_sort_year: case R.id.action_album_sort_order_year:
sortOrder = SortOrder.AlbumSortOrder.ALBUM_YEAR; sortOrder = SortOrder.AlbumSortOrder.ALBUM_YEAR;
break; break;
} }
} else if (fragment instanceof ArtistsFragment) { } else if (fragment instanceof ArtistsFragment) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_artist_sort_asc: case R.id.action_artist_sort_order_asc:
sortOrder = SortOrder.ArtistSortOrder.ARTIST_A_Z; sortOrder = SortOrder.ArtistSortOrder.ARTIST_A_Z;
break; break;
case R.id.action_artist_sort_desc: case R.id.action_artist_sort_order_desc:
sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A; sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A;
break; break;
} }
} else if (fragment instanceof SongsFragment) { } else if (fragment instanceof SongsFragment) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_song_sort_asc: case R.id.action_song_sort_order_asc:
sortOrder = SortOrder.SongSortOrder.SONG_A_Z; sortOrder = SortOrder.SongSortOrder.SONG_A_Z;
break; break;
case R.id.action_song_sort_desc: case R.id.action_song_sort_order_desc:
sortOrder = SortOrder.SongSortOrder.SONG_Z_A; sortOrder = SortOrder.SongSortOrder.SONG_Z_A;
break; break;
case R.id.action_song_sort_artist: case R.id.action_song_sort_order_artist:
sortOrder = SortOrder.SongSortOrder.SONG_ARTIST; sortOrder = SortOrder.SongSortOrder.SONG_ARTIST;
break; break;
case R.id.action_song_sort_album: case R.id.action_song_sort_order_album:
sortOrder = SortOrder.SongSortOrder.SONG_ALBUM; sortOrder = SortOrder.SongSortOrder.SONG_ALBUM;
break; break;
case R.id.action_song_sort_year: case R.id.action_song_sort_order_year:
sortOrder = SortOrder.SongSortOrder.SONG_YEAR; sortOrder = SortOrder.SongSortOrder.SONG_YEAR;
break; break;
} }

3
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
View file

@ -83,6 +83,7 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
public void setAndSaveSortOrder(final String sortOrder) { public void setAndSaveSortOrder(final String sortOrder) {
this.sortOrder = sortOrder; this.sortOrder = sortOrder;
saveSortOrder(sortOrder); saveSortOrder(sortOrder);
setSortOrder(sortOrder);
} }
/** /**
@ -149,6 +150,8 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A extend
protected abstract void saveSortOrder(String sortOrder); protected abstract void saveSortOrder(String sortOrder);
protected abstract void setSortOrder(String sortOrder);
protected int getMaxGridSizeForList() { protected int getMaxGridSizeForList() {
if (isLandscape()) { if (isLandscape()) {
return getActivity().getResources().getInteger(R.integer.default_list_columns_land); return getActivity().getResources().getInteger(R.integer.default_list_columns_land);

7
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java
View file

@ -63,8 +63,11 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra
@Override @Override
protected void saveSortOrder(String sortOrder) { protected void saveSortOrder(String sortOrder) {
PreferenceUtil.getInstance(getActivity()).setAlbumSortOrder(sortOrder); PreferenceUtil.getInstance(getActivity()).setAlbumSortOrder(sortOrder);
onMediaStoreChanged(); }
getAdapter().notifyDataSetChanged();
@Override
protected void setSortOrder(String sortOrder) {
getLoaderManager().restartLoader(LOADER_ID, null, this);
} }
@Override @Override

7
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java
View file

@ -70,8 +70,11 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
@Override @Override
protected void saveSortOrder(String sortOrder) { protected void saveSortOrder(String sortOrder) {
PreferenceUtil.getInstance(getActivity()).setArtistSortOrder(sortOrder); PreferenceUtil.getInstance(getActivity()).setArtistSortOrder(sortOrder);
onMediaStoreChanged(); }
getAdapter().notifyDataSetChanged();
@Override
protected void setSortOrder(String sortOrder) {
getLoaderManager().restartLoader(LOADER_ID, null, this);
} }
@Override @Override

7
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java
View file

@ -81,8 +81,11 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
@Override @Override
protected void saveSortOrder(String sortOrder) { protected void saveSortOrder(String sortOrder) {
PreferenceUtil.getInstance(getActivity()).setSongSortOrder(sortOrder); PreferenceUtil.getInstance(getActivity()).setSongSortOrder(sortOrder);
onMediaStoreChanged(); }
getAdapter().notifyDataSetChanged();
@Override
protected void setSortOrder(String sortOrder) {
getLoaderManager().restartLoader(LOADER_ID, null, this);
} }
@Override @Override

6
app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
View file

@ -225,7 +225,7 @@ public final class PreferenceUtil {
public void setArtistSortOrder(final String sortOrder) { public void setArtistSortOrder(final String sortOrder) {
final SharedPreferences.Editor editor = mPreferences.edit(); final SharedPreferences.Editor editor = mPreferences.edit();
editor.putString(ARTIST_SORT_ORDER, sortOrder); editor.putString(ARTIST_SORT_ORDER, sortOrder);
editor.apply(); editor.commit();
} }
public final String getArtistSongSortOrder() { public final String getArtistSongSortOrder() {
@ -243,7 +243,7 @@ public final class PreferenceUtil {
public void setAlbumSortOrder(final String sortOrder) { public void setAlbumSortOrder(final String sortOrder) {
final SharedPreferences.Editor editor = mPreferences.edit(); final SharedPreferences.Editor editor = mPreferences.edit();
editor.putString(ALBUM_SORT_ORDER, sortOrder); editor.putString(ALBUM_SORT_ORDER, sortOrder);
editor.apply(); editor.commit();
} }
public final String getAlbumSongSortOrder() { public final String getAlbumSongSortOrder() {
@ -257,7 +257,7 @@ public final class PreferenceUtil {
public void setSongSortOrder(final String sortOrder) { public void setSongSortOrder(final String sortOrder) {
final SharedPreferences.Editor editor = mPreferences.edit(); final SharedPreferences.Editor editor = mPreferences.edit();
editor.putString(SONG_SORT_ORDER, sortOrder); editor.putString(SONG_SORT_ORDER, sortOrder);
editor.apply(); editor.commit();
} }
public final String getGenreSortOrder() { public final String getGenreSortOrder() {

22
app/src/main/res/values/ids.xml
View file

@ -3,15 +3,15 @@
<item name="action_new_playlist" type="id" /> <item name="action_new_playlist" type="id" />
<item name="action_show_lyrics" type="id" /> <item name="action_show_lyrics" type="id" />
<item name="action_album_sort_asc" type="id" /> <item name="action_album_sort_order_asc" type="id" />
<item name="action_album_sort_desc" type="id" /> <item name="action_album_sort_order_desc" type="id" />
<item name="action_album_sort_artist" type="id" /> <item name="action_album_sort_order_artist" type="id" />
<item name="action_album_sort_year" type="id" /> <item name="action_album_sort_order_year" type="id" />
<item name="action_artist_sort_asc" type="id" /> <item name="action_artist_sort_order_asc" type="id" />
<item name="action_artist_sort_desc" type="id" /> <item name="action_artist_sort_order_desc" type="id" />
<item name="action_song_sort_asc" type="id" /> <item name="action_song_sort_order_asc" type="id" />
<item name="action_song_sort_desc" type="id" /> <item name="action_song_sort_order_desc" type="id" />
<item name="action_song_sort_artist" type="id" /> <item name="action_song_sort_order_artist" type="id" />
<item name="action_song_sort_album" type="id" /> <item name="action_song_sort_order_album" type="id" />
<item name="action_song_sort_year" type="id" /> <item name="action_song_sort_order_year" type="id" />
</resources> </resources>

10
app/src/main/res/values/strings.xml
View file

@ -296,9 +296,9 @@
<string name="pref_summary_library_categories">Configure visibility and order of 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="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="action_sort_order">Sort order</string>
<string name="sort_a_z">Ascending</string> <string name="sort_order_a_z">Ascending</string>
<string name="sort_z_a">Descending</string> <string name="sort_order_z_a">Descending</string>
<string name="sort_artist">Artist</string> <string name="sort_order_artist">Artist</string>
<string name="sort_album">Album</string> <string name="sort_order_album">Album</string>
<string name="sort_year">Year</string> <string name="sort_order_year">Year</string>
</resources> </resources>