From 5b211b05778acbe96d4e60254e88421c48c4d2b6 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sat, 6 Mar 2021 15:58:58 +0900
Subject: [PATCH] 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 @@
 
         <SeekBar
             android:id="@+id/player_progress_slider"
-            style="@style/MusicProgressSlider"
             android:layout_height="match_parent"
             android:layout_toStartOf="@id/player_song_total_time"
-            android:layout_toEndOf="@id/player_song_current_progress" />
+            android:layout_toEndOf="@id/player_song_current_progress"
+            style="@style/MusicProgressSlider" />
 
     </RelativeLayout>
 
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 @@
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/progress_bar"
-        style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
         android:layout_width="match_parent"
-        android:layout_height="3dp"
+        android:layout_height="4dp"
         android:layout_gravity="bottom"
         app:mpb_progressStyle="horizontal"
-        app:mpb_useIntrinsicPadding="false" />
+        app:mpb_useIntrinsicPadding="false"
+        style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" />
 
 </FrameLayout>