tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor some style properties

Browse source
This commit is contained in:
dkanada 2021-03-06 15:58:58 +09:00
commit 5b211b0577
6 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/dkanada/gramophone/fragments/player/MiniPlayerFragment.java
View file

@ -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());

1
app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java
View file

@ -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));
}

2
app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java
View file

@ -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));
}

2
app/src/main/java/com/dkanada/gramophone/service/MusicService.java
View file

@ -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();
}
}
}

4
app/src/main/res/layout/fragment_card_player_playback_controls.xml
View file

@ -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>

8
app/src/main/res/layout/fragment_mini_player.xml
View file

@ -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>