Merge branch 'master' into feature/357-new-intents

This commit is contained in:
Ensar Sarajčić
2023-09-01 10:35:05 +02:00
2 changed files with 3 additions and 3 deletions

View File

@ -195,6 +195,7 @@ fun Context.getAlarmIntent(alarm: Alarm): PendingIntent {
fun Context.cancelAlarmClock(alarm: Alarm) { fun Context.cancelAlarmClock(alarm: Alarm) {
val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
alarmManager.cancel(getAlarmIntent(alarm)) alarmManager.cancel(getAlarmIntent(alarm))
alarmManager.cancel(getEarlyAlarmDismissalIntent(alarm))
} }
fun Context.hideNotification(id: Int) { fun Context.hideNotification(id: Int) {

View File

@ -32,8 +32,7 @@
<string name="no_timers_found">Nessun contaminuti trovato</string> <string name="no_timers_found">Nessun contaminuti trovato</string>
<string name="add_timer">Aggiungi contaminuti</string> <string name="add_timer">Aggiungi contaminuti</string>
<string name="upcoming_alarm">Allarme imminente</string> <string name="upcoming_alarm">Allarme imminente</string>
<string name="early_alarm_dismissal">Early alarm dismissal</string> <string name="early_alarm_dismissal">Arresto anticipato dell\'allarme</string>
<!--Timer--> <!--Timer-->
<string name="timers_notification_msg">I contaminuti sono in funzione</string> <string name="timers_notification_msg">I contaminuti sono in funzione</string>
<string name="timer_single_notification_label_msg">Il contaminuti per %s è in funzione</string> <string name="timer_single_notification_label_msg">Il contaminuti per %s è in funzione</string>
@ -57,4 +56,4 @@
Haven't found some strings? There's more at Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
--> -->
</resources> </resources>