fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-05-31 19:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

show the alarm label at notification and reminder screen, if set

Browse Source
This commit is contained in:
tibbi 2018-03-28 17:23:13 +02:00
parent dfaa49cfc3
commit 32c41e9261
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
View File

@ -29,7 +29,17 @@ class ReminderActivity : SimpleActivity() {
alarm = dbHelper.getAlarmWithId(id) ?: return alarm = dbHelper.getAlarmWithId(id) ?: return
} }
reminder_title.text = getString(if (isAlarmReminder) R.string.alarm else R.string.timer) val label = if (isAlarmReminder) {
if (alarm!!.label.isEmpty()) {
getString(R.string.alarm)
} else {
alarm!!.label
}
} else {
getString(R.string.timer)
}
reminder_title.text = label
reminder_text.text = if (isAlarmReminder) getFormattedTime(getPassedSeconds(), false, false) else getString(R.string.time_expired) reminder_text.text = if (isAlarmReminder) getFormattedTime(getPassedSeconds(), false, false) else getString(R.string.time_expired)
reminder_stop.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, getAdjustedPrimaryColor()) reminder_stop.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, getAdjustedPrimaryColor())
reminder_stop.setOnClickListener { reminder_stop.setOnClickListener {

5
app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
View File

@ -284,9 +284,10 @@ fun Context.getHideAlarmPendingIntent(alarm: Alarm): PendingIntent {
@SuppressLint("NewApi") @SuppressLint("NewApi")
fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, addDeleteIntent: Boolean): Notification { fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, addDeleteIntent: Boolean): Notification {
val channelId = "alarm_channel" val channelId = "alarm_channel"
val label = if (alarm.label.isNotEmpty()) alarm.label else getString(R.string.alarm)
if (isOreoPlus()) { if (isOreoPlus()) {
val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
val name = getString(R.string.alarm) val name = label
val importance = NotificationManager.IMPORTANCE_HIGH val importance = NotificationManager.IMPORTANCE_HIGH
NotificationChannel(channelId, name, importance).apply { NotificationChannel(channelId, name, importance).apply {
enableLights(true) enableLights(true)
@ -298,7 +299,7 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, add
val reminderActivityIntent = getReminderActivityIntent() val reminderActivityIntent = getReminderActivityIntent()
val builder = NotificationCompat.Builder(this) val builder = NotificationCompat.Builder(this)
.setContentTitle(getString(R.string.alarm)) .setContentTitle(label)
.setContentText(getFormattedTime(getPassedSeconds(), false, false)) .setContentText(getFormattedTime(getPassedSeconds(), false, false))
.setSmallIcon(R.drawable.ic_alarm) .setSmallIcon(R.drawable.ic_alarm)
.setContentIntent(pendingIntent) .setContentIntent(pendingIntent)