Merge pull request #2 from nilavanraj/CustomNotification

version 0.8 changes add

Author: nilavanraj

android/src/main/java/com/reactnativecustomtimernotification/CNException.kt

@@ -1,4 +1 @@
 package com.reactnativecustomtimernotification
-
-class CNException {
-}

android/src/main/java/com/reactnativecustomtimernotification/CustomNotificationModule.kt

@@ -51,6 +51,7 @@ class CustomNotificationModule: ReactContextBaseJavaModule {
     @ReactMethod
     fun CustomNotification(objectData:ReadableMap,callback: Callback) {
       try{
+        imageCount = 0;
         val payload = objectData.getString(Constants.NOTIFICATION.PAYLOAD);
         val title = objectData.getString(Constants.NOTIFICATION.TITLE);
         val body = objectData.getString(Constants.NOTIFICATION.BODY);
@@ -77,6 +78,8 @@ class CustomNotificationModule: ReactContextBaseJavaModule {
         for (i in 0..(View?.size()?.minus(1) ?: 0)) {
           val item = View?.getMap(i);
           if(item!=null && item.hasKey(Constants.VIEW.TYPE) && item.getInt(Constants.VIEW.TYPE)==1){
+            Log.i("imageCount",imageCount.toString())
+
             setImageView(item, notificationLayout,imageCount);
             imageCount+=1;
           }
@@ -153,6 +156,7 @@ class CustomNotificationModule: ReactContextBaseJavaModule {
       bold = item.getInt(Constants.VIEW.BOLD)
     }
     val s = SpannableString(item?.getString("name"))
+    Typeface.BOLD
     s.setSpan(StyleSpan(bold), 0, s.length, 0)
     textView.setTextViewText(R.id.textView1, s)
 
@@ -207,9 +211,8 @@ class CustomNotificationModule: ReactContextBaseJavaModule {
       handler.postDelayed({
           notificationLayout.setChronometerCountDown(R.id.timerCustom, true);
           notificationLayout.setChronometer(R.id.timerCustom, remainingTime, ("%tM:%tS"), false);
-          if(item.getBoolean(Constants.VIEW.HIDE))
-            notificationLayout.setViewVisibility (R.id.timerCustom, View.INVISIBLE)
-            notificationBuilder.setCustomContentView(notificationLayout)
+        notificationLayout.setViewVisibility (R.id.timerCustomLayout, View.GONE)
+        notificationBuilder.setCustomContentView(notificationLayout)
             notificationManager.notify(id,notificationBuilder.build())
         }, Math.abs(elapsed))
     }

android/src/main/res/layout/chronometer_view_layout.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:orientation="vertical"
+  android:id="@+id/timerCustomLayout"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <Chronometer

example/android/build.gradle

@@ -6,15 +6,15 @@ buildscript {
         compileSdkVersion = 29
         targetSdkVersion = 29
 
-        ndkVersion = "21.4.7075529"
+        ndkVersion = "21.1.6352462"
     }
     repositories {
         google()
         mavenCentral()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/src/App.tsx

@@ -1,22 +1,21 @@
 import * as React from 'react';
-
+import { Button } from 'react-native';
 import {
   TimerNotification,
   RemoveTimer,
   onEvent,
   CustomNotification,
+  TYPES,
+  FB_TYPE,
 } from 'react-native-custom-timer-notification';
-import { Dimensions } from 'react-native';
-import { image, image2 } from './image';
-const windowWidth = Dimensions.get('window').width;
-const windowHeight = Dimensions.get('window').height;
+import { image } from './image';
 
 onEvent((event: any) => {
   console.log(event);
 });
 
 export default function App() {
-  React.useEffect(() => {
+  const CN = React.useCallback(() => {
     CustomNotification(
       {
         eventData: JSON.stringify('notificationOpen?.data'),
@@ -28,8 +27,8 @@ export default function App() {
           {
             name: 'Limited Sales',
             size: 20,
-            type: 2,
-            bold: 3,
+            type: TYPES.Text,
+            bold: FB_TYPE.BOLD_ITALIC,
             PaddingLeft: 10,
             PaddingTop: 50,
             PaddingRight: 0,
@@ -38,9 +37,8 @@ export default function App() {
             color: '#ed1a45',
           },
           {
-            size: 50,
             uri: image,
-            type: 1,
+            type: TYPES.Image,
             PaddingLeft: 0,
             PaddingTop: 0,
             PaddingRight: 0,
@@ -49,8 +47,8 @@ export default function App() {
           {
             name: 'Buy now',
             size: 30,
-            type: 2,
-            bold: 3,
+            type: TYPES.Text,
+            bold: FB_TYPE.BOLD_ITALIC,
             PaddingLeft: 10,
             PaddingTop: 100,
             PaddingRight: 0,
@@ -59,11 +57,10 @@ export default function App() {
             color: '#fbd335',
           },
           {
-            type: 3,
+            type: TYPES.Cronometer,
+            size: 30,
             ZeroTime: new Date(Date.now() + 20000),
             PaddingLeft: 800,
-            hide: true,
-            size: 25,
             color: '#0000FF',
             PaddingTop: 0,
             PaddingRight: 0,
@@ -77,5 +74,30 @@ export default function App() {
     );
   }, []);
 
-  return <></>;
+  const TN = React.useCallback(() => {
+    TimerNotification({
+      payload: JSON.stringify('notificationOpen?.data'),
+      title: 'My notification',
+      body: 'Much longer text that cannot fit one line... ',
+      id: 160211114,
+      remove: false, // optional
+      foreground: false,
+      date: new Date(Date.now() + 20000),
+      isCountDown: true, // false for positive timer
+      setCustomContentView: true, // optional
+    });
+  }, []);
+
+  return (
+    <>
+      <Button title="Custom Notification" onPress={CN} />
+      <Button title="Timer Notification" onPress={TN} />
+      <Button
+        title="remove"
+        onPress={() => {
+          RemoveTimer(1);
+        }}
+      />
+    </>
+  );
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-custom-timer-notification",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "custom timer notification",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

src/index.d.ts

@@ -0,0 +1,53 @@
+interface View {
+  name?: string;
+  size?: number;
+  type: number;
+  bold?: number;
+  PaddingLeft: number;
+  PaddingTop: number;
+  PaddingRight: number;
+  PaddingBottom: number;
+  setViewVisibility?: boolean;
+  color?: string;
+  uri?: string;
+  ZeroTime?: date | null;
+  hide?: boolean;
+}
+interface CNViewItems extends Array<View> {}
+
+interface CN {
+  eventData: string;
+  title: string;
+  body: string;
+  id: number;
+  View: CNViewItems;
+}
+interface Type {
+  Image: number;
+  Text: number;
+  Cronometer: number;
+}
+interface FB_TYPE {
+  NORMAL: number;
+  BOLD: number;
+  ITALIC: number;
+  BOLD_ITALIC: number;
+}
+interface CTN {
+  payload: string;
+  title: string;
+  body: string;
+  remove?: boolean;
+  foreground: boolean;
+  id: number;
+  date?: date;
+  isCountDown: boolean;
+  setCustomContentView?: boolean;
+}
+
+export function onEvent(listener: function): Void;
+export function CustomNotification(a: CN, cb: function): Void;
+export function TimerNotification(a: CTN): Void;
+export function RemoveTimer(n: number);
+export const TYPES: Type;
+export const FB_TYPE: FB_TYPE;

src/index.tsx renamed to src/index.js

@@ -1,5 +1,5 @@
 import { NativeModules, Platform, DeviceEventEmitter } from 'react-native';
-const parseDate = (rawDate: any) => {
+const parseDate = (rawDate) => {
   let hours;
   let day;
   let month;
@@ -51,15 +51,15 @@ const CustomNotificationModule = NativeModules.CustomNotificationModule
         },
       }
     );
-export function TimerNotification(a: object): any {
-  const data: any = a;
+export function TimerNotification(a) {
+  const data = a;
   data.date = parseDate(data.date);
 
   if (Platform.OS === 'android')
     return CustomTimerNotification.TimerNotification(data);
   return null;
 }
-export function RemoveTimer(a: number, b: Boolean = false): any {
+export function RemoveTimer(a, b = false) {
   const payload = {
     id: a,
     foreground: b || false,
@@ -68,8 +68,8 @@ export function RemoveTimer(a: number, b: Boolean = false): any {
   CustomTimerNotification.RemoveTimer(payload);
 }
 
-export function CustomNotification(a: object, cb: any): any {
-  const data: any = a;
+export function CustomNotification(a, cb) {
+  const data = a;
 
   data.View = data.View.map((item) => {
     if (item.type == 3)
@@ -84,12 +84,25 @@ export function CustomNotification(a: object, cb: any): any {
   });
 
   if (Platform.OS === 'android')
-    return NativeModules.CustomNotificationModule.CustomNotification(data, cb);
+    return CustomNotificationModule.CustomNotification(data, cb);
   return null;
 }
 
-export function onEvent(listener: Function): void {
+export function onEvent(listener) {
   DeviceEventEmitter.addListener('notificationClick', (event) =>
     listener(event)
   );
 }
+
+export const TYPES = {
+  Image: 1,
+  Text: 2,
+  Cronometer: 3,
+};
+
+export const FB_TYPE = {
+  NORMAL: 0,
+  BOLD: 1,
+  ITALIC: 2,
+  BOLD_ITALIC: 3,
+};