From 8485bd3f8c06235459df88c0981bd2e21f71ffae Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 21 Feb 2021 12:07:29 +0900 Subject: [PATCH 1/4] fix some ide warnings --- .../main/res/layout/activity_album_detail.xml | 4 +-- .../res/layout/activity_artist_detail.xml | 8 ++--- app/src/main/res/layout/card_about_app.xml | 6 ++-- app/src/main/res/layout/card_author.xml | 12 +++++--- .../res/layout/card_support_development.xml | 5 +++- ...fragment_card_player_playback_controls.xml | 30 +++++++++---------- ...fragment_flat_player_playback_controls.xml | 9 +++--- app/src/main/res/layout/item_grid.xml | 2 +- .../res/layout/item_grid_card_horizontal.xml | 2 +- 9 files changed, 42 insertions(+), 36 deletions(-) diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml index 1033de3d..8175928a 100644 --- a/app/src/main/res/layout/activity_album_detail.xml +++ b/app/src/main/res/layout/activity_album_detail.xml @@ -52,7 +52,7 @@ android:scaleType="centerCrop" android:src="@drawable/default_album_art" android:transitionName="@string/transition_album_image" - tools:ignore="ContentDescription,UnusedAttribute" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="RtlSymmetry" + tools:text="0:00" /> + tools:ignore="RtlSymmetry" + tools:text="4:00" /> + tools:ignore="RtlHardcoded" /> @@ -55,7 +57,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/fab_media_controller_container_height" android:layoutDirection="ltr" - tools:ignore="ContentDescription,UnusedAttribute"> + tools:ignore="ContentDescription"> + app:srcCompat="@drawable/ic_skip_previous_white_24dp" /> + app:srcCompat="@drawable/ic_skip_next_white_24dp" /> + app:srcCompat="@drawable/ic_repeat_white_24dp" /> + app:srcCompat="@drawable/ic_shuffle_white_24dp" /> + android:layout_toEndOf="@id/player_song_current_progress" /> diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml index f4917266..1ca49c7d 100644 --- a/app/src/main/res/layout/item_grid.xml +++ b/app/src/main/res/layout/item_grid.xml @@ -12,7 +12,7 @@ android:layout_height="match_parent" android:gravity="center" android:orientation="vertical" - tools:ignore="UnusedAttribute,UselessParent"> + tools:ignore="UselessParent"> + tools:ignore="ContentDescription" /> Date: Sun, 21 Feb 2021 12:20:16 +0900 Subject: [PATCH 2/4] fix more ide warnings in xml files --- .../main/res/layout/activity_album_detail.xml | 6 ++--- app/src/main/res/layout/card_about_app.xml | 3 +-- .../res/layout/card_support_development.xml | 7 +++--- .../main/res/layout/dialog_file_details.xml | 4 +--- .../main/res/layout/fragment_album_cover.xml | 2 +- ...fragment_card_player_playback_controls.xml | 3 +-- ...fragment_flat_player_playback_controls.xml | 23 ++++++++----------- app/src/main/res/menu/menu_main.xml | 3 +-- 8 files changed, 21 insertions(+), 30 deletions(-) diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml index 8175928a..e5a0d138 100644 --- a/app/src/main/res/layout/activity_album_detail.xml +++ b/app/src/main/res/layout/activity_album_detail.xml @@ -105,7 +105,7 @@ android:layout_marginEnd="8dp" android:layout_marginStart="0dp" app:srcCompat="@drawable/ic_music_note_white_24dp" - tools:ignore="ContentDescription,UnusedAttribute" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:text="1.0.0" /> diff --git a/app/src/main/res/layout/card_support_development.xml b/app/src/main/res/layout/card_support_development.xml index 3b1750f2..bd258c43 100644 --- a/app/src/main/res/layout/card_support_development.xml +++ b/app/src/main/res/layout/card_support_development.xml @@ -32,6 +32,7 @@ android:layout_height="wrap_content" android:background="?attr/rectSelector" android:clickable="true" + android:focusable="true" android:gravity="center_vertical" android:minHeight="@dimen/md_listitem_height" android:orientation="horizontal" @@ -88,7 +89,7 @@ android:layout_width="24dp" android:layout_height="24dp" app:srcCompat="@drawable/ic_flag_white_24dp" - tools:ignore="ContentDescription,UnusedAttribute" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" /> + android:orientation="vertical"> + tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml index d8887091..f11f61c2 100644 --- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml @@ -47,8 +47,7 @@ style="@style/MusicProgressSlider" android:layout_height="match_parent" android:layout_toStartOf="@id/player_song_total_time" - android:layout_toEndOf="@id/player_song_current_progress" - tools:ignore="RtlHardcoded" /> + android:layout_toEndOf="@id/player_song_current_progress" /> diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml index 24fa955a..330debb4 100644 --- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml @@ -18,13 +18,13 @@ android:layout_height="match_parent" android:layout_alignParentStart="true" android:fontFamily="sans-serif-medium" - android:gravity="center_vertical|left|end" - android:paddingLeft="8dp" + android:gravity="center_vertical|start" + android:paddingStart="8dp" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Title" android:textColor="@color/ate_primary_text_dark" android:textSize="12sp" - tools:ignore="RtlHardcoded,RtlSymmetry" + tools:ignore="RtlSymmetry" tools:text="0:00" /> + tools:text="4:00" /> + tools:ignore="ContentDescription"> + app:srcCompat="@drawable/ic_skip_previous_white_24dp" /> + app:srcCompat="@drawable/ic_skip_next_white_24dp" /> + app:srcCompat="@drawable/ic_repeat_white_24dp" /> + app:srcCompat="@drawable/ic_shuffle_white_24dp" /> diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index a0c3a120..65f0f38b 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -21,8 +21,7 @@ + android:checkableBehavior="single"> From 376332bed95bcb2b493f87f4cf093a6fa763d294 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 26 Feb 2021 12:13:57 +0900 Subject: [PATCH 3/4] 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(); From 5b211b05778acbe96d4e60254e88421c48c4d2b6 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 6 Mar 2021 15:58:58 +0900 Subject: [PATCH 4/4] refactor some style properties --- .../gramophone/fragments/player/MiniPlayerFragment.java | 2 ++ .../player/card/CardPlayerPlaybackControlsFragment.java | 1 + .../player/flat/FlatPlayerPlaybackControlsFragment.java | 2 ++ .../java/com/dkanada/gramophone/service/MusicService.java | 2 +- .../res/layout/fragment_card_player_playback_controls.xml | 4 ++-- app/src/main/res/layout/fragment_mini_player.xml | 8 ++++---- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/MiniPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/MiniPlayerFragment.java index ad3dae51..994f86de 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/MiniPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/MiniPlayerFragment.java @@ -55,11 +55,13 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music private void setUpMiniPlayer() { setUpPlayPauseButton(); + binding.progressBar.setProgressTintList(ColorStateList.valueOf(ThemeStore.accentColor(requireActivity()))); } private void setUpPlayPauseButton() { miniPlayerPlayPauseDrawable = new PlayPauseDrawable(requireActivity()); + binding.miniPlayerPlayPauseButton.setImageDrawable(miniPlayerPlayPauseDrawable); binding.miniPlayerPlayPauseButton.setColorFilter(ATHUtil.resolveColor(requireActivity(), R.attr.iconColor, ThemeStore.textColorSecondary(requireActivity())), PorterDuff.Mode.SRC_IN); binding.miniPlayerPlayPauseButton.setOnClickListener(new PlayPauseButtonOnClickHandler()); 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 7682aa3b..8e68037f 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 @@ -229,6 +229,7 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment public void onUpdateProgressViews(int progress, int total) { binding.playerProgressSlider.setMax(total); binding.playerProgressSlider.setProgress(progress); + binding.playerSongTotalTime.setText(MusicUtil.getReadableDurationString(total)); binding.playerSongCurrentProgress.setText(MusicUtil.getReadableDurationString(progress)); } 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 c1c7f3df..c9865984 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 @@ -222,6 +222,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } else { musicControllerAnimationSet.cancel(); } + musicControllerAnimationSet.start(); } @@ -283,6 +284,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment public void onUpdateProgressViews(int progress, int total) { binding.playerProgressSlider.setMax(total); binding.playerProgressSlider.setProgress(progress); + binding.playerSongTotalTime.setText(MusicUtil.getReadableDurationString(total)); binding.playerSongCurrentProgress.setText(MusicUtil.getReadableDurationString(progress)); } diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java index 7d1cf37c..b470a15e 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java +++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java @@ -1287,7 +1287,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP info.setPositionTicks(progress * 10000); if (task != null) task.cancel(true); - executorService.shutdownNow(); + if (executorService != null) executorService.shutdownNow(); } } } diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml index f11f61c2..580bd68b 100644 --- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml @@ -44,10 +44,10 @@ + android:layout_toEndOf="@id/player_song_current_progress" + style="@style/MusicProgressSlider" /> diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml index 25d54e80..93bde406 100644 --- a/app/src/main/res/layout/fragment_mini_player.xml +++ b/app/src/main/res/layout/fragment_mini_player.xml @@ -6,7 +6,7 @@ android:layout_height="@dimen/mini_player_height" android:background="?cardBackgroundColor" android:clickable="true" - android:focusable="false" + android:focusable="true" android:transitionName="@string/transition_mini_player" tools:ignore="UnusedAttribute"> @@ -49,11 +49,11 @@ + app:mpb_useIntrinsicPadding="false" + style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" />