From 47c4564cf07c79aab12940690f4e730f1f41dc20 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 23 Feb 2021 14:31:04 +0100 Subject: [PATCH] fix #1272, add a settings button for customizing the notifications --- .../pro/activities/SettingsActivity.kt | 18 +++++++++++----- app/src/main/res/layout/activity_settings.xml | 21 +++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt index 9e7f352af..13b658c72 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt @@ -43,6 +43,7 @@ class SettingsActivity : SimpleActivity() { private fun setupSettingItems() { setupCustomizeColors() + setupCustomizeNotifications() setupUseEnglish() setupManageEventTypes() setupHourFormat() @@ -139,6 +140,13 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupCustomizeNotifications() { + settings_customize_notifications_holder.beVisibleIf(isOreoPlus()) + settings_customize_notifications_holder.setOnClickListener { + launchCustomizeNotificationsIntent() + } + } + private fun setupUseEnglish() { settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en") settings_use_english.isChecked = config.useEnglish @@ -340,11 +348,11 @@ class SettingsActivity : SimpleActivity() { updateReminderSound(it) } }, onAlarmSoundDeleted = { - if (it.uri == config.reminderSoundUri) { - val defaultAlarm = getDefaultAlarmSound(RingtoneManager.TYPE_NOTIFICATION) - updateReminderSound(defaultAlarm) - } - }) + if (it.uri == config.reminderSoundUri) { + val defaultAlarm = getDefaultAlarmSound(RingtoneManager.TYPE_NOTIFICATION) + updateReminderSound(defaultAlarm) + } + }) } } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index fc2f5110b..f7b2940d8 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -32,6 +32,27 @@ + + + + + +