From 88fae04c4e694062d14a58c6b28541f42e7fdc9c Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Thu, 31 Mar 2016 21:13:00 +0200 Subject: [PATCH] Organized loader ids via interface. --- .../gramophone/interfaces/LoaderIds.java | 16 ++++++++++++++++ .../ui/activities/AlbumDetailActivity.java | 3 ++- .../ui/activities/ArtistDetailActivity.java | 3 ++- .../ui/activities/PlaylistDetailActivity.java | 3 ++- .../gramophone/ui/activities/SearchActivity.java | 3 ++- .../mainactivity/folders/FoldersFragment.java | 3 ++- .../library/pager/AlbumsFragment.java | 4 ++-- .../library/pager/ArtistsFragment.java | 4 ++-- .../library/pager/PlaylistsFragment.java | 4 ++-- .../library/pager/SongsFragment.java | 4 ++-- 10 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 app/src/main/java/com/kabouzeid/gramophone/interfaces/LoaderIds.java diff --git a/app/src/main/java/com/kabouzeid/gramophone/interfaces/LoaderIds.java b/app/src/main/java/com/kabouzeid/gramophone/interfaces/LoaderIds.java new file mode 100644 index 00000000..dc6ad0c3 --- /dev/null +++ b/app/src/main/java/com/kabouzeid/gramophone/interfaces/LoaderIds.java @@ -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; +} diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index 1756880c..0c74e618 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -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"; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index da864a71..7876c67d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -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 { 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"; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java index de0eba1d..f1a32d2d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java @@ -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"; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java index e505dd50..3ced5cf1 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java @@ -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> { 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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java index 530a1041..56379578 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java @@ -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> { 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"; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java index 719b4b29..c8ae4186 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java @@ -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 implements LoaderManager.LoaderCallbacks> { 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) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java index 8d4c0db3..7b39f14d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java @@ -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) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java index 8f7952a2..0927f3f4 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/PlaylistsFragment.java @@ -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