From 6d0b511c52419cc457af1916a855480a85ca1bf6 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Mon, 28 Oct 2019 22:38:09 +0530 Subject: [PATCH] Removed animation --- .../retromusic/adapter/album/AlbumCoverPagerAdapter.kt | 5 ++--- .../monkey/retromusic/fragments/base/AbsPlayerFragment.kt | 2 +- .../retromusic/fragments/player/peak/PeakPlayerFragment.kt | 4 +--- .../code/name/monkey/retromusic/util/NavigationUtil.java | 6 ++---- 4 files changed, 6 insertions(+), 11 deletions(-) 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 761a56e1..0063c06b 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 @@ -1,6 +1,5 @@ package code.name.monkey.retromusic.adapter.album -import android.app.ActivityOptions import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -96,8 +95,8 @@ class AlbumCoverPagerAdapter(fm: FragmentManager, private val dataSet: ArrayList val view = inflater.inflate(finalLayout, container, false) albumCover = view.findViewById(R.id.player_image) albumCover.setOnClickListener { - val options = ActivityOptions.makeSceneTransitionAnimation(requireActivity(), it, getString(R.string.transition_lyrics)) - NavigationUtil.goToLyrics(requireActivity(), options) + + NavigationUtil.goToLyrics(requireActivity()) } return view } 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 74352780..1189df52 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 @@ -109,7 +109,7 @@ abstract class AbsPlayerFragment : AbsMusicServiceFragment(), return true } R.id.action_show_lyrics -> { - NavigationUtil.goToLyrics(requireActivity(), null) + NavigationUtil.goToLyrics(requireActivity()) return true } R.id.action_equalizer -> { 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 88314457..c7d20815 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 @@ -14,7 +14,6 @@ package code.name.monkey.retromusic.fragments.player.peak -import android.app.ActivityOptions import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -50,8 +49,7 @@ class PeakPlayerFragment : AbsPlayerFragment() { setUpSubFragments() title.isSelected = true playerImage.setOnClickListener { - val options = ActivityOptions.makeSceneTransitionAnimation(requireActivity(), it, getString(R.string.transition_lyrics)) - NavigationUtil.goToLyrics(requireActivity(), options) + NavigationUtil.goToLyrics(requireActivity()) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java index 1c16240d..3de177e5 100755 --- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java @@ -23,7 +23,6 @@ import android.media.audiofx.AudioEffect; import android.widget.Toast; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; @@ -117,10 +116,9 @@ public class NavigationUtil { ActivityCompat.startActivity(activity, intent, null); } - public static void goToLyrics(@NonNull Activity activity, - @Nullable ActivityOptions activityOptions) { + public static void goToLyrics(@NonNull Activity activity) { Intent intent = new Intent(activity, LyricsActivity.class); - ActivityCompat.startActivity(activity, intent, activityOptions != null ? activityOptions.toBundle() : null); + ActivityCompat.startActivity(activity, intent, null); } public static void goToGenre(@NonNull Activity activity, @NonNull Genre genre) {