diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index 072551bf8..c3dc37a78 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -94,9 +94,9 @@ class EventActivity : SimpleActivity() {
cancelNotification(mEvent.id)
} else {
mEvent = Event()
- mReminder1Minutes = if (config.useDefaultReminder) config.defaultReminderMinutes else config.defaultReminder1
- mReminder2Minutes = if (config.useDefaultReminder) config.defaultReminderMinutes2 else config.defaultReminder2
- mReminder3Minutes = if (config.useDefaultReminder) config.defaultReminderMinutes3 else config.defaultReminder3
+ mReminder1Minutes = if (config.usePreviousEventReminders) config.lastEventReminderMinutes else config.defaultReminder1
+ mReminder2Minutes = if (config.usePreviousEventReminders) config.lastEventReminderMinutes2 else config.defaultReminder2
+ mReminder3Minutes = if (config.usePreviousEventReminders) config.lastEventReminderMinutes3 else config.defaultReminder3
if (savedInstanceState == null) {
setupNewEvent()
@@ -715,10 +715,10 @@ class EventActivity : SimpleActivity() {
val reminder3 = reminders.getOrElse(2) { REMINDER_OFF }
config.apply {
- if (useDefaultReminder) {
- defaultReminderMinutes = reminder1
- defaultReminderMinutes2 = reminder2
- defaultReminderMinutes3 = reminder3
+ if (usePreviousEventReminders) {
+ lastEventReminderMinutes = reminder1
+ lastEventReminderMinutes2 = reminder2
+ lastEventReminderMinutes3 = reminder3
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
index 9019cfdb9..f231627a1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
@@ -392,12 +392,12 @@ class SettingsActivity : SimpleActivity() {
}
private fun setupDefaultReminder() {
- settings_use_default_reminder.isChecked = config.useDefaultReminder
- toggleDefaultRemindersVisibility(!config.useDefaultReminder)
- settings_use_default_reminder_holder.setOnClickListener {
- settings_use_default_reminder.toggle()
- config.useDefaultReminder = settings_use_default_reminder.isChecked
- toggleDefaultRemindersVisibility(!settings_use_default_reminder.isChecked)
+ settings_use_last_event_reminders.isChecked = config.usePreviousEventReminders
+ toggleDefaultRemindersVisibility(!config.usePreviousEventReminders)
+ settings_use_last_event_reminders_holder.setOnClickListener {
+ settings_use_last_event_reminders.toggle()
+ config.usePreviousEventReminders = settings_use_last_event_reminders.isChecked
+ toggleDefaultRemindersVisibility(!settings_use_last_event_reminders.isChecked)
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
index ac4cb4f93..021c78bdf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
@@ -52,17 +52,17 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getInt(VIEW, MONTHLY_VIEW)
set(view) = prefs.edit().putInt(VIEW, view).apply()
- var defaultReminderMinutes: Int
- get() = prefs.getInt(REMINDER_MINUTES, 10)
- set(defaultReminderMinutes) = prefs.edit().putInt(REMINDER_MINUTES, defaultReminderMinutes).apply()
+ var lastEventReminderMinutes: Int
+ get() = prefs.getInt(LAST_EVENT_REMINDER_MINUTES, 10)
+ set(lastEventReminderMinutes) = prefs.edit().putInt(LAST_EVENT_REMINDER_MINUTES, lastEventReminderMinutes).apply()
- var defaultReminderMinutes2: Int
- get() = prefs.getInt(REMINDER_MINUTES_2, REMINDER_OFF)
- set(defaultReminderMinutes2) = prefs.edit().putInt(REMINDER_MINUTES_2, defaultReminderMinutes2).apply()
+ var lastEventReminderMinutes2: Int
+ get() = prefs.getInt(LAST_EVENT_REMINDER_MINUTES_2, REMINDER_OFF)
+ set(lastEventReminderMinutes2) = prefs.edit().putInt(LAST_EVENT_REMINDER_MINUTES_2, lastEventReminderMinutes2).apply()
- var defaultReminderMinutes3: Int
- get() = prefs.getInt(REMINDER_MINUTES_3, REMINDER_OFF)
- set(defaultReminderMinutes3) = prefs.edit().putInt(REMINDER_MINUTES_3, defaultReminderMinutes3).apply()
+ var lastEventReminderMinutes3: Int
+ get() = prefs.getInt(LAST_EVENT_REMINDER_MINUTES_3, REMINDER_OFF)
+ set(lastEventReminderMinutes3) = prefs.edit().putInt(LAST_EVENT_REMINDER_MINUTES_3, lastEventReminderMinutes3).apply()
var displayPastEvents: Int
get() = prefs.getInt(DISPLAY_PAST_EVENTS, DAY_MINUTES)
@@ -143,9 +143,9 @@ class Config(context: Context) : BaseConfig(context) {
private fun getMediumFontSize() = context.resources.getDimension(R.dimen.day_text_size) / context.resources.displayMetrics.density
private fun getLargeFontSize() = getMediumFontSize() + 3f
- var useDefaultReminder: Boolean
- get() = prefs.getBoolean(USE_DEFAULT_REMINDER, true)
- set(useDefaultReminder) = prefs.edit().putBoolean(USE_DEFAULT_REMINDER, useDefaultReminder).apply()
+ var usePreviousEventReminders: Boolean
+ get() = prefs.getBoolean(USE_PREVIOUS_EVENT_REMINDERS, true)
+ set(usePreviousEventReminders) = prefs.edit().putBoolean(USE_PREVIOUS_EVENT_REMINDERS, usePreviousEventReminders).apply()
var defaultReminder1: Int
get() = prefs.getInt(DEFAULT_REMINDER_1, 10)
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
index c9f0ac49c..ce736e0e7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
@@ -41,9 +41,9 @@ const val VIBRATE = "vibrate"
const val REMINDER_SOUND_URI = "reminder_sound_uri"
const val REMINDER_SOUND_TITLE = "reminder_sound_title"
const val VIEW = "view"
-const val REMINDER_MINUTES = "reminder_minutes"
-const val REMINDER_MINUTES_2 = "reminder_minutes_2"
-const val REMINDER_MINUTES_3 = "reminder_minutes_3"
+const val LAST_EVENT_REMINDER_MINUTES = "reminder_minutes"
+const val LAST_EVENT_REMINDER_MINUTES_2 = "reminder_minutes_2"
+const val LAST_EVENT_REMINDER_MINUTES_3 = "reminder_minutes_3"
const val DISPLAY_EVENT_TYPES = "display_event_types"
const val FONT_SIZE = "font_size"
const val CALDAV_SYNC = "caldav_sync"
@@ -58,7 +58,7 @@ const val DIM_PAST_EVENTS = "dim_past_events"
const val LAST_SOUND_URI = "last_sound_uri"
const val LAST_REMINDER_CHANNEL_ID = "last_reminder_channel_ID"
const val REMINDER_AUDIO_STREAM = "reminder_audio_stream"
-const val USE_DEFAULT_REMINDER = "use_default_reminder"
+const val USE_PREVIOUS_EVENT_REMINDERS = "use_previous_event_reminders"
const val DEFAULT_REMINDER_1 = "default_reminder_1"
const val DEFAULT_REMINDER_2 = "default_reminder_2"
const val DEFAULT_REMINDER_3 = "default_reminder_3"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index f48e88328..14f5c73fa 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -361,7 +361,7 @@
+ android:text="@string/use_last_event_reminders"/>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index d9c4d20df..0a84291e9 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -164,7 +164,7 @@
Zəng
Bildiriş
Zəng səsi
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index d5a39e646..f2f959e06 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 2528a6279..dcccd881d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -164,7 +164,7 @@
Budík
Notifikace
Zvonek
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index a0167517a..771c2bba5 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notifikation
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 08f752519..2803e514e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -164,7 +164,7 @@
Wecker
Benachrichtigung
Klingelton
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index c6d0063db..6786b0bd4 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -164,7 +164,7 @@
Αφύπνιση
Ειδοποίηση
Κουδούνισμα
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7c934da9b..ccdcedc79 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3b18c01cc..db7adb867 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -164,7 +164,7 @@
Alarme
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 95dfb74f9..6b80a0c72 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index df9cd6e84..74b686969 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -165,7 +165,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 1d01d8125..ab52a489f 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -164,7 +164,7 @@
Alarm
Obavijest
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e4865bb1a..35037d3e9 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index fa56df194..5b4d0b7bb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index c4cf548bc..888d618b5 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -165,7 +165,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 1235467b0..6d625c422 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 5e86f0cd4..1b00ee085 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index eceb4638b..615fe9048 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index f99b1fd43..b5aa6d84f 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -164,7 +164,7 @@
Alarm
Varsel
Ringetone
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 470b8d12a..d6c878272 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notificatie
Beltoon
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index b25f954a6..b8e43aaf8 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 665cdc663..9b289c1f9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -164,7 +164,7 @@
Alarm
Powiadomienie
Dzwonek
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9266006e7..ded2b08d8 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -164,7 +164,7 @@
Alarme
Notificação
Toque
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index ebe4bf2a6..558daf055 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -164,7 +164,7 @@
Alarme
Notificação
Toque
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8e4cdf024..d245c38c0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -164,7 +164,7 @@
Будильник
Уведомление
Звонок
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index f96575ad2..0a5d783a6 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -164,7 +164,7 @@
Výstražný
Pripomienkový
Zvoniaci
- Použiť pripomienky poslednej udalosti ako predvolené pre novú udalosť
+ Použiť pripomienky poslednej udalosti ako predvolené pre novú udalosť
Predvolená pripomienka 1
Predvolená pripomienka 2
Predvolená pripomienka 3
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a389db76f..0b4b540bb 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -164,7 +164,7 @@
Alarm
Avisering
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 290599b50..ec742e565 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -164,7 +164,7 @@
Alarm
Bildirim
Zil sesi
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4ad4aae7b..715e32a4c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -164,7 +164,7 @@
鬧鐘
通知
鈴聲
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc93903be..b1de5682b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -164,7 +164,7 @@
Alarm
Notification
Ring
- Use the last events\' reminders as the default for new event
+ Use the last events\' reminders as the default for new event
Default reminder 1
Default reminder 2
Default reminder 3