diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumAdapter.java index 079ab399..cdef43c3 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumAdapter.java @@ -187,7 +187,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter= Build.VERSION_CODES.LOLLIPOP) { postponeEnterTransition(); - if (PreferenceUtils.getInstance(this).coloredNavigationBarAlbumEnabled()) + if (PreferenceUtils.getInstance(this).coloredNavigationBarAlbum()) setNavigationBarColor(DialogUtils.resolveColor(this, R.attr.default_bar_color)); } @@ -236,7 +236,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH toolbarColor = vibrantSwatch.getRgb(); albumTitleView.setBackgroundColor(toolbarColor); albumTitleView.setTextColor(Util.getOpaqueColor(vibrantSwatch.getTitleTextColor())); - if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(AlbumDetailActivity.this).coloredNavigationBarAlbumEnabled()) + if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(AlbumDetailActivity.this).coloredNavigationBarAlbum()) setNavigationBarColor(toolbarColor); notifyTaskColorChange(toolbarColor); } else { @@ -258,7 +258,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH albumTitleView.setBackgroundColor(defaultBarColor); albumTitleView.setTextColor(titleTextColor); - if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarArtistEnabled()) + if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarArtist()) setNavigationBarColor(DialogUtils.resolveColor(this, R.attr.default_bar_color)); notifyTaskColorChange(toolbarColor); 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 ff7776c5..056982d1 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 @@ -132,7 +132,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { postponeEnterTransition(); - if (PreferenceUtils.getInstance(this).coloredNavigationBarArtistEnabled()) + if (PreferenceUtils.getInstance(this).coloredNavigationBarArtist()) setNavigationBarColor(DialogUtils.resolveColor(this, R.attr.default_bar_color)); } @@ -317,7 +317,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor toolbarColor = vibrantSwatch.getRgb(); artistNameTv.setBackgroundColor(vibrantSwatch.getRgb()); artistNameTv.setTextColor(Util.getOpaqueColor(vibrantSwatch.getTitleTextColor())); - if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(ArtistDetailActivity.this).coloredNavigationBarArtistEnabled()) + if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(ArtistDetailActivity.this).coloredNavigationBarArtist()) setNavigationBarColor(vibrantSwatch.getRgb()); notifyTaskColorChange(toolbarColor); } else { @@ -356,7 +356,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor artistNameTv.setBackgroundColor(defaultBarColor); artistNameTv.setTextColor(titleTextColor); - if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarArtistEnabled()) + if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarArtist()) setNavigationBarColor(DialogUtils.resolveColor(this, R.attr.default_bar_color)); notifyTaskColorChange(toolbarColor); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index 70bea450..790fc939 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -88,7 +88,7 @@ public class MainActivity extends AbsFabActivity setUpToolbar(); setUpViewPager(); - if (PreferenceUtils.getInstance(this).coloredNavigationBarOtherScreensEnabled()) + if (PreferenceUtils.getInstance(this).coloredNavigationBarOtherScreens()) setNavigationBarThemeColor(); handlePlaybackIntent(getIntent()); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java index c2c805f7..e213748c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java @@ -417,7 +417,7 @@ public class MusicControllerActivity extends AbsFabActivity { if (opaqueStatusBar) setStatusBarColor(newColor); else setStatusBarColor(Color.TRANSPARENT); - if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarCurrentPlayingEnabled()) + if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarCurrentPlaying()) setNavigationBarColor(newColor); lastFooterColor = newColor; } 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 81b80c1f..f7bd4020 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 @@ -77,7 +77,7 @@ public class PlaylistDetailActivity extends AbsFabActivity implements CabHolder getSupportActionBar().setTitle(playlist.name); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - if (PreferenceUtils.getInstance(this).coloredNavigationBarPlaylistEnabled()) + if (PreferenceUtils.getInstance(this).coloredNavigationBarPlaylist()) setNavigationBarThemeColor(); setStatusBarThemeColor(); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java index bda8b861..1f075472 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java @@ -41,7 +41,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia if (savedInstanceState == null) getFragmentManager().beginTransaction().replace(R.id.content_frame, new SettingsFragment()).commit(); - if (PreferenceUtils.getInstance(this).coloredNavigationBarOtherScreensEnabled()) + if (PreferenceUtils.getInstance(this).coloredNavigationBarOtherScreens()) setNavigationBarThemeColor(); setStatusBarThemeColor(); } @@ -136,6 +136,13 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia }); } + Preference coloredNotification = findPreference("colored_notification"); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { + coloredNotification.setEnabled(false); + coloredNotification.setWidgetLayoutResource(0); + coloredNotification.setSummary(R.string.pref_only_lollipop); + } + equalizer = findPreference("equalizer"); resolveEqualizer(); equalizer.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java index 4b09b3a6..4b8b1d8e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java @@ -193,7 +193,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity { paletteColorPrimary = primaryColor; observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false); setStatusBarColor(paletteColorPrimary); - if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarTagEditorEnabled()) + if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarTagEditor()) setNavigationBarColor(paletteColorPrimary); header.setBackgroundColor(paletteColorPrimary); notifyTaskColorChange(paletteColorPrimary); @@ -246,7 +246,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity { header.setBackgroundColor(paletteColorPrimary); setStatusBarColor(paletteColorPrimary); - if (PreferenceUtils.getInstance(this).coloredNavigationBarTagEditorEnabled()) + if (PreferenceUtils.getInstance(this).coloredNavigationBarTagEditor()) setNavigationBarColor(paletteColorPrimary); } @@ -289,7 +289,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity { paletteColorPrimary = vibrantColor; observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false); setStatusBarColor(paletteColorPrimary); - if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(AbsTagEditorActivity.this).coloredNavigationBarTagEditorEnabled()) + if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(AbsTagEditorActivity.this).coloredNavigationBarTagEditor()) setNavigationBarColor(paletteColorPrimary); header.setBackgroundColor(paletteColorPrimary); notifyTaskColorChange(paletteColorPrimary); diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java index 57aeb9df..818c28d2 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java @@ -41,6 +41,7 @@ public final class PreferenceUtils { public static final String ALTERNATIVE_PROGRESS_SLIDER_NOW_PLAYING = "alternative_progress_slider_now_playing"; public static final String PLAYBACK_CONTROLLER_CARD_NOW_PLAYING = "playback_controller_card_now_playing"; public static final String FADE_PLAY_PAUSE = "fade_play_pause"; + public static final String COLORED_NOTIFICATION = "colored_notification"; private static PreferenceUtils sInstance; @@ -110,31 +111,35 @@ public final class PreferenceUtils { // return mPreferences.getBoolean(ONLY_ON_WIFI, false); // } - public final boolean coloredAlbumFootersEnabled() { + public final boolean coloredAlbumFooters() { return mPreferences.getBoolean(COLORED_ALBUM_FOOTERS, true); } - public final boolean coloredNavigationBarAlbumEnabled() { + public final boolean coloredNotification() { + return mPreferences.getBoolean(COLORED_NOTIFICATION, true); + } + + public final boolean coloredNavigationBarAlbum() { return coloredNavigationBarFor(COLORED_NAVIGATION_BAR_ALBUM); } - public final boolean coloredNavigationBarArtistEnabled() { + public final boolean coloredNavigationBarArtist() { return coloredNavigationBarFor(COLORED_NAVIGATION_BAR_ARTIST); } - public final boolean coloredNavigationBarCurrentPlayingEnabled() { + public final boolean coloredNavigationBarCurrentPlaying() { return coloredNavigationBarFor(COLORED_NAVIGATION_BAR_CURRENT_PLAYING); } - public final boolean coloredNavigationBarPlaylistEnabled() { + public final boolean coloredNavigationBarPlaylist() { return coloredNavigationBarFor(COLORED_NAVIGATION_BAR_PLAYIST); } - public final boolean coloredNavigationBarTagEditorEnabled() { + public final boolean coloredNavigationBarTagEditor() { return coloredNavigationBarFor(COLORED_NAVIGATION_BAR_TAG_EDITOR); } - public final boolean coloredNavigationBarOtherScreensEnabled() { + public final boolean coloredNavigationBarOtherScreens() { return coloredNavigationBarFor(COLORED_NAVIGATION_BAR_OTHER_SCREENS); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/views/DynamicCheckBox.java b/app/src/main/java/com/kabouzeid/gramophone/views/DynamicCheckBox.java index 8d890572..c7f55e4d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/views/DynamicCheckBox.java +++ b/app/src/main/java/com/kabouzeid/gramophone/views/DynamicCheckBox.java @@ -1,7 +1,6 @@ package com.kabouzeid.gramophone.views; import android.content.Context; - import android.support.v7.widget.AppCompatCheckBox; import android.util.AttributeSet; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 990db140..8f3061eb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -107,6 +107,7 @@ Tag editor Everywhere else Colored album footers + Colored notification Fade play/pause Force square album art Opaque toolbar @@ -139,7 +140,8 @@ Playlist name Song "Only available on Lollipop." - "Album footers in the grid are colored with the album cover\'s palette." + "Album footers in the grid are colored with the album cover\'s vibrant color." + "The notification is colored with the album cover\'s vibrant color." "Fades the song in/out on play/pause." Album art in the now playing view is forced to be squared. The toolbar is opaque and do not cover the album art. diff --git a/app/src/main/res/xml/pref_audio.xml b/app/src/main/res/xml/pref_audio.xml index 9b0b089f..cbbac7fc 100644 --- a/app/src/main/res/xml/pref_audio.xml +++ b/app/src/main/res/xml/pref_audio.xml @@ -12,6 +12,7 @@ android:widgetLayout="@layout/preference_dynamic_checkbox" /> diff --git a/app/src/main/res/xml/pref_colors.xml b/app/src/main/res/xml/pref_colors.xml index 1678038d..075dd4c2 100644 --- a/app/src/main/res/xml/pref_colors.xml +++ b/app/src/main/res/xml/pref_colors.xml @@ -3,6 +3,7 @@ + +