react-native-mapp-plugin 1.0.4-beta3 → 1.0.4-beta7

package/android/src/main/java/com/reactlibrary/RNMappPluginPackage.java

@@ -1,35 +1,35 @@
-
-package com.reactlibrary;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
-/**
- * Created by Aleksandar Marinkovic on 2019-05-15.
- * Copyright (c) 2019 MAPP.
- */
-public class RNMappPluginPackage implements ReactPackage {
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<>();
-        modules.add(new RNMappPluginModule(reactContext));
-        return modules;
-    }
-
-    // Deprecated from RN 0.47
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-      return Collections.emptyList();
-    }
-
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-      return Collections.emptyList();
-    }
+
+package com.reactlibrary;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.bridge.JavaScriptModule;
+/**
+ * Created by Aleksandar Marinkovic on 2019-05-15.
+ * Copyright (c) 2019 MAPP.
+ */
+public class RNMappPluginPackage implements ReactPackage {
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        List<NativeModule> modules = new ArrayList<>();
+        modules.add(new RNMappPluginModule(reactContext));
+        return modules;
+    }
+
+    // Deprecated from RN 0.47
+    public List<Class<? extends JavaScriptModule>> createJSModules() {
+      return Collections.emptyList();
+    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+      return Collections.emptyList();
+    }
 }

package/android/src/main/java/com/reactlibrary/RNUtils.java

@@ -1,191 +1,191 @@
-package com.reactlibrary;
-
-
-
-import androidx.annotation.Nullable;
-
-import com.appoxee.push.PushData;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.bridge.ReadableType;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * Created by Aleksandar Marinkovic on 2019-05-15.
- * Copyright (c) 2019 MAPP.
- */
-public class RNUtils {
-
-    /**
-     * Converts a react native readable map into a JSON object.
-     *
-     * @param readableMap map to convert to JSON Object
-     * @return JSON Object that contains the readable map properties
-     */
-    @Nullable
-    public static JSONObject readableMapToJson(ReadableMap readableMap) {
-        JSONObject jsonObject = new JSONObject();
-
-        if (readableMap == null) {
-            return null;
-        }
-
-        ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
-        if (!iterator.hasNextKey()) {
-            return null;
-        }
-
-        while (iterator.hasNextKey()) {
-            String key = iterator.nextKey();
-            ReadableType readableType = readableMap.getType(key);
-
-            try {
-                switch (readableType) {
-                    case Null:
-                        jsonObject.put(key, null);
-                        break;
-                    case Boolean:
-                        jsonObject.put(key, readableMap.getBoolean(key));
-                        break;
-                    case Number:
-                        // Can be int or double.
-                        jsonObject.put(key, readableMap.getInt(key));
-                        break;
-                    case String:
-                        jsonObject.put(key, readableMap.getString(key));
-                        break;
-                    case Map:
-                        jsonObject.put(key, readableMapToJson(readableMap.getMap(key)));
-                        break;
-                    case Array:
-                        jsonObject.put(key, readableMap.getArray(key));
-                    default:
-                        // Do nothing and fail silently
-                }
-            } catch (JSONException ex) {
-                // Do nothing and fail silently
-            }
-        }
-
-        return jsonObject;
-    }
-
-    public static WritableMap getPushMessageToJSon(PushData pushData, String type) {
-        WritableMap deviceInfo = new WritableNativeMap();
-        try {
-            deviceInfo.putString("id", String.valueOf(pushData.id));
-            deviceInfo.putString("title", pushData.title);
-            deviceInfo.putString("bigText", pushData.bigText);
-            deviceInfo.putString("sound", pushData.sound);
-            deviceInfo.putString("pushNotificationEventType",type);
-            if (pushData.actionUri != null)
-                deviceInfo.putString("actionUri", pushData.actionUri.toString());
-            deviceInfo.putString("collapseKey", pushData.collapseKey);
-            deviceInfo.putInt("badgeNumber", pushData.badgeNumber);
-            deviceInfo.putString("silentType", pushData.silentType);
-            deviceInfo.putString("silentData", pushData.silentData);
-            deviceInfo.putString("category", pushData.category);
-            if (pushData.extraFields != null)
-                for (Map.Entry<String, String> entry : pushData.extraFields.entrySet()) {
-                    String key = entry.getKey();
-                    String value = entry.getValue();
-                    deviceInfo.putString(key, value);
-                }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return deviceInfo;
-    }
-
-    @Nullable
-    public static WritableMap jsonToWritableMap(JSONObject jsonObject) {
-        WritableMap writableMap = new WritableNativeMap();
-
-        if (jsonObject == null) {
-            return null;
-        }
-
-
-        Iterator<String> iterator = jsonObject.keys();
-        if (!iterator.hasNext()) {
-            return null;
-        }
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-
-            try {
-                Object value = jsonObject.get(key);
-
-                if (value == null) {
-                    writableMap.putNull(key);
-                } else if (value instanceof Boolean) {
-                    writableMap.putBoolean(key, (Boolean) value);
-                } else if (value instanceof Integer) {
-                    writableMap.putInt(key, (Integer) value);
-                } else if (value instanceof Double) {
-                    writableMap.putDouble(key, (Double) value);
-                } else if (value instanceof String) {
-                    writableMap.putString(key, (String) value);
-                } else if (value instanceof JSONObject) {
-                    writableMap.putMap(key, jsonToWritableMap((JSONObject) value));
-                } else if (value instanceof JSONArray) {
-                    writableMap.putArray(key, jsonArrayToWritableArray((JSONArray) value));
-                }
-            } catch (JSONException ex) {
-                // Do nothing and fail silently
-            }
-        }
-
-        return writableMap;
-    }
-
-    @Nullable
-    public static WritableArray jsonArrayToWritableArray(JSONArray jsonArray) {
-        WritableArray writableArray = new WritableNativeArray();
-
-        if (jsonArray == null) {
-            return null;
-        }
-
-        if (jsonArray.length() <= 0) {
-            return null;
-        }
-
-        for (int i = 0 ; i < jsonArray.length(); i++) {
-            try {
-                Object value = jsonArray.get(i);
-                if (value == null) {
-                    writableArray.pushNull();
-                } else if (value instanceof Boolean) {
-                    writableArray.pushBoolean((Boolean) value);
-                } else if (value instanceof Integer) {
-                    writableArray.pushInt((Integer) value);
-                } else if (value instanceof Double) {
-                    writableArray.pushDouble((Double) value);
-                } else if (value instanceof String) {
-                    writableArray.pushString((String) value);
-                } else if (value instanceof JSONObject) {
-                    writableArray.pushMap(jsonToWritableMap((JSONObject) value));
-                } else if (value instanceof JSONArray) {
-                    writableArray.pushArray(jsonArrayToWritableArray((JSONArray) value));
-                }
-            } catch (JSONException e) {
-                // Do nothing and fail silently
-            }
-        }
-
-        return writableArray;
-    }
-}
+package com.reactlibrary;
+
+
+
+import androidx.annotation.Nullable;
+
+import com.appoxee.push.PushData;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.ReadableType;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeArray;
+import com.facebook.react.bridge.WritableNativeMap;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Created by Aleksandar Marinkovic on 2019-05-15.
+ * Copyright (c) 2019 MAPP.
+ */
+public class RNUtils {
+
+    /**
+     * Converts a react native readable map into a JSON object.
+     *
+     * @param readableMap map to convert to JSON Object
+     * @return JSON Object that contains the readable map properties
+     */
+    @Nullable
+    public static JSONObject readableMapToJson(ReadableMap readableMap) {
+        JSONObject jsonObject = new JSONObject();
+
+        if (readableMap == null) {
+            return null;
+        }
+
+        ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+        if (!iterator.hasNextKey()) {
+            return null;
+        }
+
+        while (iterator.hasNextKey()) {
+            String key = iterator.nextKey();
+            ReadableType readableType = readableMap.getType(key);
+
+            try {
+                switch (readableType) {
+                    case Null:
+                        jsonObject.put(key, null);
+                        break;
+                    case Boolean:
+                        jsonObject.put(key, readableMap.getBoolean(key));
+                        break;
+                    case Number:
+                        // Can be int or double.
+                        jsonObject.put(key, readableMap.getInt(key));
+                        break;
+                    case String:
+                        jsonObject.put(key, readableMap.getString(key));
+                        break;
+                    case Map:
+                        jsonObject.put(key, readableMapToJson(readableMap.getMap(key)));
+                        break;
+                    case Array:
+                        jsonObject.put(key, readableMap.getArray(key));
+                    default:
+                        // Do nothing and fail silently
+                }
+            } catch (JSONException ex) {
+                // Do nothing and fail silently
+            }
+        }
+
+        return jsonObject;
+    }
+
+    public static WritableMap getPushMessageToJSon(PushData pushData, String type) {
+        WritableMap deviceInfo = new WritableNativeMap();
+        try {
+            deviceInfo.putString("id", String.valueOf(pushData.id));
+            deviceInfo.putString("title", pushData.title);
+            deviceInfo.putString("bigText", pushData.bigText);
+            deviceInfo.putString("sound", pushData.sound);
+            deviceInfo.putString("pushNotificationEventType",type);
+            if (pushData.actionUri != null)
+                deviceInfo.putString("actionUri", pushData.actionUri.toString());
+            deviceInfo.putString("collapseKey", pushData.collapseKey);
+            deviceInfo.putInt("badgeNumber", pushData.badgeNumber);
+            deviceInfo.putString("silentType", pushData.silentType);
+            deviceInfo.putString("silentData", pushData.silentData);
+            deviceInfo.putString("category", pushData.category);
+            if (pushData.extraFields != null)
+                for (Map.Entry<String, String> entry : pushData.extraFields.entrySet()) {
+                    String key = entry.getKey();
+                    String value = entry.getValue();
+                    deviceInfo.putString(key, value);
+                }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return deviceInfo;
+    }
+
+    @Nullable
+    public static WritableMap jsonToWritableMap(JSONObject jsonObject) {
+        WritableMap writableMap = new WritableNativeMap();
+
+        if (jsonObject == null) {
+            return null;
+        }
+
+
+        Iterator<String> iterator = jsonObject.keys();
+        if (!iterator.hasNext()) {
+            return null;
+        }
+
+        while (iterator.hasNext()) {
+            String key = iterator.next();
+
+            try {
+                Object value = jsonObject.get(key);
+
+                if (value == null) {
+                    writableMap.putNull(key);
+                } else if (value instanceof Boolean) {
+                    writableMap.putBoolean(key, (Boolean) value);
+                } else if (value instanceof Integer) {
+                    writableMap.putInt(key, (Integer) value);
+                } else if (value instanceof Double) {
+                    writableMap.putDouble(key, (Double) value);
+                } else if (value instanceof String) {
+                    writableMap.putString(key, (String) value);
+                } else if (value instanceof JSONObject) {
+                    writableMap.putMap(key, jsonToWritableMap((JSONObject) value));
+                } else if (value instanceof JSONArray) {
+                    writableMap.putArray(key, jsonArrayToWritableArray((JSONArray) value));
+                }
+            } catch (JSONException ex) {
+                // Do nothing and fail silently
+            }
+        }
+
+        return writableMap;
+    }
+
+    @Nullable
+    public static WritableArray jsonArrayToWritableArray(JSONArray jsonArray) {
+        WritableArray writableArray = new WritableNativeArray();
+
+        if (jsonArray == null) {
+            return null;
+        }
+
+        if (jsonArray.length() <= 0) {
+            return null;
+        }
+
+        for (int i = 0 ; i < jsonArray.length(); i++) {
+            try {
+                Object value = jsonArray.get(i);
+                if (value == null) {
+                    writableArray.pushNull();
+                } else if (value instanceof Boolean) {
+                    writableArray.pushBoolean((Boolean) value);
+                } else if (value instanceof Integer) {
+                    writableArray.pushInt((Integer) value);
+                } else if (value instanceof Double) {
+                    writableArray.pushDouble((Double) value);
+                } else if (value instanceof String) {
+                    writableArray.pushString((String) value);
+                } else if (value instanceof JSONObject) {
+                    writableArray.pushMap(jsonToWritableMap((JSONObject) value));
+                } else if (value instanceof JSONArray) {
+                    writableArray.pushArray(jsonArrayToWritableArray((JSONArray) value));
+                }
+            } catch (JSONException e) {
+                // Do nothing and fail silently
+            }
+        }
+
+        return writableArray;
+    }
+}

package/android/src/main/java/com/reactlibrary/RequestPermissionsTask.java

@@ -1,58 +1,58 @@
-package com.reactlibrary;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * Created by Aleksandar Marinkovic on 2019-05-15.
- * Copyright (c) 2019 MAPP.
- */
-
-
-class RequestPermissionsTask extends AsyncTask<String, Void, Boolean> {
-
-    private final Context context;
-    private Callback callback;
-
-    /**
-     * Callback when with the result.
-     */
-    public interface Callback {
-        void onResult(boolean enabled);
-    }
-
-    /**
-     * Creates a request permissions task.
-     *
-     * @param context  The application context.
-     * @param callback The callback.
-     */
-    RequestPermissionsTask(@NonNull Context context, @Nullable Callback callback) {
-        this.context = context;
-        this.callback = callback;
-    }
-
-    @Override
-    protected Boolean doInBackground(String... strings) {
-        int[] result = HelperActivity.requestPermissions(context, strings);
-        for (int element : result) {
-            if (element == PackageManager.PERMISSION_GRANTED) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    protected void onPostExecute(Boolean result) {
-        if (callback != null) {
-            callback.onResult(result);
-        }
-    }
-}
-
-
+package com.reactlibrary;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.AsyncTask;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Created by Aleksandar Marinkovic on 2019-05-15.
+ * Copyright (c) 2019 MAPP.
+ */
+
+
+class RequestPermissionsTask extends AsyncTask<String, Void, Boolean> {
+
+    private final Context context;
+    private Callback callback;
+
+    /**
+     * Callback when with the result.
+     */
+    public interface Callback {
+        void onResult(boolean enabled);
+    }
+
+    /**
+     * Creates a request permissions task.
+     *
+     * @param context  The application context.
+     * @param callback The callback.
+     */
+    RequestPermissionsTask(@NonNull Context context, @Nullable Callback callback) {
+        this.context = context;
+        this.callback = callback;
+    }
+
+    @Override
+    protected Boolean doInBackground(String... strings) {
+        int[] result = HelperActivity.requestPermissions(context, strings);
+        for (int element : result) {
+            if (element == PackageManager.PERMISSION_GRANTED) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    protected void onPostExecute(Boolean result) {
+        if (callback != null) {
+            callback.onResult(result);
+        }
+    }
+}
+
+

package/android/src/main/res/values/styles.xml

@@ -1,14 +1,14 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-
-    <style name="HelperActivityStyle">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowTranslucentStatus" tools:targetApi="kitkat">true</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent
-        </item>
-    </style>
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+
+    <style name="HelperActivityStyle">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowTranslucentStatus" tools:targetApi="kitkat">true</item>
+        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent
+        </item>
+    </style>
+</resources>

package/index.js

@@ -1,9 +1,9 @@
-module.exports = {
-
-    get Mapp() {
-        return require('./Mapp.js');
-    },
-    get MappEventEmitter() {
-        return require('./MappEventEmitter.js');
-    },
+module.exports = {
+
+    get Mapp() {
+        return require('./Mapp.js');
+    },
+    get MappEventEmitter() {
+        return require('./MappEventEmitter.js');
+    },
 };