From 0ade999094b325c7ae36c0761379ea709d9dceb1 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 11 Oct 2015 18:54:59 +0200 Subject: [PATCH] Ignore. Not working work in progress commit. --- .../adapter/album/AlbumAdapter.java | 3 - .../adapter/artist/ArtistAdapter.java | 3 - .../adapter/song/ArtistSongAdapter.java | 3 - .../song/SmartPlaylistSongAdapter.java | 3 - .../gramophone/adapter/song/SongAdapter.java | 3 - .../helper/menu/SongMenuHelper.java | 12 +- .../misc/FloatingActionButtonProperties.java | 2 +- .../ui/activities/AlbumDetailActivity.java | 4 +- .../base/AbsSlidingMusicPanelActivity.java | 162 +++++------------- .../ic_keyboard_arrow_up_white_24dp.png | Bin 0 -> 185 bytes .../ic_keyboard_arrow_up_white_24dp.png | Bin 0 -> 153 bytes .../ic_keyboard_arrow_up_white_24dp.png | Bin 0 -> 216 bytes .../ic_keyboard_arrow_up_white_24dp.png | Bin 0 -> 335 bytes .../ic_keyboard_arrow_up_white_24dp.png | Bin 0 -> 375 bytes app/src/main/res/layout/mini_player.xml | 33 ++-- app/src/main/res/layout/player.xml | 6 +- .../res/layout/sliding_music_panel_layout.xml | 59 +++---- 17 files changed, 93 insertions(+), 200 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_24dp.png diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java index 1c2fcd65..7d827f16 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java @@ -21,7 +21,6 @@ import com.kabouzeid.gramophone.interfaces.CabHolder; import com.kabouzeid.gramophone.loader.AlbumSongLoader; import com.kabouzeid.gramophone.model.Album; import com.kabouzeid.gramophone.model.Song; -import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity; import com.kabouzeid.gramophone.util.ColorUtil; import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.NavigationUtil; @@ -219,8 +218,6 @@ public class AlbumAdapter extends AbsMultiSelectAdapter implements MaterialCab Pair[] albumPairs = new Pair[]{ Pair.create(albumArt, activity.getResources().getString(R.string.transition_album_art)) }; - if (activity instanceof AbsSlidingMusicPanelActivity) - albumPairs = ((AbsSlidingMusicPanelActivity) activity).addPlayPauseFabToSharedViews(albumPairs); NavigationUtil.goToAlbum(activity, song.albumId, albumPairs); return true; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SmartPlaylistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SmartPlaylistSongAdapter.java index f99f7297..b81e16ad 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SmartPlaylistSongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SmartPlaylistSongAdapter.java @@ -11,7 +11,6 @@ import android.view.View; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.interfaces.CabHolder; import com.kabouzeid.gramophone.model.Song; -import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity; import com.kabouzeid.gramophone.util.NavigationUtil; import java.util.ArrayList; @@ -54,8 +53,6 @@ public class SmartPlaylistSongAdapter extends SongAdapter { Pair[] albumPairs = new Pair[]{ Pair.create(image, activity.getString(R.string.transition_album_art)) }; - if (activity instanceof AbsSlidingMusicPanelActivity) - albumPairs = ((AbsSlidingMusicPanelActivity) activity).addPlayPauseFabToSharedViews(albumPairs); NavigationUtil.goToAlbum(activity, dataSet.get(getAdapterPosition()).albumId, albumPairs); return true; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java index c8528abd..ce4c39b2 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java @@ -21,7 +21,6 @@ import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.helper.menu.SongMenuHelper; import com.kabouzeid.gramophone.interfaces.CabHolder; import com.kabouzeid.gramophone.model.Song; -import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity; import com.kabouzeid.gramophone.util.ColorUtil; import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.NavigationUtil; @@ -237,8 +236,6 @@ public class SongAdapter extends AbsMultiSelectAdapter= Build.VERSION_CODES.LOLLIPOP) { if (mediaControllerContainer.getVisibility() == View.INVISIBLE) { - int cx = (dummyFab.getLeft() + dummyFab.getRight()) / 2; - int cy = (dummyFab.getTop() + dummyFab.getBottom()) / 2; + int cx = (playerPlayPauseFab.getLeft() + playerPlayPauseFab.getRight()) / 2; + int cy = (playerPlayPauseFab.getTop() + playerPlayPauseFab.getBottom()) / 2; int finalRadius = Math.max(mediaControllerContainer.getWidth(), mediaControllerContainer.getHeight()); - final Animator animator = ViewAnimationUtils.createCircularReveal(mediaControllerContainer, cx, cy, dummyFab.getWidth() / 2, finalRadius); + final Animator animator = ViewAnimationUtils.createCircularReveal(mediaControllerContainer, cx, cy, playerPlayPauseFab.getWidth() / 2, finalRadius); animator.setInterpolator(new DecelerateInterpolator()); animator.setDuration(FAB_CIRCULAR_REVEAL_ANIMATION_TIME); animator.start(); @@ -463,29 +434,10 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi private void setMiniPlayerAlphaProgress(@FloatRange(from = 0, to = 1) float progress) { float alpha = 1 - progress; miniPlayer.setAlpha(alpha); + // necessary to make the views below clickable miniPlayer.setVisibility(alpha == 0 ? View.GONE : View.VISIBLE); } - private void setFabPositionProgress(@FloatRange(from = 0, to = 1) float progress) { - float newXTranslation = (dummyFab.getX() + mediaControllerContainer.getX() + footerFrame.getX() - playPauseButton.getLeft()) * progress; - float newYTranslation = (dummyFab.getY() + mediaControllerContainer.getY() + footerFrame.getY() - playPauseButton.getTop()) * progress; - - playPauseButton.setTranslationX(newXTranslation); - playPauseButton.setTranslationY(newYTranslation); - } - - private void setFabColorProgress(@FloatRange(from = 0, to = 1) float progress) { - int startColor = getThemeColorAccent(); - int endColor; - if (colorPlaybackControls) { - endColor = lastPlaybackControlsColor; - } else { - endColor = startColor; - } - int newFabColor = (int) argbEvaluator.evaluate(progress, startColor, endColor); - FloatingActionButtonProperties.COLOR.set(playPauseButton, newFabColor); - } - private void toggleSlidingPanel() { if (slidingUpPanelLayout.getPanelState() != SlidingUpPanelLayout.PanelState.EXPANDED) { slidingUpPanelLayout.setPanelState(SlidingUpPanelLayout.PanelState.EXPANDED); @@ -520,7 +472,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi return getResources().getDimensionPixelSize(R.dimen.bottom_offset_fab_activity) - slidingUpPanelLayout.getPanelHeight(); } - protected void updateFabState(boolean animate) { + protected void updatePlayPauseDrawableState(boolean animate) { if (playPauseDrawable == null) { playPauseDrawable = new PlayPauseDrawable(this); } @@ -531,22 +483,10 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi } } - public final Pair[] addPlayPauseFabToSharedViews(@Nullable final Pair... sharedElements) { - Pair[] sharedViewsWithFab; - if (sharedElements != null) { - sharedViewsWithFab = new Pair[sharedElements.length + 1]; - System.arraycopy(sharedElements, 0, sharedViewsWithFab, 0, sharedElements.length); - } else { - sharedViewsWithFab = new Pair[1]; - } - sharedViewsWithFab[sharedViewsWithFab.length - 1] = Pair.create((View) playPauseButton, getString(R.string.transition_fab)); - return sharedViewsWithFab; - } - @Override public void onPlayStateChanged() { super.onPlayStateChanged(); - updateFabState(true); + updatePlayPauseDrawableState(true); } protected View wrapSlidingMusicPanelAndFab(@LayoutRes int resId) { @@ -850,23 +790,13 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi } private void updateCurrentSong() { - hideBottomBarIfQueueIsEmpty(); + hideBottomBar(MusicPlayerRemote.getPlayingQueue().isEmpty()); getCurrentSong(); updateMiniPlayerAndHeaderText(); setUpAlbumArtAndApplyPalette(); updatePlayerMenu(); } - private void hideBottomBarIfQueueIsEmpty() { - if (MusicPlayerRemote.getPlayingQueue().isEmpty()) { - playPauseButton.setVisibility(View.GONE); - hideBottomBar(true); - } else { - playPauseButton.setVisibility(View.VISIBLE); - hideBottomBar(PreferenceUtil.getInstance(this).hideBottomBar()); - } - } - private void getCurrentSong() { song = MusicPlayerRemote.getCurrentSong(); } @@ -991,7 +921,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi updateRepeatState(); updateShuffleState(); setUpProgressSliderTint(); - setUpPlayPauseButtonTint(); + setUpPlayerPlayPauseFabTint(); } }); @@ -1098,10 +1028,10 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi SongDetailDialog.create(song).show(getSupportFragmentManager(), "SONG_DETAIL"); return true; case R.id.action_go_to_album: - NavigationUtil.goToAlbum(this, song.albumId, addPlayPauseFabToSharedViews()); + NavigationUtil.goToAlbum(this, song.albumId); return true; case R.id.action_go_to_artist: - NavigationUtil.goToArtist(this, song.artistId, addPlayPauseFabToSharedViews()); + NavigationUtil.goToArtist(this, song.artistId); return true; } return false; diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a0861f59964fe66e69616e685954d895a5d6a27c GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?G3i>X{Q zH8~}p(GYp&F*A_kjNI%bW2V+aPpXYiHQnUmVQD=!BhYlgho(xWwYu}(XfJcoUE6jm lG-v7K=U!lwF3fjOzZa3R;C)CjGXnzygQu&X%Q~loCIHzhLrVYv literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c735c8ca253c12eb561820ecc492cedeb69bf129 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo5}1|M>sko>|xM z@Cw$&Vm$WTQVV9Ni8b)FHL_(zGZ_Ej7ZJ|o)NK3D_Q*hiPyMJ+5N~^@a4zS@w)Uin z>ZgR9#2R?`4=!d)^OW7`xWv^(CbRe1lR$1a-2?rMM|iJi{P$r!!N9=4;OXk;vd$@? F2>{4&FTMZ( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0008f33b1dfc2e3ccd2b0848d520508a89d005ed GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F~)z3#}>pdjKJ zSRR_IGs{J9=dA`&4G)u*HS?E9?}@BdSk>Lzt|9p9hnino!13kfDIDEDwuCiq=$fvm^H`PR^^Yy93;$gAm# z@V`H6P5*_1_p-x%sK5l;}~pbDc%8zd%F6$taD0e0stH{ BOD6yT literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c079c59c15d74f4a5d85339db4e85ac0a1578a8b GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4d#XMacLn>~)y_w0?Y#`$L zQ11Zi7QWa__VSx2*Qst5aBK+>JiB}SoC81A1?_s=?zRe)P2po{U|`}<0245}fk6q( zZ(v}`Xuc)kz&R&z3&YaFB@;plQzlF)RGDz4@XSP;2Q!o^4;nfL9j-i{GGR)=u6@hi zuV`7)65QXHA2LCtAWnFWVNiPSk}l=ul-}U8GnQ|2*>tG#+z~_fO@}na&qN$Iik{E~Y`wn+KU-c-+w|Dh&)oo_y^p|umpZ!HVegDI-MROG9+S)$L zmwxOs(eIvFm+LX{hf04Qio5>nW@Hg)WDsy*U}OOiE>N09zyZuxxy1h2Wzwb_en*xu QFfcH9y85}Sb4q9e0MKrHR{#J2 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..27403f79efa796c81d6064d6df7a7c61de0dccc6 GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW?L1u^Ln>~)y%n2v$U&kt zQ9R-MjdzFl?+x9(_M=*3%obMGxt8~B8owI}oMX-sDqp*G?ypo91_l;}1_lNJ1_mYu z2L=WX1_nk31uTLY(^VPf9*ghiZm4_gt{ft1FShW~kBJ;tkM%pRu&5Jpy81C$K&xNA zF`)L(L%}qO`izz@ANNmB61;T$zJ6@5;HBg7=X+gO7}S|KP5qcGsMWjw+r*ZD+&>mA zU60)rLuBpQ7Jm8>-Ew;c$JOKVa*1sp+udfQ{z(*cW2*T2OHPW$%pr%eis+2E&Ul bF1|Z6y?pntu4;D%1_lOCS3j3^P6 - + android:focusable="false" + android:orientation="horizontal"> - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml index 1b7e6e00..5d203895 100644 --- a/app/src/main/res/layout/player.xml +++ b/app/src/main/res/layout/player.xml @@ -176,11 +176,9 @@ android:src="@drawable/ic_shuffle_white_36dp" /> + android:layout_centerInParent="true" /> diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml index 68f69535..de5be9bc 100644 --- a/app/src/main/res/layout/sliding_music_panel_layout.xml +++ b/app/src/main/res/layout/sliding_music_panel_layout.xml @@ -1,46 +1,31 @@ - + android:layout_height="match_parent" + android:gravity="bottom" + sothree:umanoDragView="@+id/player_container" + sothree:umanoPanelHeight="@dimen/mini_player_height" + sothree:umanoParalaxOffset="0dp" + sothree:umanoShadowHeight="@dimen/card_elevation"> - + + + android:background="?android:colorBackground" + android:clickable="true" + android:focusable="false"> - + - + - + - - - - - - - - - \ No newline at end of file + \ No newline at end of file