Skip to content

Commit 89a6576

Browse files
tibbitibbi
committed
renaming some values related to default reminders for clarity
1 parent b42571c commit 89a6576

File tree

34 files changed

+61
-61
lines changed

34 files changed

+61
-61
lines changed

Diff for: ‎app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ class EventActivity : SimpleActivity() {
9494
cancelNotification(mEvent.id)
9595
} else {
9696
mEvent = Event()
97-
mReminder1Minutes = if (config.useDefaultReminder) config.defaultReminderMinutes else config.defaultReminder1
98-
mReminder2Minutes = if (config.useDefaultReminder) config.defaultReminderMinutes2 else config.defaultReminder2
99-
mReminder3Minutes = if (config.useDefaultReminder) config.defaultReminderMinutes3 else config.defaultReminder3
97+
mReminder1Minutes = if (config.usePreviousEventReminders) config.lastEventReminderMinutes else config.defaultReminder1
98+
mReminder2Minutes = if (config.usePreviousEventReminders) config.lastEventReminderMinutes2 else config.defaultReminder2
99+
mReminder3Minutes = if (config.usePreviousEventReminders) config.lastEventReminderMinutes3 else config.defaultReminder3
100100

101101
if (savedInstanceState == null) {
102102
setupNewEvent()
@@ -715,10 +715,10 @@ class EventActivity : SimpleActivity() {
715715
val reminder3 = reminders.getOrElse(2) { REMINDER_OFF }
716716

717717
config.apply {
718-
if (useDefaultReminder) {
719-
defaultReminderMinutes = reminder1
720-
defaultReminderMinutes2 = reminder2
721-
defaultReminderMinutes3 = reminder3
718+
if (usePreviousEventReminders) {
719+
lastEventReminderMinutes = reminder1
720+
lastEventReminderMinutes2 = reminder2
721+
lastEventReminderMinutes3 = reminder3
722722
}
723723
}
724724

Diff for: ‎app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -392,12 +392,12 @@ class SettingsActivity : SimpleActivity() {
392392
}
393393

394394
private fun setupDefaultReminder() {
395-
settings_use_default_reminder.isChecked = config.useDefaultReminder
396-
toggleDefaultRemindersVisibility(!config.useDefaultReminder)
397-
settings_use_default_reminder_holder.setOnClickListener {
398-
settings_use_default_reminder.toggle()
399-
config.useDefaultReminder = settings_use_default_reminder.isChecked
400-
toggleDefaultRemindersVisibility(!settings_use_default_reminder.isChecked)
395+
settings_use_last_event_reminders.isChecked = config.usePreviousEventReminders
396+
toggleDefaultRemindersVisibility(!config.usePreviousEventReminders)
397+
settings_use_last_event_reminders_holder.setOnClickListener {
398+
settings_use_last_event_reminders.toggle()
399+
config.usePreviousEventReminders = settings_use_last_event_reminders.isChecked
400+
toggleDefaultRemindersVisibility(!settings_use_last_event_reminders.isChecked)
401401
}
402402
}
403403

Diff for: ‎app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt

+12-12
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ class Config(context: Context) : BaseConfig(context) {
5252
get() = prefs.getInt(VIEW, MONTHLY_VIEW)
5353
set(view) = prefs.edit().putInt(VIEW, view).apply()
5454

55-
var defaultReminderMinutes: Int
56-
get() = prefs.getInt(REMINDER_MINUTES, 10)
57-
set(defaultReminderMinutes) = prefs.edit().putInt(REMINDER_MINUTES, defaultReminderMinutes).apply()
55+
var lastEventReminderMinutes: Int
56+
get() = prefs.getInt(LAST_EVENT_REMINDER_MINUTES, 10)
57+
set(lastEventReminderMinutes) = prefs.edit().putInt(LAST_EVENT_REMINDER_MINUTES, lastEventReminderMinutes).apply()
5858

59-
var defaultReminderMinutes2: Int
60-
get() = prefs.getInt(REMINDER_MINUTES_2, REMINDER_OFF)
61-
set(defaultReminderMinutes2) = prefs.edit().putInt(REMINDER_MINUTES_2, defaultReminderMinutes2).apply()
59+
var lastEventReminderMinutes2: Int
60+
get() = prefs.getInt(LAST_EVENT_REMINDER_MINUTES_2, REMINDER_OFF)
61+
set(lastEventReminderMinutes2) = prefs.edit().putInt(LAST_EVENT_REMINDER_MINUTES_2, lastEventReminderMinutes2).apply()
6262

63-
var defaultReminderMinutes3: Int
64-
get() = prefs.getInt(REMINDER_MINUTES_3, REMINDER_OFF)
65-
set(defaultReminderMinutes3) = prefs.edit().putInt(REMINDER_MINUTES_3, defaultReminderMinutes3).apply()
63+
var lastEventReminderMinutes3: Int
64+
get() = prefs.getInt(LAST_EVENT_REMINDER_MINUTES_3, REMINDER_OFF)
65+
set(lastEventReminderMinutes3) = prefs.edit().putInt(LAST_EVENT_REMINDER_MINUTES_3, lastEventReminderMinutes3).apply()
6666

6767
var displayPastEvents: Int
6868
get() = prefs.getInt(DISPLAY_PAST_EVENTS, DAY_MINUTES)
@@ -143,9 +143,9 @@ class Config(context: Context) : BaseConfig(context) {
143143
private fun getMediumFontSize() = context.resources.getDimension(R.dimen.day_text_size) / context.resources.displayMetrics.density
144144
private fun getLargeFontSize() = getMediumFontSize() + 3f
145145

146-
var useDefaultReminder: Boolean
147-
get() = prefs.getBoolean(USE_DEFAULT_REMINDER, true)
148-
set(useDefaultReminder) = prefs.edit().putBoolean(USE_DEFAULT_REMINDER, useDefaultReminder).apply()
146+
var usePreviousEventReminders: Boolean
147+
get() = prefs.getBoolean(USE_PREVIOUS_EVENT_REMINDERS, true)
148+
set(usePreviousEventReminders) = prefs.edit().putBoolean(USE_PREVIOUS_EVENT_REMINDERS, usePreviousEventReminders).apply()
149149

150150
var defaultReminder1: Int
151151
get() = prefs.getInt(DEFAULT_REMINDER_1, 10)

Diff for: ‎app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ const val VIBRATE = "vibrate"
4141
const val REMINDER_SOUND_URI = "reminder_sound_uri"
4242
const val REMINDER_SOUND_TITLE = "reminder_sound_title"
4343
const val VIEW = "view"
44-
const val REMINDER_MINUTES = "reminder_minutes"
45-
const val REMINDER_MINUTES_2 = "reminder_minutes_2"
46-
const val REMINDER_MINUTES_3 = "reminder_minutes_3"
44+
const val LAST_EVENT_REMINDER_MINUTES = "reminder_minutes"
45+
const val LAST_EVENT_REMINDER_MINUTES_2 = "reminder_minutes_2"
46+
const val LAST_EVENT_REMINDER_MINUTES_3 = "reminder_minutes_3"
4747
const val DISPLAY_EVENT_TYPES = "display_event_types"
4848
const val FONT_SIZE = "font_size"
4949
const val CALDAV_SYNC = "caldav_sync"
@@ -58,7 +58,7 @@ const val DIM_PAST_EVENTS = "dim_past_events"
5858
const val LAST_SOUND_URI = "last_sound_uri"
5959
const val LAST_REMINDER_CHANNEL_ID = "last_reminder_channel_ID"
6060
const val REMINDER_AUDIO_STREAM = "reminder_audio_stream"
61-
const val USE_DEFAULT_REMINDER = "use_default_reminder"
61+
const val USE_PREVIOUS_EVENT_REMINDERS = "use_previous_event_reminders"
6262
const val DEFAULT_REMINDER_1 = "default_reminder_1"
6363
const val DEFAULT_REMINDER_2 = "default_reminder_2"
6464
const val DEFAULT_REMINDER_3 = "default_reminder_3"

Diff for: ‎app/src/main/res/layout/activity_settings.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@
361361
</RelativeLayout>
362362

363363
<RelativeLayout
364-
android:id="@+id/settings_use_default_reminder_holder"
364+
android:id="@+id/settings_use_last_event_reminders_holder"
365365
android:layout_width="match_parent"
366366
android:layout_height="wrap_content"
367367
android:layout_marginTop="@dimen/medium_margin"
@@ -372,14 +372,14 @@
372372
android:paddingTop="@dimen/activity_margin">
373373

374374
<com.simplemobiletools.commons.views.MySwitchCompat
375-
android:id="@+id/settings_use_default_reminder"
375+
android:id="@+id/settings_use_last_event_reminders"
376376
android:layout_width="match_parent"
377377
android:layout_height="wrap_content"
378378
android:background="@null"
379379
android:clickable="false"
380380
android:paddingLeft="@dimen/medium_margin"
381381
android:paddingStart="@dimen/medium_margin"
382-
android:text="@string/use_default_reminder"/>
382+
android:text="@string/use_last_event_reminders"/>
383383

384384
</RelativeLayout>
385385

Diff for: ‎app/src/main/res/values-az/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Zəng</string>
165165
<string name="notification_stream">Bildiriş</string>
166166
<string name="ring_stream">Zəng səsi</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-br/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-cs/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Budík</string>
165165
<string name="notification_stream">Notifikace</string>
166166
<string name="ring_stream">Zvonek</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-da/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notifikation</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-de/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Wecker</string>
165165
<string name="notification_stream">Benachrichtigung</string>
166166
<string name="ring_stream">Klingelton</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-el/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Αφύπνιση</string>
165165
<string name="notification_stream">Ειδοποίηση</string>
166166
<string name="ring_stream">Κουδούνισμα</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-es/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-fr/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarme</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-gl/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-hi-rIN/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<string name="alarm_stream">Alarm</string>
166166
<string name="notification_stream">Notification</string>
167167
<string name="ring_stream">Ring</string>
168-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
168+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
169169
<string name="default_reminder_1">Default reminder 1</string>
170170
<string name="default_reminder_2">Default reminder 2</string>
171171
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-hr/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Obavijest</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-hu/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-it/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-iw/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<string name="alarm_stream">Alarm</string>
166166
<string name="notification_stream">Notification</string>
167167
<string name="ring_stream">Ring</string>
168-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
168+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
169169
<string name="default_reminder_1">Default reminder 1</string>
170170
<string name="default_reminder_2">Default reminder 2</string>
171171
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-ja/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-ko/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-lt/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-nb/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Varsel</string>
166166
<string name="ring_stream">Ringetone</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-nl/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notificatie</string>
166166
<string name="ring_stream">Beltoon</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-no/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Notification</string>
166166
<string name="ring_stream">Ring</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

Diff for: ‎app/src/main/res/values-pl/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<string name="alarm_stream">Alarm</string>
165165
<string name="notification_stream">Powiadomienie</string>
166166
<string name="ring_stream">Dzwonek</string>
167-
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
167+
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
168168
<string name="default_reminder_1">Default reminder 1</string>
169169
<string name="default_reminder_2">Default reminder 2</string>
170170
<string name="default_reminder_3">Default reminder 3</string>

0 commit comments

Comments
 (0)