Update AndroidNotificationTray.kt

pull/627/head
Nguyen Ly Nam 5 years ago committed by GitHub
parent 21fc5ae85c
commit 0eb5c4e443
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -69,11 +69,11 @@ class AndroidNotificationTray
} catch (e: RuntimeException) { } catch (e: RuntimeException) {
// Some Xiaomi phones produce a RuntimeException if custom notification sounds are used. // Some Xiaomi phones produce a RuntimeException if custom notification sounds are used.
Log.i("AndroidNotificationTray", Log.i("AndroidNotificationTray",
"Failed to show notification. Retrying without sound.") "Failed to show notification. Retrying without sound.")
val n = buildNotification(habit, val n = buildNotification(habit,
reminderTime, reminderTime,
timestamp, timestamp,
disableSound = true) disableSound = true)
notificationManager.notify(notificationId, n) notificationManager.notify(notificationId, n)
} }
@ -95,7 +95,8 @@ class AndroidNotificationTray
context.getString(R.string.no), context.getString(R.string.no),
pendingIntents.removeRepetition(habit)) pendingIntents.removeRepetition(habit))
val enterAction = Action(R.drawable.ic_action_check, val enterAction = Action(
R.drawable.ic_action_check,
context.getString(R.string.enter), context.getString(R.string.enter),
pendingIntents.setNumericalValue(context, habit, 0, null)) pendingIntents.setNumericalValue(context, habit, 0, null))
@ -110,7 +111,7 @@ class AndroidNotificationTray
val builder = Builder(context, REMINDERS_CHANNEL_ID) val builder = Builder(context, REMINDERS_CHANNEL_ID)
.setSmallIcon(R.drawable.ic_notification) .setSmallIcon(R.drawable.ic_notification)
.setContentTitle(habit.name) .setContentTitle(habit.name)
.setContentText(if (habit.question.isBlank()) defaultText else habit.question) .setContentText(if(habit.question.isBlank()) defaultText else habit.question)
.setContentIntent(pendingIntents.showHabit(habit)) .setContentIntent(pendingIntents.showHabit(habit))
.setDeleteIntent(pendingIntents.dismissNotification(habit)) .setDeleteIntent(pendingIntents.dismissNotification(habit))
.setSound(null) .setSound(null)
@ -137,8 +138,8 @@ class AndroidNotificationTray
builder.setLights(Color.RED, 1000, 1000) builder.setLights(Color.RED, 1000, 1000)
val snoozeAction = Action(R.drawable.ic_action_snooze, val snoozeAction = Action(R.drawable.ic_action_snooze,
context.getString(R.string.snooze), context.getString(R.string.snooze),
pendingIntents.snoozeNotification(habit)) pendingIntents.snoozeNotification(habit))
wearableExtender.addAction(snoozeAction) wearableExtender.addAction(snoozeAction)
builder.addAction(snoozeAction) builder.addAction(snoozeAction)
@ -153,8 +154,8 @@ class AndroidNotificationTray
as NotificationManager as NotificationManager
if (SDK_INT >= Build.VERSION_CODES.O) { if (SDK_INT >= Build.VERSION_CODES.O) {
val channel = NotificationChannel(REMINDERS_CHANNEL_ID, val channel = NotificationChannel(REMINDERS_CHANNEL_ID,
context.resources.getString(R.string.reminder), context.resources.getString(R.string.reminder),
NotificationManager.IMPORTANCE_DEFAULT) NotificationManager.IMPORTANCE_DEFAULT)
notificationManager.createNotificationChannel(channel) notificationManager.createNotificationChannel(channel)
} }
} }

Loading…
Cancel
Save