performance improvement and bug fix

Author: nilavanraj

README.md

@@ -26,8 +26,7 @@ AndroidManifest
 ```title``` Title of the notification <br>
 ```body``` Body of the notification <br>
 ```id```  unique number <br>
-```sec``` Time in seconds <br>
-
+```date``` Time at which zero comes <br>
 ```js
 import { TimerNotification, onEvent } from "react-native-custom-timer-notification";
 
@@ -37,15 +36,15 @@ onEvent(event=>{
 console.log(event)
 });
 
-TimerNotification({
-      payload: JSON.stringify("notificationOpen?.data"), 
-      title: "My notification",
-      body:"Much longer text that cannot fit one line... ",
-      id: 1,
-      sec:60,
-      remove:false, // optional 
-      foreground:false,
-     })
+  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),
+    });
 ```
 
 ## Contributing

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

@@ -9,29 +9,32 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.pm.PackageManager
 import android.graphics.Color
+import android.icu.text.SimpleDateFormat
+import android.icu.util.Calendar
 import android.os.Build
 import android.os.CountDownTimer
+import android.os.Handler
+import android.os.SystemClock
 import android.util.Log
 import android.view.View
 import android.widget.RemoteViews
 import androidx.core.app.NotificationCompat
-import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import org.json.JSONObject
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.Arguments;
+import java.util.*
+import kotlin.time.milliseconds
 
 
 class CustomTimerNotificationModule: ReactContextBaseJavaModule {
   var loading : Boolean = false;
-  var firstForegound : Boolean = true;
-  var ifCancel = false;
+  var foregound : Boolean = false;
+
   lateinit var notificationManager: NotificationManager
   lateinit var builder: Notification.Builder
   val channelId:String = "255"
@@ -47,13 +50,13 @@ class CustomTimerNotificationModule: ReactContextBaseJavaModule {
     myContext.registerReceiver(object : BroadcastReceiver() {
       override fun onReceive(context: Context, intent: Intent) {
         try {
-
-          ifCancel = true
           val extras = intent.extras
           val params: WritableMap = Arguments.createMap()
           params.putInt("id", extras!!.getInt("id"))
           params.putString("action", extras!!.getString("action"))
           params.putString("payload", extras!!.getString("payload"))
+          removeNotification(extras!!.getInt("id"),foregound)
+
           sendEvent("notificationClick", params)
         } catch (e: Exception) {
           println(e)
@@ -87,6 +90,17 @@ class CustomTimerNotificationModule: ReactContextBaseJavaModule {
       val payload =  objectData.getString("payload");
       val id =objectData.getInt("id");
 
+      val datetime = objectData.getString("date")
+      val sdf = SimpleDateFormat("dd-MM-yyyy HH:mm:ss", Locale.ENGLISH)
+
+      val startTime = SystemClock.elapsedRealtime()
+      val endTime: Calendar = Calendar.getInstance()
+      endTime.time = sdf.parse(datetime)
+
+      val now = Date()
+      val elapsed: Long = now.getTime() - endTime.timeInMillis
+      val remainingTime = startTime - elapsed
+
       val intent = Intent(myContext, NotificationEventReceiver::class.java)
       intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
       intent.putExtra("id",id);
@@ -104,17 +118,16 @@ class CustomTimerNotificationModule: ReactContextBaseJavaModule {
       val notificationLayout = RemoteViews(packageName, R.layout.notification_open);
       notificationLayout.setTextViewText(R.id.title,title)
       notificationLayout.setTextViewText(R.id.text,body)
-      notificationLayout.setTextViewText(R.id.timer,remainingTime)
+
+     // notificationLayout.setTextViewText(R.id.timer,remainingTime)
+      notificationLayout.setChronometerCountDown(R.id.simpleChronometer, true);
+      notificationLayout.setChronometer(R.id.simpleChronometer, remainingTime, ("%sM:%sS"), true);
+
 
 //      try {
 //        notificationLayout.setTextColor(R.id.timer , Color.parseColor(objectData.getString("timeColor")));
 //      } catch (e:Exception){}
 
-      if(visbleTimer){
-        notificationLayout.setViewVisibility (R.id.timer,
-          View.INVISIBLE)
-      }
-
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
         val notificationChannel =
           NotificationChannel(channelId, "Timer", NotificationManager.IMPORTANCE_HIGH)
@@ -127,7 +140,6 @@ class CustomTimerNotificationModule: ReactContextBaseJavaModule {
           val notificationBuilder:NotificationCompat.Builder =
             NotificationCompat.Builder(myContext,channelId)
           notificationBuilder.setAutoCancel(true)
-            .setWhen(System.currentTimeMillis())
             .setSmallIcon(myContext.getResources().getIdentifier("ic_launcher", "mipmap", myContext.getPackageName()))
             .setContentTitle(title)
             .setContentText(body)
@@ -137,70 +149,54 @@ class CustomTimerNotificationModule: ReactContextBaseJavaModule {
             .setContentIntent(pendingIntent)
             .setDeleteIntent(onDismissPendingIntent)
             .setPriority(NotificationCompat.PRIORITY_HIGH)
-          return notificationBuilder
+            .setWhen(endTime.getTimeInMillis());
+      val handler = Handler()
+      handler.postDelayed({
+        notificationLayout.setChronometer(R.id.simpleChronometer, remainingTime, ("%sM:%sS"), false);
+        try {
+          val remove =objectData.getBoolean("remove");
+          val foreground =objectData.getBoolean("foreground");
+          if(remove){
+            removeNotification(id,foreground)
+          } else {
+               notificationLayout.setViewVisibility (R.id.simpleChronometer,
+                View.INVISIBLE)
+          }
+        } catch (e:Exception){}
 
+        notificationBuilder.setCustomContentView(notificationLayout)
+        notificationManager.notify(id,notificationBuilder.build())
+      }, Math.abs(elapsed))
+          return notificationBuilder
   }
+
 fun updatePop(objectData:ReadableMap,remainingTime:String,visbleTimer:Boolean){
   val id =objectData.getInt("id");
   val notificationBuilder:NotificationCompat.Builder  = notificationPop(objectData,remainingTime,visbleTimer)
   notificationManager.notify(id,notificationBuilder.build())
 }
   fun removeNotification (id:Int,foreground:Boolean) {
-
     val notificationManager = myContext.getSystemService(NotificationManager::class.java)
     if(foreground)
     ForegroundService.stopService(myContext)
     else
     notificationManager.cancel( id ) ;
   }
-  fun countdown(objectData:ReadableMap,sec:Int) {
-    val secLong = sec.toLong()*1000;
-    val id =objectData.getInt("id");
-    val foreground =objectData.getBoolean("foreground");
-
-    object : CountDownTimer(secLong, 1000) {
-      override fun onTick(millisUntilFinished: Long) {
-        val remainingSec:Int = (millisUntilFinished / 1000).toInt()
-        val min = convert((remainingSec/60).toInt().toString())
-        val secInMin = convert((remainingSec%60).toInt().toString())
-        val remainingTime:String = "$min : $secInMin"
-        if(ifCancel){
-          cancel();
-          if(foreground){
-            ForegroundService.stopService(myContext)
-          }
-        }
-        else{
-          if(foreground&&firstForegound){
-            firstForegound=false
-            ForegroundService.startService(myContext,objectData,remainingTime)
-          } else
-          updatePop(objectData,remainingTime,false)
+    @ReactMethod
+    fun TimerNotification(objectData:ReadableMap) {
 
-        }
-      }
+      val remainingSec:Int = (10000 / 1000).toInt()
+      val min = convert((remainingSec/60).toInt().toString())
+      val secInMin = convert((remainingSec%60).toInt().toString())
+      val remainingTime:String = "$min : $secInMin"
 
-      override fun onFinish() {
-        try {
-          val remove =objectData.getBoolean("remove");
-          if(remove){
-            removeNotification(id,foreground)
-          } else {
-            println("onFinish")
-            updatePop(objectData,"",true)
-          }
-        } catch (e:Exception){}
+      val foreground =objectData.getBoolean("foreground");
 
-      }
-    }.start()
-  }
-
-    @ReactMethod
-    fun TimerNotification(objectData:ReadableMap) {
-      firstForegound=true;
-      ifCancel = false;
-      val sec =objectData.getInt("sec");
-      countdown(objectData,sec)
+      if(foreground){
+        foregound=true;
+        ForegroundService.startService(myContext,objectData)
+      } else
+      updatePop(objectData,remainingTime,false)
       //promise.resolve(a * b)
 
     }

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

@@ -6,29 +6,38 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.os.Build
-import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
-import android.os.CountDownTimer
 import android.graphics.Color
 import android.app.Notification
+import android.icu.text.SimpleDateFormat
+import android.icu.util.Calendar
+import android.os.*
+import android.view.View
 import android.widget.RemoteViews;
 import com.facebook.react.bridge.ReadableMap;
+import java.util.*
 
 class ForegroundService : Service() {
   private val CHANNEL_ID = "255"
 
   companion object {
-    fun startService(context: Context, objectData: ReadableMap,remainingTime:String) {
+    fun startService(context: Context, objectData: ReadableMap) {
       val startIntent = Intent(context, ForegroundService::class.java)
 
       val title = objectData.getString("title");
       val body = objectData.getString("body");
       val payload = objectData.getString("payload");
       val id = objectData.getInt("id");
+      val datetime = objectData.getString("date")
+
+      try {
+        val remove =objectData.getBoolean("remove");
+        startIntent.putExtra("remove", remove)
+      } catch (e:Exception){}
+
+      startIntent.putExtra("date", datetime)
       startIntent.putExtra("id", id)
-      startIntent.putExtra("remainingTime", remainingTime)
       startIntent.putExtra("title", title)
       startIntent.putExtra("body", body)
       startIntent.putExtra("payload", payload)
@@ -40,16 +49,12 @@ class ForegroundService : Service() {
       context.stopService(stopIntent)
     }
   }
-  fun getActiveNotifications (intent: Intent?):Notification{
+  fun getActiveNotifications (intent: Intent?,displayerTimer:Boolean,remainingTime:Long):Notification{
 
     val title = intent?.getStringExtra("title");
     val body = intent?.getStringExtra("body");
     val payload =  intent?.getStringExtra("payload");
     val id:Int? = intent?.getIntExtra("id",0)
-    println(id)
-
-    val remainingTime =  intent?.getStringExtra("remainingTime");
-
 
     val intent = Intent(this, NotificationEventReceiver::class.java)
     intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
@@ -58,7 +63,6 @@ class ForegroundService : Service() {
     intent.putExtra("payload",payload);
     val pendingIntent = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
-
     val onCancelIntent = Intent(this, OnClickBroadcastReceiver::class.java)
     onCancelIntent.putExtra("id",id);
     onCancelIntent.putExtra("action","cancel");
@@ -69,7 +73,13 @@ class ForegroundService : Service() {
     val notificationLayout = RemoteViews(packageName, R.layout.notification_open);
     notificationLayout.setTextViewText(R.id.title,title)
     notificationLayout.setTextViewText(R.id.text,body)
-    notificationLayout.setTextViewText(R.id.timer,remainingTime)
+if(displayerTimer){
+  notificationLayout.setChronometerCountDown(R.id.simpleChronometer, true);
+  notificationLayout.setChronometer(R.id.simpleChronometer, remainingTime, ("%tM:%tS"), true);
+} else {
+  notificationLayout.setChronometerCountDown(R.id.simpleChronometer, false);
+  notificationLayout.setChronometer(R.id.simpleChronometer, remainingTime, ("%tM:%tS"), false);
+}
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       val notificationChannel =
@@ -93,12 +103,38 @@ class ForegroundService : Service() {
       .setDeleteIntent(onDismissPendingIntent)
       .setPriority(NotificationCompat.PRIORITY_HIGH)
       .build();
+
+
     return notification
   }
   override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
     val id:Int? = intent?.getIntExtra("id",0)
 
-    startForeground(id!!,  getActiveNotifications(intent))
+    val datetime = intent?.getStringExtra("date")
+    val sdf = SimpleDateFormat("dd-MM-yyyy HH:mm:ss", Locale.ENGLISH)
+
+    val startTime = SystemClock.elapsedRealtime()
+    val endTime: Calendar = Calendar.getInstance()
+    endTime.time = sdf.parse(datetime)
+
+    val now = Date()
+    val elapsed: Long = now.getTime() - endTime.timeInMillis
+    val remainingTime = startTime - elapsed
+
+    val handler = Handler()
+    handler.postDelayed({
+      try {
+        val remove =intent?.getBooleanExtra("remove",false);
+        if(remove!!){
+          stopService(this)
+        }else{
+          startForeground(id!!,getActiveNotifications(intent,false,remainingTime))
+        }
+      } catch (e:Exception){}
+    }, Math.abs(elapsed))
+
+
+    startForeground(id!!,  getActiveNotifications(intent,true,remainingTime))
     return START_NOT_STICKY
   }
 

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

@@ -35,8 +35,9 @@
 
     </LinearLayout>
 
-  <TextView
-    android:id="@+id/timer"
+
+  <Chronometer
+    android:id="@+id/simpleChronometer"
     style="@style/TextAppearance.Compat.Notification.Title"
     android:layout_weight="5"