Merge pull request sverrisson#2 from snaeji/master

Dismissable notification and callback for handling
snaeji · Dec 18, 2018 · 58535b0 · 58535b0
2 parents 9c04743 + 98dc0bd
commit 58535b0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/android/src/main/java/com/example/medianotification/MediaNotificationPlugin.java b/android/src/main/java/com/example/medianotification/MediaNotificationPlugin.java
@@ -150,7 +150,3 @@ public void onDestroy() {
         hide();
     }
 }
-
-
-
-
diff --git a/android/src/main/java/com/example/medianotification/NotificationPanel.java b/android/src/main/java/com/example/medianotification/NotificationPanel.java
@@ -43,11 +43,16 @@ public NotificationPanel(Context parent, String title, String author, boolean pl
         this.author = author;
         this.play = play;
 
+        Intent dismissIntent = new Intent(parent, NotificationReturnSlot.class)
+                .setAction("dismiss");
+        PendingIntent pendingDismissIntent = PendingIntent.getBroadcast(parent, 0, dismissIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+
         nBuilder = new NotificationCompat.Builder(parent, "media_notification")
-                .setOngoing(true)
+                .setOngoing(play)
                 .setSmallIcon(R.drawable.ic_stat_music_note)
                 .setVibrate(new long[]{0L})
-                .setSound(null);
+                .setSound(null)
+                .setDeleteIntent(pendingDismissIntent);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             nBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
@@ -303,4 +308,3 @@ private boolean isAppRunning(Context context) {
     }
     */
 }
-
diff --git a/android/src/main/java/com/example/medianotification/NotificationReturnSlot.java b/android/src/main/java/com/example/medianotification/NotificationReturnSlot.java
@@ -4,12 +4,22 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.util.Log;
 
 public class NotificationReturnSlot extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
         switch (intent.getAction()) {
+            case "dismiss":
+                MediaNotificationPlugin.callEvent("dismiss");
+                break;
+
+            case "close":
+                MediaNotificationPlugin.callEvent("close");
+                break;
+
+
             case "prev":
                 MediaNotificationPlugin.callEvent("prev");
                 break;
@@ -40,4 +50,3 @@ public void onReceive(Context context, Intent intent) {
         }
     }
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -150,7 +150,3 @@ public void onDestroy() {
		hide();
		}
		}