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

Clean ups.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-02-28 16:06:21 +01:00
commit d2f62e868f
1 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

39
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
View file

@ -26,7 +26,6 @@ import com.kabouzeid.gramophone.misc.SimpleOnSeekbarChangeListener;
import com.kabouzeid.gramophone.service.MusicService; import com.kabouzeid.gramophone.service.MusicService;
import com.kabouzeid.gramophone.ui.activities.base.AbsMusicServiceActivity; import com.kabouzeid.gramophone.ui.activities.base.AbsMusicServiceActivity;
import com.kabouzeid.gramophone.util.MusicUtil; import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.views.PlayPauseDrawable; import com.kabouzeid.gramophone.views.PlayPauseDrawable;
import butterknife.Bind; import butterknife.Bind;
@ -160,7 +159,6 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
updateRepeatState(); updateRepeatState();
updateShuffleState(); updateShuffleState();
updatePrevNextColor(); updatePrevNextColor();
updateProgressSliderTint();
updateProgressTextColor(); updateProgressTextColor();
} }
@ -226,10 +224,10 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
} }
private void updatePrevNextColor() { private void updatePrevNextColor() {
nextButton.setImageDrawable(Util.getTintedDrawable(activity, nextButton.setImageResource(R.drawable.ic_skip_next_white_36dp);
R.drawable.ic_skip_next_white_36dp, lastPlaybackControlsColor)); nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
prevButton.setImageDrawable(Util.getTintedDrawable(activity, prevButton.setImageResource(R.drawable.ic_skip_previous_white_36dp);
R.drawable.ic_skip_previous_white_36dp, lastPlaybackControlsColor)); prevButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
} }
private void setUpShuffleButton() { private void setUpShuffleButton() {
@ -245,12 +243,12 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
private void updateShuffleState() { private void updateShuffleState() {
switch (MusicPlayerRemote.getShuffleMode()) { switch (MusicPlayerRemote.getShuffleMode()) {
case MusicService.SHUFFLE_MODE_SHUFFLE: case MusicService.SHUFFLE_MODE_SHUFFLE:
shuffleButton.setImageDrawable(Util.getTintedDrawable(activity, R.drawable.ic_shuffle_white_36dp, shuffleButton.setImageResource(R.drawable.ic_shuffle_white_36dp);
lastPlaybackControlsColor)); shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
break; break;
default: default:
shuffleButton.setImageDrawable(Util.getTintedDrawable(activity, R.drawable.ic_shuffle_white_36dp, shuffleButton.setImageResource(R.drawable.ic_shuffle_white_36dp);
lastDisabledPlaybackControlsColor)); shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
break; break;
} }
} }
@ -267,17 +265,17 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
private void updateRepeatState() { private void updateRepeatState() {
switch (MusicPlayerRemote.getRepeatMode()) { switch (MusicPlayerRemote.getRepeatMode()) {
case MusicService.REPEAT_MODE_NONE:
repeatButton.setImageResource(R.drawable.ic_repeat_white_36dp);
repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
break;
case MusicService.REPEAT_MODE_ALL: case MusicService.REPEAT_MODE_ALL:
repeatButton.setImageDrawable(Util.getTintedDrawable(activity, R.drawable.ic_repeat_white_36dp, repeatButton.setImageResource(R.drawable.ic_repeat_white_36dp);
lastPlaybackControlsColor)); repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
break; break;
case MusicService.REPEAT_MODE_THIS: case MusicService.REPEAT_MODE_THIS:
repeatButton.setImageDrawable(Util.getTintedDrawable(activity, R.drawable.ic_repeat_one_white_36dp, repeatButton.setImageResource(R.drawable.ic_repeat_one_white_36dp);
lastPlaybackControlsColor)); repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
break;
default:
repeatButton.setImageDrawable(Util.getTintedDrawable(activity, R.drawable.ic_repeat_white_36dp,
lastDisabledPlaybackControlsColor));
break; break;
} }
} }
@ -299,14 +297,11 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
} }
} }
private void updateProgressSliderTint() { private void setUpProgressSlider() {
int color = MaterialValueHelper.getPrimaryTextColor(getContext(), false); int color = MaterialValueHelper.getPrimaryTextColor(getContext(), false);
progressSlider.getThumb().mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN); progressSlider.getThumb().mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN);
progressSlider.getProgressDrawable().mutate().setColorFilter(Color.TRANSPARENT, PorterDuff.Mode.SRC_IN); progressSlider.getProgressDrawable().mutate().setColorFilter(Color.TRANSPARENT, PorterDuff.Mode.SRC_IN);
}
private void setUpProgressSlider() {
updateProgressSliderTint();
progressSlider.setOnSeekBarChangeListener(new SimpleOnSeekbarChangeListener() { progressSlider.setOnSeekBarChangeListener(new SimpleOnSeekbarChangeListener() {
@Override @Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {