diff --git a/app/build.gradle b/app/build.gradle index 1e8e6a475..915fbfe86 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,7 +43,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.0.22' + implementation 'com.simplemobiletools:commons:3.0.23' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt index 544e00e3d..6c0d16248 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt @@ -1,10 +1,7 @@ package com.simplemobiletools.calendar.extensions -import android.annotation.TargetApi -import android.app.AlarmManager -import android.app.Notification -import android.app.NotificationManager -import android.app.PendingIntent +import android.annotation.SuppressLint +import android.app.* import android.appwidget.AppWidgetManager import android.content.ComponentName import android.content.Context @@ -12,7 +9,6 @@ import android.content.Intent import android.content.res.Resources import android.graphics.Color import android.net.Uri -import android.os.Build import android.support.v4.app.NotificationCompat import android.view.Gravity import android.view.View @@ -73,7 +69,6 @@ fun Context.scheduleNextEventReminder(event: Event, dbHelper: DBHelper) { val now = (System.currentTimeMillis() / 1000).toInt() val reminderSeconds = event.getReminders().reversed().map { it * 60 } - dbHelper.getEvents(now, now + YEAR, event.id) { if (it.isNotEmpty()) { for (curEvent in it) { @@ -175,8 +170,21 @@ fun Context.notifyEvent(event: Event) { notificationManager.notify(event.id, notification) } -@TargetApi(Build.VERSION_CODES.LOLLIPOP) +@SuppressLint("NewApi") private fun getNotification(context: Context, pendingIntent: PendingIntent, event: Event, content: String): Notification { + val channelId = "reminder_channel" + if (context.isOreoPlus()) { + val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + val name = context.resources.getString(R.string.event_reminders) + val importance = NotificationManager.IMPORTANCE_HIGH + NotificationChannel(channelId, name, importance).apply { + enableLights(true) + lightColor = event.color + enableVibration(false) + notificationManager.createNotificationChannel(this) + } + } + val soundUri = Uri.parse(context.config.reminderSound) val builder = NotificationCompat.Builder(context) .setContentTitle(event.title) @@ -187,6 +195,7 @@ private fun getNotification(context: Context, pendingIntent: PendingIntent, even .setDefaults(Notification.DEFAULT_LIGHTS) .setAutoCancel(true) .setSound(soundUri) + .setChannelId(channelId) .addAction(R.drawable.ic_snooze, context.getString(R.string.snooze), getSnoozePendingIntent(context, event)) if (context.isLollipopPlus()) diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index 13e33131d..cf18ac4e7 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -118,6 +118,7 @@ eur a zevezhioù Ouzhpennañ un adc\'halv all + Event reminders %dvunutenn a-raok diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6f5f9f493..4c06dfe5d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -122,6 +122,7 @@ hodin dnů Přidat další připomenutí + Event reminders před %d minutou diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f0f7827c5..7d60656fd 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -118,6 +118,7 @@ hours days Add another reminder + Event reminders %d minute before diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 85fbc765f..fd6260878 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -118,6 +118,7 @@ Stunden Tage Füge eine weitere Erinnerung hinzu + Event reminders %d Minute vorher diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3cf17f1b6..aadb1ecb1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -118,6 +118,7 @@ horas días Agregar otro recordatorio + Event reminders %d minuto antes diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 883f6a334..2cf226865 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -118,6 +118,7 @@ heures jours Ajouter un autre rappel + Event reminders %d minute avant diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index b2b810734..9d0daec59 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -118,6 +118,7 @@ hours days Add another reminder + Event reminders %d minute before diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a510cc38c..36bf6d51f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -118,6 +118,7 @@ óra nap Add another reminder + Event reminders %d percel korábban diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7a40f1d6f..12d0dc803 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -118,6 +118,7 @@ hours days Add another reminder + Event reminders %d minute before diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 89c297ad2..75526f1d0 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -118,6 +118,7 @@ hours days Add another reminder + Event reminders %d minute before diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bd1c6e2fb..b6d1868f3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -118,6 +118,7 @@ 時間 Add another reminder + Event reminders %d minute before diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 031ab69a1..62b3af11d 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -118,6 +118,7 @@ 시간 다른 알림 추가 + Event reminders %d 분 전 diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 1bc32c2a5..40a20dfb0 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -118,6 +118,7 @@ timer dager Legg til en annen påminnelse + Event reminders %d minutt før diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8cb4755a5..b3364f62c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -118,6 +118,7 @@ uren dagen Herinnering toevoegen + Event reminders %d minuut van tevoren diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 1bc32c2a5..40a20dfb0 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -118,6 +118,7 @@ timer dager Legg til en annen påminnelse + Event reminders %d minutt før diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index e9e059785..6095d0d49 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -121,6 +121,7 @@ godziny dni Dodaj inne przypomnienie + Event reminders %d minutę przed diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 65f93ab25..d171eb9ad 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -118,6 +118,7 @@ horas dias Adicionar outro lembrete + Event reminders %d minuto antes diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index fbcce45fb..cd4143d79 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -118,6 +118,7 @@ horas dias Adicionar outro lembrete + Event reminders %d minuto antes diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e551d5390..b405b19cf 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -126,6 +126,7 @@ часов дней Добавить ещё одно напоминание + Event reminders %d минута до события diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 78b726cb7..5f2f40e07 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -122,6 +122,7 @@ hodiny dni Pridať ďalšiu pripomienku + Pripomienky udalostí %d minútu vopred diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index df7c00170..399ca9cff 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -118,6 +118,7 @@ timmar dagar Lägg till en annan påminnelse + Event reminders %d minut före diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 400552b2c..77996c020 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -118,6 +118,7 @@ saatler günler Başka bir hatırlatma ekle + Event reminders %d dakika önce diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f0f7827c5..7d60656fd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -118,6 +118,7 @@ hours days Add another reminder + Event reminders %d minute before