* Do not use {@link #setContentView(int)} but wrap your layout with
* {@link #wrapSlidingMusicPanelAndFab(int)} first and then return it in {@link #createContentView()}
*/
-public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivity implements SlidingUpPanelLayout.PanelSlideListener {
+public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivity implements SlidingUpPanelLayout.PanelSlideListener, SharedPreferences.OnSharedPreferenceChangeListener {
public static final String TAG = AbsSlidingMusicPanelActivity.class.getSimpleName();
private static final int FAB_CIRCULAR_REVEAL_ANIMATION_TIME = 1000;
@@ -151,6 +151,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
setUpSlidingPanel();
initAppearanceVarsFromSharedPrefs();
+ PreferenceUtil.getInstance(this).registerOnSharedPreferenceChangedListener(this);
initProgressSliderDependentViews();
moveSeekBarIntoPlace();
@@ -176,6 +177,12 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
protected abstract View createContentView();
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ PreferenceUtil.getInstance(this).unregisterOnSharedPreferenceChangedListener(this);
+ }
+
@Override
protected void onResume() {
super.onResume();
@@ -206,6 +213,48 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
updateShuffleState();
}
+ @Override
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ switch (key) {
+ case PreferenceUtil.OPAQUE_STATUSBAR_NOW_PLAYING:
+ opaqueStatusBar = PreferenceUtil.getInstance(this).opaqueStatusbarNowPlaying();
+ // do not break here
+ case PreferenceUtil.OPAQUE_TOOLBAR_NOW_PLAYING:
+ opaqueToolBar = opaqueStatusBar && PreferenceUtil.getInstance(this).opaqueToolbarNowPlaying();
+ if (lastFooterColor != -1) {
+ animateColorChange(lastFooterColor);
+ }
+ if (opaqueStatusBar) {
+ if (opaqueToolBar) {
+ alignAlbumArtToToolbar();
+ } else {
+ alignAlbumArtToStatusBar();
+ }
+ } else {
+ alignAlbumArtToTop();
+ }
+ break;
+ case PreferenceUtil.FORCE_SQUARE_ALBUM_ART:
+ forceSquareAlbumArt = PreferenceUtil.getInstance(this).forceAlbumArtSquared();
+ albumArt.forceSquare(forceSquareAlbumArt);
+ break;
+ case PreferenceUtil.LARGER_TITLE_BOX_NOW_PLAYING:
+ largerTitleBox = PreferenceUtil.getInstance(this).largerTitleBoxNowPlaying();
+ adjustTitleBoxSize();
+ break;
+ case PreferenceUtil.ALTERNATIVE_PROGRESS_SLIDER_NOW_PLAYING:
+ alternativeProgressSlider = PreferenceUtil.getInstance(this).alternativeProgressSliderNowPlaying();
+ initProgressSliderDependentViews();
+ moveSeekBarIntoPlace();
+ setTint(seekBar, getThemeColorAccent());
+ break;
+ case PreferenceUtil.PLAYBACK_CONTROLLER_CARD_NOW_PLAYING:
+ showPlaybackControllerCard = PreferenceUtil.getInstance(this).playbackControllerCardNowPlaying();
+ setUpPlaybackControllerCard();
+ break;
+ }
+ }
+
private void setUpPlayPauseButton() {
updateFabState(false);
@@ -233,8 +282,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
} else {
MusicPlayerRemote.resumePlaying();
}
- } else {
- Toast.makeText(AbsSlidingMusicPanelActivity.this, getResources().getString(R.string.playing_queue_empty), Toast.LENGTH_SHORT).show();
}
}
});
@@ -299,13 +346,13 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
@Override
public void onPanelSlide(View view, float slideOffset) {
- miniPlayer.setAlpha(1 - slideOffset);
-
float xTranslation = (dummyFab.getX() + mediaControllerContainer.getX() + footerFrame.getX() - playPauseFab.getLeft()) * slideOffset;
float yTranslation = (dummyFab.getY() + mediaControllerContainer.getY() + footerFrame.getY() - playPauseFab.getTop()) * slideOffset;
playPauseFab.setTranslationX(xTranslation);
playPauseFab.setTranslationY(yTranslation);
+
+ miniPlayer.setAlpha(1 - slideOffset);
}
@Override
@@ -324,7 +371,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
int cy = (dummyFab.getTop() + dummyFab.getBottom()) / 2;
int finalRadius = Math.max(mediaControllerContainer.getWidth(), mediaControllerContainer.getHeight());
- Animator animator = ViewAnimationUtils.createCircularReveal(mediaControllerContainer, cx, cy, dummyFab.getWidth() / 2, finalRadius);
+ final Animator animator = ViewAnimationUtils.createCircularReveal(mediaControllerContainer, cx, cy, dummyFab.getWidth() / 2, finalRadius);
animator.setInterpolator(new DecelerateInterpolator());
animator.setDuration(FAB_CIRCULAR_REVEAL_ANIMATION_TIME);
animator.start();
@@ -352,10 +399,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
}
}
- public FloatingActionButton getPlayPauseFab() {
- return playPauseFab;
- }
-
public SlidingUpPanelLayout getSlidingUpPanelLayout() {
return slidingUpPanelLayout;
}
@@ -425,6 +468,10 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
songTotalTime = (TextView) findViewById(R.id.player_alternative_song_total_time);
seekBar = (SeekBar) findViewById(R.id.player_alternative_progress_slider);
} else {
+ findViewById(R.id.player_default_progress_container).setVisibility(View.VISIBLE);
+ findViewById(R.id.player_default_progress_slider).setVisibility(View.VISIBLE);
+ findViewById(R.id.player_alternative_progress_container).setVisibility(View.GONE);
+
songCurrentProgress = (TextView) findViewById(R.id.player_default_song_current_progress);
songTotalTime = (TextView) findViewById(R.id.player_default_song_total_time);
seekBar = (SeekBar) findViewById(R.id.player_default_progress_slider);
@@ -742,9 +789,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
}
private void startUpdatingProgressViews() {
- if (!progressViewsUpdateHandler.hasMessages(CMD_REFRESH_PROGRESS_VIEWS)) {
- queueNextRefresh(0);
- }
+ queueNextRefresh(1);
}
private void stopUpdatingProgressViews() {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
index 6e6b198d..d42867f8 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
@@ -5,6 +5,7 @@ import android.content.res.ColorStateList;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
+import android.os.Handler;
import android.support.annotation.ColorInt;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
@@ -41,7 +42,13 @@ public abstract class AbsThemeActivity extends AppCompatActivity implements KabV
@Override
protected void onResume() {
super.onResume();
- recreateIfThemeChanged();
+ // the handler is necessary to avoid "java.lang.RuntimeException: Performing pause of activity that is not resumed"
+ new Handler().postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ recreateIfThemeChanged();
+ }
+ }, 200);
}
private void setupTheme() {
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png
new file mode 100644
index 00000000..8962cbd9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png
new file mode 100644
index 00000000..c62db8c8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png
new file mode 100644
index 00000000..36859f09
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png
new file mode 100644
index 00000000..1a510982
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png
new file mode 100644
index 00000000..c15d6346
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png differ
diff --git a/app/src/main/res/layout/activity_artist_detail.xml b/app/src/main/res/layout/activity_artist_detail.xml
index 6699c8ab..dc4f01a4 100644
--- a/app/src/main/res/layout/activity_artist_detail.xml
+++ b/app/src/main/res/layout/activity_artist_detail.xml
@@ -13,7 +13,8 @@
android:id="@+id/artist_image_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:scaleType="centerCrop" />
+ android:scaleType="centerCrop"
+ tools:ignore="ContentDescription" />