Simplify AlarmModule

This commit is contained in:
Brandon Presley 2022-11-30 14:23:24 +13:00
parent 2d1bed0671
commit 6676efe69f
1 changed files with 7 additions and 22 deletions

View File

@ -2,18 +2,13 @@ package com.massive
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.* import android.app.*
import android.content.ActivityNotFoundException
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.net.Uri
import android.os.Build import android.os.Build
import android.os.CountDownTimer import android.os.CountDownTimer
import android.os.PowerManager
import android.provider.Settings
import android.util.Log import android.util.Log
import android.widget.Toast
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import com.facebook.react.bridge.* import com.facebook.react.bridge.*
@ -73,12 +68,8 @@ class AlarmModule constructor(context: ReactApplicationContext?) :
running = true running = true
val manager = getManager() val manager = getManager()
manager.cancel(NOTIFICATION_ID_DONE) manager.cancel(NOTIFICATION_ID_DONE)
reactApplicationContext.stopService( val intent = Intent(reactApplicationContext, AlarmService::class.java)
Intent( reactApplicationContext.stopService(intent)
reactApplicationContext,
AlarmService::class.java
)
)
} }
@RequiresApi(api = Build.VERSION_CODES.O) @RequiresApi(api = Build.VERSION_CODES.O)
@ -87,12 +78,8 @@ class AlarmModule constructor(context: ReactApplicationContext?) :
Log.d("AlarmModule", "Stop alarm.") Log.d("AlarmModule", "Stop alarm.")
countdownTimer?.cancel() countdownTimer?.cancel()
running = false running = false
reactApplicationContext?.stopService( val intent = Intent(reactApplicationContext, AlarmService::class.java)
Intent( reactApplicationContext?.stopService(intent)
reactApplicationContext,
AlarmService::class.java
)
)
val manager = getManager() val manager = getManager()
manager.cancel(NOTIFICATION_ID_DONE) manager.cancel(NOTIFICATION_ID_DONE)
manager.cancel(NOTIFICATION_ID_PENDING) manager.cancel(NOTIFICATION_ID_PENDING)
@ -111,11 +98,8 @@ class AlarmModule constructor(context: ReactApplicationContext?) :
Log.d("AlarmModule", "Queue alarm for $milliseconds delay") Log.d("AlarmModule", "Queue alarm for $milliseconds delay")
val manager = getManager() val manager = getManager()
manager.cancel(NOTIFICATION_ID_DONE) manager.cancel(NOTIFICATION_ID_DONE)
reactApplicationContext.stopService( val intent = Intent(reactApplicationContext, AlarmService::class.java)
Intent( reactApplicationContext.stopService(intent)
reactApplicationContext, AlarmService::class.java
)
)
countdownTimer?.cancel() countdownTimer?.cancel()
countdownTimer = getTimer(milliseconds, vibrate, sound, noSound) countdownTimer = getTimer(milliseconds, vibrate, sound, noSound)
countdownTimer?.start() countdownTimer?.start()
@ -226,6 +210,7 @@ class AlarmModule constructor(context: ReactApplicationContext?) :
) )
alarmsChannel.description = "Alarms for rest timers." alarmsChannel.description = "Alarms for rest timers."
alarmsChannel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC alarmsChannel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
alarmsChannel.setSound(null, null)
val notificationManager = reactApplicationContext.getSystemService( val notificationManager = reactApplicationContext.getSystemService(
NotificationManager::class.java NotificationManager::class.java
) )