Merge pull request zetavg#27 from ActiDoo/master

add support for inboxStyle

Author: zetavg

android/src/main/java/io/neson/react-native/notification/Notification.java

@@ -5,7 +5,6 @@
 import android.app.PendingIntent;
 import android.app.AlarmManager;
 import android.app.NotificationManager;
-import android.support.v4.app.NotificationCompat;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -21,6 +20,8 @@
 import io.neson.react.notification.NotificationEventReceiver;
 import io.neson.react.notification.NotificationPublisher;
 
+import android.support.v7.app.NotificationCompat;
+import android.text.Html;
 import android.util.Log;
 import android.graphics.Color;
 
@@ -112,7 +113,7 @@ public Notification delete() {
      * Build the notification.
      */
     public android.app.Notification build() {
-        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context);
+        android.support.v7.app.NotificationCompat.Builder notificationBuilder = new android.support.v7.app.NotificationCompat.Builder(context);
 
         notificationBuilder
             .setContentTitle(attributes.subject)
@@ -125,21 +126,39 @@ public android.app.Notification build() {
             notificationBuilder.setPriority(attributes.priority);
         }
 
-        int defaults = 0;
+        if(attributes.inboxStyle){
 
-        if ("default".equals(attributes.sound)) {
-            defaults = defaults | NotificationCompat.DEFAULT_SOUND;
-        }
+            android.support.v7.app.NotificationCompat.InboxStyle inboxStyle = new android.support.v7.app.NotificationCompat.InboxStyle();
 
-        if ("default".equals(attributes.vibrate)) {
-            defaults = defaults | NotificationCompat.DEFAULT_VIBRATE;
-        }
+            if(attributes.inboxStyleBigContentTitle != null){
+                inboxStyle.setBigContentTitle(attributes.inboxStyleBigContentTitle);
+            }
+            if(attributes.inboxStyleSummaryText != null){
+                inboxStyle.setSummaryText(attributes.inboxStyleSummaryText);
+            }
+            if(attributes.inboxStyleLines != null){
+                for(int i=0; i< attributes.inboxStyleLines.size(); i++){
+                    inboxStyle.addLine(Html.fromHtml(attributes.inboxStyleLines.get(i)));
+                }
+            }
 
-        if ("default".equals(attributes.lights)) {
-            defaults = defaults | NotificationCompat.DEFAULT_LIGHTS;
-        }
+            Log.i("ReactSystemNotification", "set inbox style!!");
 
-        notificationBuilder.setDefaults(defaults);
+        }else{
+
+            int defaults = 0;
+            if ("default".equals(attributes.sound)) {
+                defaults = defaults | android.app.Notification.DEFAULT_SOUND;
+            }
+            if ("default".equals(attributes.vibrate)) {
+                defaults = defaults | android.app.Notification.DEFAULT_VIBRATE;
+            }
+            if ("default".equals(attributes.lights)) {
+                defaults = defaults | android.app.Notification.DEFAULT_LIGHTS;
+            }
+            notificationBuilder.setDefaults(defaults);
+
+        }
 
         if (attributes.onlyAlertOnce != null) {
             notificationBuilder.setOnlyAlertOnce(attributes.onlyAlertOnce);
@@ -156,7 +175,7 @@ public android.app.Notification build() {
 
         if (attributes.bigText != null) {
             notificationBuilder
-              .setStyle(new NotificationCompat.BigTextStyle()
+              .setStyle(new android.support.v7.app.NotificationCompat.BigTextStyle()
               .bigText(attributes.bigText));
         }
 

android/src/main/java/io/neson/react-native/notification/NotificationAttributes.java

@@ -1,7 +1,11 @@
 package io.neson.react.notification;
 
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.Iterator;
 import com.google.gson.Gson;
@@ -49,6 +53,11 @@ public class NotificationAttributes {
     public String category;
     public Boolean localOnly;
 
+    public Boolean inboxStyle;
+    public String inboxStyleBigContentTitle;
+    public String inboxStyleSummaryText;
+    public ArrayList<String> inboxStyleLines;
+
     public void loadFromMap(Map map) {
         WritableMap writableMap = (WritableMap) new WritableNativeMap();
 
@@ -125,6 +134,23 @@ public void loadFromReadableMap(ReadableMap readableMap) {
         if (readableMap.hasKey("number")) number = readableMap.getInt("number");
         if (readableMap.hasKey("category")) category = readableMap.getString("category");
         if (readableMap.hasKey("localOnly")) localOnly = readableMap.getBoolean("localOnly");
+
+        if (readableMap.hasKey("inboxStyle")){
+            inboxStyle = true;
+            ReadableMap inboxStyle = readableMap.getMap("inboxStyle");
+
+            inboxStyleBigContentTitle = inboxStyle.getString("bigContentTitle");
+            inboxStyleSummaryText = inboxStyle.getString("summaryText");
+
+            ReadableArray inboxLines = inboxStyle.getArray("lines");
+            inboxStyleLines = new ArrayList<>();
+            for(int i=0; i < inboxLines.size(); i++){
+                inboxStyleLines.add(inboxLines.getString(i));
+            }
+        }else{
+            inboxStyle = false;
+        }
+
     }
 
     public ReadableMap asReadableMap() {
@@ -172,6 +198,24 @@ public ReadableMap asReadableMap() {
         if (category != null) writableMap.putString("category", category);
         if (localOnly != null) writableMap.putBoolean("localOnly", localOnly);
 
+        if (inboxStyle){
+
+            WritableMap inboxStyle = new com.facebook.react.bridge.WritableNativeMap();
+
+            if (inboxStyleBigContentTitle != null) inboxStyle.putString("bigContentTitle", inboxStyleBigContentTitle);
+            if (inboxStyleSummaryText != null) inboxStyle.putString("summaryText", inboxStyleSummaryText);
+
+            if(inboxStyleLines != null){
+                WritableArray inboxLines =  new com.facebook.react.bridge.WritableNativeArray();
+                for(int i=0; i < inboxStyleLines.size(); i++){
+                    inboxLines.pushString(inboxStyleLines.get(i));
+                }
+                inboxStyle.putArray("lines", inboxLines);
+            }
+
+            writableMap.putMap("inboxStyle", inboxStyle);
+        }
+
         return (ReadableMap) writableMap;
     }
 }

package.json

@@ -16,6 +16,6 @@
   ],
   "peerDependencies": {
     "react-native": ">=0.15.0",
-    "react-native-gcm-android": "^0.2.0"
+    "react-native-gcm-android": "^0.1.9"
   }
 }