diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index a416183e6..c911a5695 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

We're really sorry for Announcing this Retro Music is driving towards pure Android Material Design guidelines we don't want any unnecessary UI elements that don't need for Music player.

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

We're really sorry for Announcing this Retro Music is driving towards pure Android Material Design guidelines we don't want any unnecessary UI elements that don't need for Music player.

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt index 1776a2242..886b9296c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt @@ -16,16 +16,16 @@ import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter import code.name.monkey.retromusic.dialogs.SongShareDialog +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.menu.SongMenuHelper import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.lyrics.Lyrics -import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity -import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder -import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter -import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.RetroUtil import code.name.monkey.retromusic.util.ViewUtil @@ -151,8 +151,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Call private fun setUpPlayerToolbar() { playerToolbar.apply { - inflateMenu(code.name.monkey.retromusic.R.menu.menu_player) - setNavigationIcon(code.name.monkey.retromusic.R.drawable.ic_close_white_24dp) + inflateMenu(R.menu.menu_player) setNavigationOnClickListener { activity!!.onBackPressed() } setOnMenuItemClickListener(this@ClassicPlayerFragment) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt index fa5c11324..0e42bcb85 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt @@ -12,6 +12,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.hide import code.name.monkey.retromusic.extensions.show +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroMusicColoredTarget @@ -21,8 +23,6 @@ import code.name.monkey.retromusic.loaders.ArtistLoader import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics import code.name.monkey.retromusic.model.lyrics.Lyrics -import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.util.NavigationUtil import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable @@ -66,11 +66,11 @@ class FullPlayerFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbac lyricsLine1.alpha = 1f lyricsLine1.translationY = 0f - lyricsLine1.animate().alpha(0f).translationY(-h).duration = VISIBILITY_ANIM_DURATION + lyricsLine1.animate().alpha(0f).translationY(-h).duration = VISIBILITY_ANIM_DURATION lyricsLine2.alpha = 0f lyricsLine2.translationY = h - lyricsLine2.animate().alpha(1f).translationY(0f).duration = VISIBILITY_ANIM_DURATION + lyricsLine2.animate().alpha(1f).translationY(0f).duration = VISIBILITY_ANIM_DURATION } } @@ -83,7 +83,7 @@ class FullPlayerFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbac } private fun hideLyricsLayout() { - lyricsLayout.animate().alpha(0f).setDuration( VISIBILITY_ANIM_DURATION).withEndAction(Runnable { + lyricsLayout.animate().alpha(0f).setDuration(VISIBILITY_ANIM_DURATION).withEndAction(Runnable { if (!isLyricsLayoutBound()) return@Runnable lyricsLayout.visibility = View.GONE lyricsLine1.text = null @@ -91,7 +91,7 @@ class FullPlayerFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbac }) } - override fun setLyrics(l: Lyrics?) { + override fun setLyrics(l: Lyrics?) { lyrics = l if (!isLyricsLayoutBound()) return @@ -105,7 +105,7 @@ class FullPlayerFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbac lyricsLine2.text = null lyricsLayout.visibility = View.VISIBLE - lyricsLayout.animate().alpha(1f).duration = VISIBILITY_ANIM_DURATION + lyricsLayout.animate().alpha(1f).duration = VISIBILITY_ANIM_DURATION } override fun playerToolbar(): Toolbar { @@ -119,7 +119,6 @@ class FullPlayerFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbac private fun setUpPlayerToolbar() { playerToolbar.apply { - setNavigationIcon(R.drawable.ic_close_white_24dp) setNavigationOnClickListener { activity!!.onBackPressed() } } } diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml index 3dea59cef..25b1d4f41 100644 --- a/app/src/main/res/layout-land/fragment_blur.xml +++ b/app/src/main/res/layout-land/fragment_blur.xml @@ -84,8 +84,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_height="48dp" - android:navigationIcon="@drawable/ic_close_white_24dp" - app:navigationIcon="@drawable/ic_close_white_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml index 510c503f0..5104eba61 100644 --- a/app/src/main/res/layout-land/fragment_card_blur_player.xml +++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml @@ -50,7 +50,7 @@ app:contentInsetLeft="0dp" app:contentInsetStart="0dp" app:contentInsetStartWithNavigation="0dp" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption" app:titleMargin="0dp" app:titleMarginStart="0dp" diff --git a/app/src/main/res/layout-land/fragment_classic_player.xml b/app/src/main/res/layout-land/fragment_classic_player.xml index bc90d71c0..ed62cba95 100644 --- a/app/src/main/res/layout-land/fragment_classic_player.xml +++ b/app/src/main/res/layout-land/fragment_classic_player.xml @@ -18,7 +18,9 @@ + android:background="@android:color/transparent" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:cardUseCompatPadding="false" + sothree:cardCornerRadius="12dp"> @@ -119,8 +119,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml index 0f7d0a884..fb90a778b 100644 --- a/app/src/main/res/layout-land/fragment_flat_player.xml +++ b/app/src/main/res/layout-land/fragment_flat_player.xml @@ -63,8 +63,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml index de85301e1..29e32b704 100644 --- a/app/src/main/res/layout-land/fragment_plain_player.xml +++ b/app/src/main/res/layout-land/fragment_plain_player.xml @@ -105,8 +105,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml index ee835e887..b60676ba6 100755 --- a/app/src/main/res/layout-land/fragment_player.xml +++ b/app/src/main/res/layout-land/fragment_player.xml @@ -67,8 +67,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml index 8883e93a5..d1e6a8eff 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml @@ -73,10 +73,10 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_height="48dp" - android:navigationIcon="@drawable/ic_close_white_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:navigationIcon="@drawable/ic_close_white_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge-land/fragment_player.xml b/app/src/main/res/layout-xlarge-land/fragment_player.xml index 6fdce2d4d..54c4a0a8d 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_player.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml @@ -66,7 +66,8 @@ android:id="@+id/playerToolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:navigationIcon="@drawable/ic_close_white_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml index 83fed9529..30c1da40c 100644 --- a/app/src/main/res/layout-xlarge/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge/fragment_blur.xml @@ -81,8 +81,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_height="48dp" - android:navigationIcon="@drawable/ic_close_white_24dp" - app:navigationIcon="@drawable/ic_close_white_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml index 1d6d7a61f..7d0fa653e 100644 --- a/app/src/main/res/layout-xlarge/fragment_player.xml +++ b/app/src/main/res/layout-xlarge/fragment_player.xml @@ -64,8 +64,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml index 4f318abfe..2a4f05a96 100644 --- a/app/src/main/res/layout/fragment_blur.xml +++ b/app/src/main/res/layout/fragment_blur.xml @@ -75,8 +75,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_height="48dp" - android:navigationIcon="@drawable/ic_close_white_24dp" - app:navigationIcon="@drawable/ic_close_white_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml index 37f33a7c3..3ba425f4a 100644 --- a/app/src/main/res/layout/fragment_card_blur_player.xml +++ b/app/src/main/res/layout/fragment_card_blur_player.xml @@ -54,7 +54,7 @@ app:contentInsetLeft="0dp" app:contentInsetStart="0dp" app:contentInsetStartWithNavigation="0dp" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption" app:titleMargin="0dp" app:titleMarginStart="0dp" diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml index f044916e1..e1fda8790 100644 --- a/app/src/main/res/layout/fragment_classic_player.xml +++ b/app/src/main/res/layout/fragment_classic_player.xml @@ -76,7 +76,9 @@ + android:background="@android:color/transparent" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> @@ -100,9 +102,9 @@ sothree:cardCornerRadius="12dp"> + android:layout_height="wrap_content" + android:background="?cardBackgroundColor"> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml index 0c40f1730..ee08b3641 100644 --- a/app/src/main/res/layout/fragment_fit.xml +++ b/app/src/main/res/layout/fragment_fit.xml @@ -48,8 +48,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_close_white_24dp" - app:navigationIcon="@drawable/ic_close_white_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml index c1027662e..9ee1a7ed5 100644 --- a/app/src/main/res/layout/fragment_flat_player.xml +++ b/app/src/main/res/layout/fragment_flat_player.xml @@ -40,8 +40,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index ea7253fb6..9725f6d3c 100644 --- a/app/src/main/res/layout/fragment_plain_player.xml +++ b/app/src/main/res/layout/fragment_plain_player.xml @@ -92,8 +92,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 9d992988b..6f8c6f003 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -72,8 +72,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_close_white_24dp" - app:navigationIcon="@drawable/ic_close_white_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml index ee29910fd..8751abfbd 100644 --- a/app/src/main/res/layout/fragment_simple_player.xml +++ b/app/src/main/res/layout/fragment_simple_player.xml @@ -27,7 +27,6 @@ - @@ -61,8 +60,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml index 13d965e77..0cb2dc056 100644 --- a/app/src/main/res/layout/fragment_tiny_player.xml +++ b/app/src/main/res/layout/fragment_tiny_player.xml @@ -101,7 +101,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />