From 2054f712be36aac3bbe7fd8fe8810949a6aff956 Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 16 Jun 2021 13:17:43 +0900 Subject: [PATCH] small code refactor within player fragments --- .../fragments/player/card/CardPlayerFragment.java | 9 +++------ .../fragments/player/flat/FlatPlayerFragment.java | 6 +----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java index 0f6744d3..078b3795 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java @@ -305,18 +305,15 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) { switch (newState) { case COLLAPSED: - onPanelCollapsed(panel); + resetToCurrentPosition(); break; case ANCHORED: - binding.playerSlidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); // this fixes a bug where the panel would get stuck for some reason + // this fixes a bug where the panel would get stuck for some reason + binding.playerSlidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); break; } } - public void onPanelCollapsed(View panel) { - resetToCurrentPosition(); - } - private void resetToCurrentPosition() { binding.playerRecyclerView.stopScroll(); layoutManager.scrollToPositionWithOffset(MusicPlayerRemote.getPosition() + 1, 0); diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java index 244d5bf2..4fb7ee8b 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java @@ -303,7 +303,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) { switch (newState) { case COLLAPSED: - onPanelCollapsed(panel); + resetToCurrentPosition(); break; case ANCHORED: // this fixes a bug where the panel would get stuck for some reason @@ -312,10 +312,6 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum } } - public void onPanelCollapsed(View panel) { - resetToCurrentPosition(); - } - private void resetToCurrentPosition() { binding.playerRecyclerView.stopScroll(); layoutManager.scrollToPositionWithOffset(MusicPlayerRemote.getPosition() + 1, 0);