refactor some style properties
This commit is contained in:
parent
376332bed9
commit
5b211b0577
6 changed files with 12 additions and 7 deletions
|
|
@ -55,11 +55,13 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
|
||||||
|
|
||||||
private void setUpMiniPlayer() {
|
private void setUpMiniPlayer() {
|
||||||
setUpPlayPauseButton();
|
setUpPlayPauseButton();
|
||||||
|
|
||||||
binding.progressBar.setProgressTintList(ColorStateList.valueOf(ThemeStore.accentColor(requireActivity())));
|
binding.progressBar.setProgressTintList(ColorStateList.valueOf(ThemeStore.accentColor(requireActivity())));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setUpPlayPauseButton() {
|
private void setUpPlayPauseButton() {
|
||||||
miniPlayerPlayPauseDrawable = new PlayPauseDrawable(requireActivity());
|
miniPlayerPlayPauseDrawable = new PlayPauseDrawable(requireActivity());
|
||||||
|
|
||||||
binding.miniPlayerPlayPauseButton.setImageDrawable(miniPlayerPlayPauseDrawable);
|
binding.miniPlayerPlayPauseButton.setImageDrawable(miniPlayerPlayPauseDrawable);
|
||||||
binding.miniPlayerPlayPauseButton.setColorFilter(ATHUtil.resolveColor(requireActivity(), R.attr.iconColor, ThemeStore.textColorSecondary(requireActivity())), PorterDuff.Mode.SRC_IN);
|
binding.miniPlayerPlayPauseButton.setColorFilter(ATHUtil.resolveColor(requireActivity(), R.attr.iconColor, ThemeStore.textColorSecondary(requireActivity())), PorterDuff.Mode.SRC_IN);
|
||||||
binding.miniPlayerPlayPauseButton.setOnClickListener(new PlayPauseButtonOnClickHandler());
|
binding.miniPlayerPlayPauseButton.setOnClickListener(new PlayPauseButtonOnClickHandler());
|
||||||
|
|
|
||||||
|
|
@ -229,6 +229,7 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
|
||||||
public void onUpdateProgressViews(int progress, int total) {
|
public void onUpdateProgressViews(int progress, int total) {
|
||||||
binding.playerProgressSlider.setMax(total);
|
binding.playerProgressSlider.setMax(total);
|
||||||
binding.playerProgressSlider.setProgress(progress);
|
binding.playerProgressSlider.setProgress(progress);
|
||||||
|
|
||||||
binding.playerSongTotalTime.setText(MusicUtil.getReadableDurationString(total));
|
binding.playerSongTotalTime.setText(MusicUtil.getReadableDurationString(total));
|
||||||
binding.playerSongCurrentProgress.setText(MusicUtil.getReadableDurationString(progress));
|
binding.playerSongCurrentProgress.setText(MusicUtil.getReadableDurationString(progress));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -222,6 +222,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
|
||||||
} else {
|
} else {
|
||||||
musicControllerAnimationSet.cancel();
|
musicControllerAnimationSet.cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
musicControllerAnimationSet.start();
|
musicControllerAnimationSet.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -283,6 +284,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
|
||||||
public void onUpdateProgressViews(int progress, int total) {
|
public void onUpdateProgressViews(int progress, int total) {
|
||||||
binding.playerProgressSlider.setMax(total);
|
binding.playerProgressSlider.setMax(total);
|
||||||
binding.playerProgressSlider.setProgress(progress);
|
binding.playerProgressSlider.setProgress(progress);
|
||||||
|
|
||||||
binding.playerSongTotalTime.setText(MusicUtil.getReadableDurationString(total));
|
binding.playerSongTotalTime.setText(MusicUtil.getReadableDurationString(total));
|
||||||
binding.playerSongCurrentProgress.setText(MusicUtil.getReadableDurationString(progress));
|
binding.playerSongCurrentProgress.setText(MusicUtil.getReadableDurationString(progress));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1287,7 +1287,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
|
||||||
info.setPositionTicks(progress * 10000);
|
info.setPositionTicks(progress * 10000);
|
||||||
|
|
||||||
if (task != null) task.cancel(true);
|
if (task != null) task.cancel(true);
|
||||||
executorService.shutdownNow();
|
if (executorService != null) executorService.shutdownNow();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,10 +44,10 @@
|
||||||
|
|
||||||
<SeekBar
|
<SeekBar
|
||||||
android:id="@+id/player_progress_slider"
|
android:id="@+id/player_progress_slider"
|
||||||
style="@style/MusicProgressSlider"
|
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_toStartOf="@id/player_song_total_time"
|
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>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
android:layout_height="@dimen/mini_player_height"
|
android:layout_height="@dimen/mini_player_height"
|
||||||
android:background="?cardBackgroundColor"
|
android:background="?cardBackgroundColor"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:focusable="false"
|
android:focusable="true"
|
||||||
android:transitionName="@string/transition_mini_player"
|
android:transitionName="@string/transition_mini_player"
|
||||||
tools:ignore="UnusedAttribute">
|
tools:ignore="UnusedAttribute">
|
||||||
|
|
||||||
|
|
@ -49,11 +49,11 @@
|
||||||
|
|
||||||
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
|
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
|
||||||
android:id="@+id/progress_bar"
|
android:id="@+id/progress_bar"
|
||||||
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="3dp"
|
android:layout_height="4dp"
|
||||||
android:layout_gravity="bottom"
|
android:layout_gravity="bottom"
|
||||||
app:mpb_progressStyle="horizontal"
|
app:mpb_progressStyle="horizontal"
|
||||||
app:mpb_useIntrinsicPadding="false" />
|
app:mpb_useIntrinsicPadding="false"
|
||||||
|
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" />
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue