diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt index b1f380546..c5a93257e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt @@ -127,8 +127,7 @@ class AlbumCoverPagerAdapter( setTitle(song.title) setMessage(if (data.isNullOrEmpty()) "No lyrics found" else data) setNegativeButton(R.string.synced_lyrics) { _, _ -> - - goToLyrics(requireActivity()) + goToLyrics(requireActivity()) } show() } @@ -139,6 +138,7 @@ class AlbumCoverPagerAdapter( private fun getLayoutWithPlayerTheme(): Int { return when (PreferenceUtil.nowPlayingScreen) { Card, Fit, Tiny, Classic, Gradient, Full -> R.layout.fragment_album_full_cover + Peak -> R.layout.fragment_peak_album_cover else -> { if (PreferenceUtil.isCarouselEffect) { R.layout.fragment_album_carousel_cover diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt index 9a638e1fe..52770d3ec 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt @@ -83,10 +83,6 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) _binding = FragmentArtistDetailsBinding.bind(view) - } - - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) setHasOptionsMenu(true) mainActivity.addMusicServiceEventListener(detailsViewModel) mainActivity.setSupportActionBar(binding.toolbar) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt index b63fc6dc9..2fcc11b57 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt @@ -46,12 +46,12 @@ import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity import code.name.monkey.retromusic.db.PlaylistEntity -import code.name.monkey.retromusic.db.SongEntity import code.name.monkey.retromusic.db.toSongEntity import code.name.monkey.retromusic.dialogs.* import code.name.monkey.retromusic.extensions.currentFragment import code.name.monkey.retromusic.extensions.hide import code.name.monkey.retromusic.extensions.whichFragment +import code.name.monkey.retromusic.fragments.NowPlayingScreen import code.name.monkey.retromusic.fragments.ReloadType import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -325,7 +325,12 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme requireView() ) ) - playerToolbar()?.menu?.findItem(R.id.action_toggle_lyrics)?.let { showLyricsIcon(it) } + val nps = PreferenceUtil.nowPlayingScreen + if (nps == NowPlayingScreen.Circle || nps == NowPlayingScreen.Peak || nps == NowPlayingScreen.Tiny) { + playerToolbar()?.menu?.removeItem(R.id.action_toggle_lyrics) + } else { + playerToolbar()?.menu?.findItem(R.id.action_toggle_lyrics)?.let { showLyricsIcon(it) } + } } class SwipeDetector(val context: Context, val viewPager: ViewPager?, val view: View) : diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt index bce83d767..e75ab76cb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt @@ -210,6 +210,10 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe progressViewUpdateHelper = MusicProgressViewUpdateHelper(this, 500, 1000) // Don't show lyrics container for below conditions if (!(nps == Circle || nps == Peak || nps == Tiny || !PreferenceUtil.showLyrics)) { + lyricsLayout.isVisible = false + progressViewUpdateHelper?.stop() + } else { + lyricsLayout.isVisible = true progressViewUpdateHelper?.start() } // Go to lyrics activity when clicked lyrics @@ -259,10 +263,18 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) { if (key == SHOW_LYRICS) { if (sharedPreferences.getBoolean(key, false)) { - progressViewUpdateHelper?.start() - lyricsLayout.animate().alpha(1f).duration = - AbsPlayerFragment.VISIBILITY_ANIM_DURATION - binding.playerLyrics.isVisible = true + val nps = PreferenceUtil.nowPlayingScreen + // Don't show lyrics container for below conditions + if (!(nps == Circle || nps == Peak || nps == Tiny || !PreferenceUtil.showLyrics)) { + lyricsLayout.isVisible = false + progressViewUpdateHelper?.stop() + } else { + lyricsLayout.isVisible = true + progressViewUpdateHelper?.start() + lyricsLayout.animate().alpha(1f).duration = + AbsPlayerFragment.VISIBILITY_ANIM_DURATION + binding.playerLyrics.isVisible = true + } } else { progressViewUpdateHelper?.stop() lyricsLayout.animate().alpha(0f) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt index c2ed05b62..0fed00883 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt @@ -21,10 +21,7 @@ import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.FragmentPeakPlayerBinding -import code.name.monkey.retromusic.extensions.drawAboveSystemBars -import code.name.monkey.retromusic.extensions.getSongInfo -import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.show +import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.base.goToAlbum import code.name.monkey.retromusic.fragments.base.goToArtist @@ -57,7 +54,7 @@ class PeakPlayerFragment : AbsPlayerFragment(R.layout.fragment_peak_player) { binding.text.setOnClickListener { goToArtist(requireActivity()) } - binding.root.drawAboveSystemBars() + binding.root.drawAboveSystemBarsWithPadding() } private fun setUpSubFragments() { diff --git a/app/src/main/res/layout/fragment_peak_album_cover.xml b/app/src/main/res/layout/fragment_peak_album_cover.xml new file mode 100644 index 000000000..c0863e579 --- /dev/null +++ b/app/src/main/res/layout/fragment_peak_album_cover.xml @@ -0,0 +1,28 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_peak_player.xml b/app/src/main/res/layout/fragment_peak_player.xml index 9fa465015..b332f0343 100644 --- a/app/src/main/res/layout/fragment_peak_player.xml +++ b/app/src/main/res/layout/fragment_peak_player.xml @@ -107,7 +107,7 @@ android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/songInfo" + app:layout_constraintTop_toBottomOf="@+id/playerAlbumCoverFragment" tools:layout="@layout/fragment_peak_control_player" /> \ No newline at end of file