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

No longer creating a new instance of the app when clicking the notification. Also the widget will still stay clickable after a reboot.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-01-07 16:20:14 +01:00
commit 88a86312a1
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java
View file

@ -12,6 +12,7 @@ import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.widget.RemoteViews;
import com.bumptech.glide.Glide;
@ -28,12 +29,14 @@ import com.kabouzeid.gramophone.ui.activities.MainActivity;
public class WidgetMedium extends AppWidgetProvider {
private static RemoteViews widgetLayout;
public static void updateWidgets(@NonNull final Context context, @NonNull final Song song, boolean isPlaying) {
if (song.id == -1) return;
widgetLayout = new RemoteViews(context.getPackageName(), R.layout.widget_medium);
public static void updateWidgets(@NonNull final Context context, @NonNull Song song, boolean isPlaying) {
if (widgetLayout == null) {
widgetLayout = new RemoteViews(context.getPackageName(), R.layout.widget_medium);
}
linkButtons(context, widgetLayout);
widgetLayout.setTextViewText(R.id.title, song.title);
widgetLayout.setTextViewText(R.id.song_secondary_information, song.artistName + " | " + song.albumName);
String separator = TextUtils.isEmpty(song.artistName) || TextUtils.isEmpty(song.albumName) ? "" : " | ";
widgetLayout.setTextViewText(R.id.song_secondary_information, song.artistName + separator + song.albumName);
updateWidgetsPlayState(context, isPlaying);
loadAlbumCover(context, song);
@ -102,8 +105,7 @@ public class WidgetMedium extends AppWidgetProvider {
}
private static void linkButtons(@NonNull final Context context, @NonNull final RemoteViews views) {
views.setOnClickPendingIntent(R.id.image, retrievePlaybackActions(context, 0));
views.setOnClickPendingIntent(R.id.media_titles, retrievePlaybackActions(context, 0));
views.setOnClickPendingIntent(R.id.content, retrievePlaybackActions(context, 0));
views.setOnClickPendingIntent(R.id.button_toggle_play_pause, retrievePlaybackActions(context, 1));
views.setOnClickPendingIntent(R.id.button_next, retrievePlaybackActions(context, 2));
views.setOnClickPendingIntent(R.id.button_prev, retrievePlaybackActions(context, 3));
@ -115,7 +117,8 @@ public class WidgetMedium extends AppWidgetProvider {
switch (which) {
case 0:
intent = new Intent(context, MainActivity.class);
return PendingIntent.getActivity(context, 0, intent, 0);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
case 1:
intent = new Intent(MusicService.ACTION_TOGGLE_PAUSE);
intent.setComponent(serviceName);

4
app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java
View file

@ -374,4 +374,8 @@ public class MusicPlayerRemote {
}
}
}
public static boolean isServiceAvailable() {
return musicService != null;
}
}

3
app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
View file

@ -113,7 +113,8 @@ public class PlayingNotificationHelper {
private PendingIntent getOpenMusicControllerPendingIntent() {
Intent intent = new Intent(service, MainActivity.class);
return PendingIntent.getActivity(service, 0, intent, 0);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
return PendingIntent.getActivity(service, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
}
private void setUpExpandedPlaybackActions() {

1
app/src/main/res/layout/widget_medium.xml
View file

@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="96dp"
android:background="#AAFFFFFF"
android:id="@+id/content"
tools:ignore="ContentDescription">
<ImageView