From 376332bed95bcb2b493f87f4cf093a6fa763d294 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 26 Feb 2021 12:13:57 +0900 Subject: [PATCH] refactor some code to fix ide warnings --- .../fragments/player/AbsPlayerFragment.java | 3 ++- .../player/PlayerAlbumCoverFragment.java | 5 ++-- .../CardPlayerPlaybackControlsFragment.java | 24 +++++++++---------- .../FlatPlayerPlaybackControlsFragment.java | 18 +++++++------- .../gramophone/glide/BlurTransformation.java | 6 ++--- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java index 980c841e..009e806b 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java @@ -4,6 +4,7 @@ import android.content.Context; import android.view.MenuItem; import android.view.View; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; @@ -28,7 +29,7 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen private Callbacks callbacks; @Override - public void onAttach(Context context) { + public void onAttach(@NonNull Context context) { super.onAttach(context); try { callbacks = (Callbacks) context; diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java index d89b1673..431e8cb5 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/PlayerAlbumCoverFragment.java @@ -50,6 +50,7 @@ public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements callbacks.onToolbarToggled(); return true; } + return super.onSingleTapConfirmed(e); } }); @@ -122,8 +123,8 @@ public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements binding.playerFavoriteIcon.setScaleX(0f); binding.playerFavoriteIcon.setScaleY(0f); binding.playerFavoriteIcon.setVisibility(View.VISIBLE); - binding.playerFavoriteIcon.setPivotX(binding.playerFavoriteIcon.getWidth() / 2); - binding.playerFavoriteIcon.setPivotY(binding.playerFavoriteIcon.getHeight() / 2); + binding.playerFavoriteIcon.setPivotX(binding.playerFavoriteIcon.getWidth() / 2f); + binding.playerFavoriteIcon.setPivotY(binding.playerFavoriteIcon.getHeight() / 2f); binding.playerFavoriteIcon.animate() .setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME / 2) diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java index 27ca838e..7682aa3b 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java @@ -50,7 +50,7 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } @Override - public void onViewCreated(View view, Bundle savedInstanceState) { + public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); setUpMusicControllers(); updateProgressTextColor(); @@ -97,11 +97,11 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment public void setDark(boolean dark) { if (dark) { - lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(getActivity(), true); - lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(getActivity(), true); + lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireActivity(), true); + lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireActivity(), true); } else { - lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(getActivity(), false); - lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(getActivity(), false); + lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireActivity(), false); + lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireActivity(), false); } updateRepeatState(); @@ -114,16 +114,14 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment final int fabColor = Color.WHITE; TintHelper.setTintAuto(binding.playerPlayPauseFab, fabColor, true); - playerFabPlayPauseDrawable = new PlayPauseDrawable(getActivity()); + playerFabPlayPauseDrawable = new PlayPauseDrawable(requireActivity()); binding.playerPlayPauseFab.setImageDrawable(playerFabPlayPauseDrawable); // Note: set the drawable AFTER TintHelper.setTintAuto() was called - binding.playerPlayPauseFab.setColorFilter(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN); + binding.playerPlayPauseFab.setColorFilter(MaterialValueHelper.getPrimaryTextColor(requireContext(), ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN); binding.playerPlayPauseFab.setOnClickListener(new PlayPauseButtonOnClickHandler()); binding.playerPlayPauseFab.post(() -> { - if (binding.playerPlayPauseFab != null) { - binding.playerPlayPauseFab.setPivotX(binding.playerPlayPauseFab.getWidth() / 2); - binding.playerPlayPauseFab.setPivotY(binding.playerPlayPauseFab.getHeight() / 2); - } + binding.playerPlayPauseFab.setPivotX(binding.playerPlayPauseFab.getWidth() / 2f); + binding.playerPlayPauseFab.setPivotY(binding.playerPlayPauseFab.getHeight() / 2f); }); } @@ -150,7 +148,7 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } private void updateProgressTextColor() { - int color = MaterialValueHelper.getPrimaryTextColor(getContext(), false); + int color = MaterialValueHelper.getPrimaryTextColor(requireContext(), false); binding.playerSongTotalTime.setTextColor(color); binding.playerSongCurrentProgress.setTextColor(color); } @@ -212,7 +210,7 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } private void setUpProgressSlider() { - int color = MaterialValueHelper.getPrimaryTextColor(getContext(), false); + int color = MaterialValueHelper.getPrimaryTextColor(requireContext(), false); binding.playerProgressSlider.getThumb().mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN); binding.playerProgressSlider.getProgressDrawable().mutate().setColorFilter(Color.TRANSPARENT, PorterDuff.Mode.SRC_IN); diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java index 2a7fee35..c1c7f3df 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java @@ -105,11 +105,11 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment public void setDark(boolean dark) { if (dark) { - lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(getActivity(), true); - lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(getActivity(), true); + lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireActivity(), true); + lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireActivity(), true); } else { - lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(getActivity(), false); - lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(getActivity(), false); + lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireActivity(), false); + lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireActivity(), false); } updateRepeatState(); @@ -120,13 +120,13 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } private void setUpPlayPauseButton() { - playPauseDrawable = new PlayPauseDrawable(getActivity()); + playPauseDrawable = new PlayPauseDrawable(requireActivity()); binding.playerPlayPauseButton.setImageDrawable(playPauseDrawable); updatePlayPauseColor(); binding.playerPlayPauseButton.setOnClickListener(new PlayPauseButtonOnClickHandler()); binding.playerPlayPauseButton.post(() -> { - binding.playerPlayPauseButton.setPivotX(binding.playerPlayPauseButton.getWidth() / 2); - binding.playerPlayPauseButton.setPivotY(binding.playerPlayPauseButton.getHeight() / 2); + binding.playerPlayPauseButton.setPivotX(binding.playerPlayPauseButton.getWidth() / 2f); + binding.playerPlayPauseButton.setPivotY(binding.playerPlayPauseButton.getHeight() / 2f); }); } @@ -153,7 +153,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } private void updateProgressTextColor() { - int color = MaterialValueHelper.getPrimaryTextColor(getContext(), false); + int color = MaterialValueHelper.getPrimaryTextColor(requireContext(), false); binding.playerSongTotalTime.setTextColor(color); binding.playerSongCurrentProgress.setTextColor(color); } @@ -264,7 +264,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } private void setUpProgressSlider() { - int color = MaterialValueHelper.getPrimaryTextColor(getContext(), false); + int color = MaterialValueHelper.getPrimaryTextColor(requireContext(), false); binding.playerProgressSlider.getThumb().mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN); binding.playerProgressSlider.getProgressDrawable().mutate().setColorFilter(Color.TRANSPARENT, PorterDuff.Mode.SRC_IN); diff --git a/app/src/main/java/com/dkanada/gramophone/glide/BlurTransformation.java b/app/src/main/java/com/dkanada/gramophone/glide/BlurTransformation.java index a9ec36ee..97c608ae 100644 --- a/app/src/main/java/com/dkanada/gramophone/glide/BlurTransformation.java +++ b/app/src/main/java/com/dkanada/gramophone/glide/BlurTransformation.java @@ -21,9 +21,9 @@ import java.security.MessageDigest; public class BlurTransformation extends BitmapTransformation { public static final float DEFAULT_BLUR_RADIUS = 5f; - private Context context; - private float blurRadius; - private int sampling; + private final Context context; + private final float blurRadius; + private final int sampling; private BlurTransformation(Builder builder) { super();