First steps for folder support.

This commit is contained in:
Karim Abou Zeid 2016-03-14 00:47:16 +01:00
commit 56d3a2dbce
27 changed files with 652 additions and 553 deletions

View file

@ -12,7 +12,6 @@ import android.widget.Toast;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble;
import com.kabouzeid.gramophone.model.Playlist;
import com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity;
import com.kabouzeid.gramophone.ui.activities.ArtistDetailActivity;
@ -24,8 +23,6 @@ import com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity;
public class NavigationUtil {
public static void goToArtist(@NonNull final Activity activity, final int artistId, @Nullable Pair... sharedElements) {
if (!disableViewsAndCheckIsReadyForTransition(activity)) return;
final Intent intent = new Intent(activity, ArtistDetailActivity.class);
intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, artistId);
@ -34,8 +31,6 @@ public class NavigationUtil {
}
public static void goToAlbum(@NonNull final Activity activity, final int albumId, @Nullable Pair... sharedElements) {
if (!disableViewsAndCheckIsReadyForTransition(activity)) return;
final Intent intent = new Intent(activity, AlbumDetailActivity.class);
intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM_ID, albumId);
@ -44,24 +39,12 @@ public class NavigationUtil {
}
public static void goToPlaylist(@NonNull final Activity activity, final Playlist playlist, @Nullable Pair... sharedElements) {
if (!disableViewsAndCheckIsReadyForTransition(activity)) return;
final Intent intent = new Intent(activity, PlaylistDetailActivity.class);
intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist);
activity.startActivity(intent);
}
private static boolean disableViewsAndCheckIsReadyForTransition(@NonNull final Activity activity) {
if (activity instanceof KabViewsDisableAble) {
if (((KabViewsDisableAble) activity).areViewsEnabled()) {
((KabViewsDisableAble) activity).disableViews();
return true;
}
}
return false;
}
public static void openEqualizer(@NonNull final Activity activity) {
final int sessionId = MusicPlayerRemote.getAudioSessionId();
if (sessionId == AudioEffect.ERROR_BAD_VALUE) {

View file

@ -13,7 +13,8 @@ import com.kabouzeid.gramophone.helper.SortOrder;
public final class PreferenceUtil {
public static final String GENERAL_THEME = "general_theme";
public static final String DEFAULT_START_PAGE = "default_start_page";
public static final String LAST_START_PAGE = "last_start_page";
public static final String LAST_PAGE = "last_start_page";
public static final String LAST_MUSIC_CHOOSER = "last_music_chooser";
public static final String ARTIST_SORT_ORDER = "artist_sort_order";
public static final String ARTIST_SONG_SORT_ORDER = "artist_song_sort_order";
@ -100,16 +101,24 @@ public final class PreferenceUtil {
return Integer.parseInt(mPreferences.getString(DEFAULT_START_PAGE, "-1"));
}
public void setLastStartPage(final int value) {
public void setLastPage(final int value) {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putInt(LAST_START_PAGE, value);
editor.putInt(LAST_PAGE, value);
editor.apply();
}
public static final int DEFAULT_PAGE = 0;
public final int getLastPage() {
return mPreferences.getInt(LAST_PAGE, 0);
}
public final int getLastStartPage() {
return mPreferences.getInt(LAST_START_PAGE, DEFAULT_PAGE);
public void setLastMusicChooser(final int value) {
final SharedPreferences.Editor editor = mPreferences.edit();
editor.putInt(LAST_MUSIC_CHOOSER, value);
editor.apply();
}
public final int getLastMusicChooser() {
return mPreferences.getInt(LAST_MUSIC_CHOOSER, 0);
}
public final boolean coloredNotification() {