diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt index c336dcab..e328841f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt @@ -29,7 +29,17 @@ class ReminderActivity : SimpleActivity() { 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_stop.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, getAdjustedPrimaryColor()) reminder_stop.setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt index 550c7f8e..605bc68c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -284,9 +284,10 @@ fun Context.getHideAlarmPendingIntent(alarm: Alarm): PendingIntent { @SuppressLint("NewApi") fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, addDeleteIntent: Boolean): Notification { val channelId = "alarm_channel" + val label = if (alarm.label.isNotEmpty()) alarm.label else getString(R.string.alarm) if (isOreoPlus()) { val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - val name = getString(R.string.alarm) + val name = label val importance = NotificationManager.IMPORTANCE_HIGH NotificationChannel(channelId, name, importance).apply { enableLights(true) @@ -298,7 +299,7 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, add val reminderActivityIntent = getReminderActivityIntent() val builder = NotificationCompat.Builder(this) - .setContentTitle(getString(R.string.alarm)) + .setContentTitle(label) .setContentText(getFormattedTime(getPassedSeconds(), false, false)) .setSmallIcon(R.drawable.ic_alarm) .setContentIntent(pendingIntent)