diff --git a/app/build.gradle b/app/build.gradle index e95b01b2c..c4616f9bd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 428 + versionCode 429 versionName '3.5.300' multiDexEnabled true diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt index 814aaa8a6..97cba4120 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt @@ -257,7 +257,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), Tiny -> TinyPlayerFragment() Peak -> PeakPlayerFragment() Circle -> CirclePlayerFragment() - Classic -> ClassicPlayerFragment() + //Classic -> ClassicPlayerFragment() else -> PlayerFragment() } // must implement AbsPlayerFragment supportFragmentManager.beginTransaction() @@ -325,9 +325,9 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), super.setNavigationbarColor(paletteColor) super.setLightNavigationBar(isColorLight) super.setLightStatusbar(false) - } else if (cps == Classic ) { + } /*else if (cps == Classic ) { super.setLightStatusbar(false) - } else if (cps == Fit) { + }*/ else if (cps == Fit) { super.setLightStatusbar(false) } else { super.setLightStatusbar( 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 bd50b2968..86437a799 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 @@ -83,9 +83,9 @@ class AlbumCoverPagerAdapter( ): View? { val view = inflater.inflate(getLayoutWithPlayerTheme(), container, false) albumCover = view.findViewById(R.id.player_image) - /*albumCover.setOnClickListener { + albumCover.setOnClickListener { NavigationUtil.goToLyrics(requireActivity()) - }*/ + } return view } @@ -94,7 +94,7 @@ class AlbumCoverPagerAdapter( Card, Fit, Tiny, - Classic, + //Classic, Full -> R.layout.fragment_album_full_cover else -> { if (PreferenceUtil.getInstance(requireContext()).carouselEffect() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt index 0463d1b25..646f5c192 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt @@ -16,7 +16,7 @@ enum class NowPlayingScreen constructor( BlurCard(R.string.blur_card, R.drawable.np_blur_card, 9), Card(R.string.card, R.drawable.np_card, 6), Circle(R.string.circle, R.drawable.np_minimalistic_circle, 15), - Classic(R.string.classic, R.drawable.np_classic, 16), + //Classic(R.string.classic, R.drawable.np_classic, 16), Color(R.string.color, R.drawable.np_color, 5), Fit(R.string.fit, R.drawable.np_fit, 12), Flat(R.string.flat, R.drawable.np_flat, 1), 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 bf7116c82..e17990522 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 @@ -51,7 +51,7 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChan val ratio = metrics.heightPixels.toFloat() / metrics.widthPixels.toFloat() - if (nps == Full || nps == Classic || nps == Fit) { + if (nps == Full || /*nps == Classic ||*/ nps == Fit) { viewPager.offscreenPageLimit = 2 } else if (PreferenceUtil.getInstance(requireContext()).carouselEffect()) { viewPager.clipToPadding = false