From 1b3efb515c08846578bea94f66f35390c71dd161 Mon Sep 17 00:00:00 2001 From: MitchellWT Date: Mon, 13 Sep 2021 19:56:50 +1000 Subject: [PATCH 1/3] Added check for slide value --- .../gramophone/fragments/player/card/CardPlayerFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 1759192a..96304ff9 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 @@ -292,7 +292,8 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum @Override public void onPanelSlide(View view, float slide) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP + && !(Float.isInfinite(slide) || Float.isNaN(slide))) { float density = getResources().getDisplayMetrics().density; binding.playingQueueCard.setCardElevation((6 * slide + 2) * density); playbackControlsFragment.binding.playerPlayPauseFab.setElevation((2 * Math.max(0, (1 - (slide * 16))) + 2) * density); From 05ecc3b289385c0329201f793e74f8c6267bae2c Mon Sep 17 00:00:00 2001 From: MitchellWT Date: Mon, 4 Oct 2021 13:38:34 +1100 Subject: [PATCH 2/3] Formatted 'if' statement and added commenting --- .../gramophone/fragments/player/card/CardPlayerFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 96304ff9..04d59ed6 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 @@ -292,8 +292,8 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum @Override public void onPanelSlide(View view, float slide) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP - && !(Float.isInfinite(slide) || Float.isNaN(slide))) { + // the isInfinite and isNan check fixes a bug where the app crashes dues to an invalid slide value + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !Float.isInfinite(slide) && !Float.isNaN(slide)) { float density = getResources().getDisplayMetrics().density; binding.playingQueueCard.setCardElevation((6 * slide + 2) * density); playbackControlsFragment.binding.playerPlayPauseFab.setElevation((2 * Math.max(0, (1 - (slide * 16))) + 2) * density); From f80adf610329025a5eb9d82012aedcfde52130cb Mon Sep 17 00:00:00 2001 From: MitchellWT <60099557+MitchellWT@users.noreply.github.com> Date: Tue, 5 Oct 2021 11:26:29 +1100 Subject: [PATCH 3/3] Update app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java Co-authored-by: dkanada --- .../gramophone/fragments/player/card/CardPlayerFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 04d59ed6..13f5b2be 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 @@ -292,7 +292,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum @Override public void onPanelSlide(View view, float slide) { - // the isInfinite and isNan check fixes a bug where the app crashes dues to an invalid slide value + // the isInfinite and isNan check fixes a bug where the app crashes due to an invalid slide value if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !Float.isInfinite(slide) && !Float.isNaN(slide)) { float density = getResources().getDisplayMetrics().density; binding.playingQueueCard.setCardElevation((6 * slide + 2) * density);