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

Organized loader ids via interface.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-03-31 21:13:00 +02:00
commit 88fae04c4e
10 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/kabouzeid/gramophone/interfaces/LoaderIds.java Normal file
View file

@ -0,0 +1,16 @@
package com.kabouzeid.gramophone.interfaces;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public interface LoaderIds {
int ALBUM_DETAIL_ACTIVITY = 1;
int ARTIST_DETAIL_ACTIVITY = 2;
int PLAYLIST_DETAIL_ACTIVITY = 3;
int SEARCH_ACTIVITY = 4;
int FOLDERS_FRAGMENT = 5;
int ALBUMS_FRAGMENT = 6;
int ARTISTS_FRAGMENT = 7;
int PLAYLISTS_FRAGMENT = 8;
int SONGS_FRAGMENT = 9;
}

3
app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
View file

@ -34,6 +34,7 @@ import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.interfaces.CabHolder;
import com.kabouzeid.gramophone.interfaces.PaletteColorHolder;
import com.kabouzeid.gramophone.loader.AlbumLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
import com.kabouzeid.gramophone.misc.SimpleObservableScrollViewCallbacks;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Album;
@ -54,7 +55,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
public static final String TAG = AlbumDetailActivity.class.getSimpleName();
private static final int TAG_EDITOR_REQUEST = 2001;
private static final int LOADER_ID = 1;
private static final int LOADER_ID = LoaderIds.ALBUM_DETAIL_ACTIVITY;
public static final String EXTRA_ALBUM_ID = "extra_album_id";

3
app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
View file

@ -47,6 +47,7 @@ import com.kabouzeid.gramophone.lastfm.rest.model.LastFmArtist;
import com.kabouzeid.gramophone.loader.ArtistAlbumLoader;
import com.kabouzeid.gramophone.loader.ArtistLoader;
import com.kabouzeid.gramophone.loader.ArtistSongLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
import com.kabouzeid.gramophone.misc.SimpleObservableScrollViewCallbacks;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Album;
@ -72,7 +73,7 @@ import retrofit2.Response;
public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implements PaletteColorHolder, CabHolder, LoaderManager.LoaderCallbacks<ArtistDetailActivity.ArtistData> {
public static final String TAG = ArtistDetailActivity.class.getSimpleName();
private static final int LOADER_ID = 1;
private static final int LOADER_ID = LoaderIds.ARTIST_DETAIL_ACTIVITY;
public static final String EXTRA_ARTIST_ID = "extra_artist_id";

3
app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
View file

@ -27,6 +27,7 @@ import com.kabouzeid.gramophone.dialogs.SleepTimerDialog;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.interfaces.CabHolder;
import com.kabouzeid.gramophone.loader.PlaylistSongLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Playlist;
import com.kabouzeid.gramophone.model.PlaylistSong;
@ -47,7 +48,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
public static final String TAG = PlaylistDetailActivity.class.getSimpleName();
private static final int LOADER_ID = 1;
private static final int LOADER_ID = LoaderIds.PLAYLIST_DETAIL_ACTIVITY;
@NonNull
public static String EXTRA_PLAYLIST = "extra_playlist";

3
app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java
View file

@ -23,6 +23,7 @@ import com.kabouzeid.gramophone.adapter.SearchAdapter;
import com.kabouzeid.gramophone.loader.AlbumLoader;
import com.kabouzeid.gramophone.loader.ArtistLoader;
import com.kabouzeid.gramophone.loader.SongLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.ui.activities.base.AbsMusicServiceActivity;
import com.kabouzeid.gramophone.util.Util;
@ -38,7 +39,7 @@ import hugo.weaving.DebugLog;
public class SearchActivity extends AbsMusicServiceActivity implements SearchView.OnQueryTextListener, LoaderManager.LoaderCallbacks<List<Object>> {
public static final String TAG = SearchActivity.class.getSimpleName();
public static final String QUERY = "query";
private static final int LOADER_ID = 1;
private static final int LOADER_ID = LoaderIds.SEARCH_ACTIVITY;
@Bind(R.id.recycler_view)
RecyclerView recyclerView;

3
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java
View file

@ -41,6 +41,7 @@ import com.kabouzeid.gramophone.helper.menu.SongMenuHelper;
import com.kabouzeid.gramophone.helper.menu.SongsMenuHelper;
import com.kabouzeid.gramophone.interfaces.CabHolder;
import com.kabouzeid.gramophone.misc.DialogAsyncTask;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
import com.kabouzeid.gramophone.misc.UpdateToastMediaScannerCompletionListener;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Song;
@ -69,7 +70,7 @@ import butterknife.ButterKnife;
public class FoldersFragment extends AbsMainActivityFragment implements MainActivity.MainActivityFragmentCallbacks, CabHolder, BreadCrumbLayout.SelectionCallback, SongFileAdapter.Callbacks, AppBarLayout.OnOffsetChangedListener, LoaderManager.LoaderCallbacks<List<File>> {
public static final String TAG = FoldersFragment.class.getSimpleName();
private static final int LOADER_ID = 1;
private static final int LOADER_ID = LoaderIds.FOLDERS_FRAGMENT;
protected static final String PATH = "path";
protected static final String CRUMBS = "crumbs";

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

@ -8,9 +8,9 @@ import android.support.v4.content.Loader;
import android.support.v7.widget.GridLayoutManager;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.MusicLibraryPagerAdapter;
import com.kabouzeid.gramophone.adapter.album.AlbumAdapter;
import com.kabouzeid.gramophone.loader.AlbumLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.util.PreferenceUtil;
@ -23,7 +23,7 @@ import java.util.ArrayList;
public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager> implements LoaderManager.LoaderCallbacks<ArrayList<Album>> {
public static final String TAG = AlbumsFragment.class.getSimpleName();
private static final int LOADER_ID = MusicLibraryPagerAdapter.MusicFragments.ALBUM.ordinal();
private static final int LOADER_ID = LoaderIds.ALBUMS_FRAGMENT;
@Override
public void onActivityCreated(Bundle savedInstanceState) {

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

@ -8,9 +8,9 @@ import android.support.v4.content.Loader;
import android.support.v7.widget.GridLayoutManager;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.MusicLibraryPagerAdapter;
import com.kabouzeid.gramophone.adapter.artist.ArtistAdapter;
import com.kabouzeid.gramophone.loader.ArtistLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.util.PreferenceUtil;
@ -24,7 +24,7 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr
public static final String TAG = ArtistsFragment.class.getSimpleName();
private static final int LOADER_ID = MusicLibraryPagerAdapter.MusicFragments.ARTIST.ordinal();
private static final int LOADER_ID = LoaderIds.ARTISTS_FRAGMENT;
@Override
public void onActivityCreated(Bundle savedInstanceState) {

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

@ -8,9 +8,9 @@ import android.support.v4.content.Loader;
import android.support.v7.widget.LinearLayoutManager;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.MusicLibraryPagerAdapter;
import com.kabouzeid.gramophone.adapter.PlaylistAdapter;
import com.kabouzeid.gramophone.loader.PlaylistLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Playlist;
import com.kabouzeid.gramophone.model.smartplaylist.HistoryPlaylist;
@ -26,7 +26,7 @@ public class PlaylistsFragment extends AbsLibraryPagerRecyclerViewFragment<Playl
public static final String TAG = PlaylistsFragment.class.getSimpleName();
private static final int LOADER_ID = MusicLibraryPagerAdapter.MusicFragments.PLAYLIST.ordinal();
private static final int LOADER_ID = LoaderIds.PLAYLISTS_FRAGMENT;
@Override
public void onActivityCreated(Bundle savedInstanceState) {

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

@ -8,10 +8,10 @@ import android.support.v4.content.Loader;
import android.support.v7.widget.GridLayoutManager;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.MusicLibraryPagerAdapter;
import com.kabouzeid.gramophone.adapter.song.ShuffleButtonSongAdapter;
import com.kabouzeid.gramophone.adapter.song.SongAdapter;
import com.kabouzeid.gramophone.loader.SongLoader;
import com.kabouzeid.gramophone.interfaces.LoaderIds;
import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtil;
@ -25,7 +25,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag
public static final String TAG = SongsFragment.class.getSimpleName();
private static final int LOADER_ID = MusicLibraryPagerAdapter.MusicFragments.SONG.ordinal();
private static final int LOADER_ID = LoaderIds.SONGS_FRAGMENT;
@Override
public void onActivityCreated(Bundle savedInstanceState) {