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

fix back on main activity

Browse source
This commit is contained in:
dkanada 2021-04-18 19:58:21 +09:00
commit c6d17d7589
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java
View file

@ -41,7 +41,6 @@ public class PlayingNotificationImpl extends PlayingNotification {
stopped = false; stopped = false;
final Song song = service.getCurrentSong(); final Song song = service.getCurrentSong();
final boolean isPlaying = service.isPlaying(); final boolean isPlaying = service.isPlaying();
final RemoteViews notificationLayout = new RemoteViews(service.getPackageName(), R.layout.notification); final RemoteViews notificationLayout = new RemoteViews(service.getPackageName(), R.layout.notification);
@ -124,6 +123,7 @@ public class PlayingNotificationImpl extends PlayingNotification {
if (!PreferenceUtil.getInstance(service).getColoredNotification()) { if (!PreferenceUtil.getInstance(service).getColoredNotification()) {
bgColor = Color.WHITE; bgColor = Color.WHITE;
} }
setBackgroundColor(bgColor); setBackgroundColor(bgColor);
setNotificationContent(ColorUtil.isColorLight(bgColor)); setNotificationContent(ColorUtil.isColorLight(bgColor));
@ -169,17 +169,14 @@ public class PlayingNotificationImpl extends PlayingNotification {
final ComponentName serviceName = new ComponentName(service, MusicService.class); final ComponentName serviceName = new ComponentName(service, MusicService.class);
// previous track
pendingIntent = buildPendingIntent(service, MusicService.ACTION_REWIND, serviceName); pendingIntent = buildPendingIntent(service, MusicService.ACTION_REWIND, serviceName);
notificationLayout.setOnClickPendingIntent(R.id.action_prev, pendingIntent); notificationLayout.setOnClickPendingIntent(R.id.action_prev, pendingIntent);
notificationLayoutBig.setOnClickPendingIntent(R.id.action_prev, pendingIntent); notificationLayoutBig.setOnClickPendingIntent(R.id.action_prev, pendingIntent);
// toggle play and pause
pendingIntent = buildPendingIntent(service, MusicService.ACTION_TOGGLE, serviceName); pendingIntent = buildPendingIntent(service, MusicService.ACTION_TOGGLE, serviceName);
notificationLayout.setOnClickPendingIntent(R.id.action_play_pause, pendingIntent); notificationLayout.setOnClickPendingIntent(R.id.action_play_pause, pendingIntent);
notificationLayoutBig.setOnClickPendingIntent(R.id.action_play_pause, pendingIntent); notificationLayoutBig.setOnClickPendingIntent(R.id.action_play_pause, pendingIntent);
// next track
pendingIntent = buildPendingIntent(service, MusicService.ACTION_SKIP, serviceName); pendingIntent = buildPendingIntent(service, MusicService.ACTION_SKIP, serviceName);
notificationLayout.setOnClickPendingIntent(R.id.action_next, pendingIntent); notificationLayout.setOnClickPendingIntent(R.id.action_next, pendingIntent);
notificationLayoutBig.setOnClickPendingIntent(R.id.action_next, pendingIntent); notificationLayoutBig.setOnClickPendingIntent(R.id.action_next, pendingIntent);

2
app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
View file

@ -41,7 +41,7 @@ public class NavigationUtil {
public static void goToMain(@NonNull final Context context) { public static void goToMain(@NonNull final Context context) {
final Intent intent = new Intent(context, MainActivity.class); final Intent intent = new Intent(context, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivity(intent); context.startActivity(intent);
} }