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

Completely rewrote the notification.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-04-04 01:48:20 +02:00
commit bc4181f4b1
5 changed files with 164 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
View file

@ -122,7 +122,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private int shuffleMode;
private int repeatMode;
private boolean queuesRestored;
private boolean audioDucking;
private boolean pausedByTransientLossOfFocus;
private boolean receiversAndRemoteControlClientRegistered;
private PlayingNotificationHelper playingNotificationHelper;
@ -170,8 +169,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
wakeLock.setReferenceCounted(false);
audioDucking = PreferenceUtil.getInstance(this).audioDucking();
musicPlayerHandlerThread = new HandlerThread("PlaybackHandler");
musicPlayerHandlerThread.start();
playerHandler = new PlaybackHandler(this, musicPlayerHandlerThread.getLooper());
@ -573,10 +570,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
}
}
private void updateNotification() {
playingNotificationHelper.updateNotification();
}
public int getNextPosition(boolean force) {
int position = getPosition() + 1;
switch (getRepeatMode()) {
@ -950,7 +943,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
switch (what) {
case PLAY_STATE_CHANGED:
final boolean isPlaying = isPlaying();
playingNotificationHelper.updatePlayState(isPlaying);
playingNotificationHelper.updateNotification();
//noinspection deprecation
remoteControlClient.setPlaybackState(isPlaying ? RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED);
if (!isPlaying && getSongProgressMillis() > 0) {
@ -959,7 +952,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
songPlayCountHelper.notifyPlayStateChanged(isPlaying);
break;
case META_CHANGED:
updateNotification();
playingNotificationHelper.updateNotification();
updateRemoteControlClient();
savePosition();
savePositionInTrack();
@ -998,9 +991,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
switch (key) {
case PreferenceUtil.AUDIO_DUCKING:
audioDucking = sharedPreferences.getBoolean(key, true);
break;
case PreferenceUtil.GAPLESS_PLAYBACK:
if (sharedPreferences.getBoolean(key, false)) {
prepareNext();
@ -1013,7 +1003,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
updateRemoteControlClient();
break;
case PreferenceUtil.COLORED_NOTIFICATION:
playingNotificationHelper.updateNotification(sharedPreferences.getBoolean(key, false));
playingNotificationHelper.updateNotification();
break;
}
}
@ -1048,7 +1038,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
switch (msg.what) {
case DUCK:
if (service.audioDucking) {
if (PreferenceUtil.getInstance(service).audioDucking()) {
currentDuckVolume -= .05f;
if (currentDuckVolume > .2f) {
sendEmptyMessageDelayed(DUCK, 10);
@ -1062,7 +1052,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
break;
case UNDUCK:
if (service.audioDucking) {
if (PreferenceUtil.getInstance(service).audioDucking()) {
currentDuckVolume += .03f;
if (currentDuckVolume < 1f) {
sendEmptyMessageDelayed(UNDUCK, 10);