renaming some values related to default reminders for clarity

This commit is contained in:
tibbi
2018-09-22 11:09:02 +02:00
parent b42571cf2f
commit 89a6576a15
34 changed files with 61 additions and 61 deletions

View File

@@ -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
}
}

View File

@@ -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)
}
}

View File

@@ -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)

View File

@@ -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"

View File

@@ -361,7 +361,7 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_use_default_reminder_holder"
android:id="@+id/settings_use_last_event_reminders_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
@@ -372,14 +372,14 @@
android:paddingTop="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_use_default_reminder"
android:id="@+id/settings_use_last_event_reminders"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/use_default_reminder"/>
android:text="@string/use_last_event_reminders"/>
</RelativeLayout>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Zəng</string>
<string name="notification_stream">Bildiriş</string>
<string name="ring_stream">Zəng səsi</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Budík</string>
<string name="notification_stream">Notifikace</string>
<string name="ring_stream">Zvonek</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notifikation</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Wecker</string>
<string name="notification_stream">Benachrichtigung</string>
<string name="ring_stream">Klingelton</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

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

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarme</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -165,7 +165,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Obavijest</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -165,7 +165,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Varsel</string>
<string name="ring_stream">Ringetone</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notificatie</string>
<string name="ring_stream">Beltoon</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Powiadomienie</string>
<string name="ring_stream">Dzwonek</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarme</string>
<string name="notification_stream">Notificação</string>
<string name="ring_stream">Toque</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarme</string>
<string name="notification_stream">Notificação</string>
<string name="ring_stream">Toque</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Будильник</string>
<string name="notification_stream">Уведомление</string>
<string name="ring_stream">Звонок</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Výstražný</string>
<string name="notification_stream">Pripomienkový</string>
<string name="ring_stream">Zvoniaci</string>
<string name="use_default_reminder">Použiť pripomienky poslednej udalosti ako predvolené pre novú udalosť</string>
<string name="use_last_event_reminders">Použiť pripomienky poslednej udalosti ako predvolené pre novú udalosť</string>
<string name="default_reminder_1">Predvolená pripomienka 1</string>
<string name="default_reminder_2">Predvolená pripomienka 2</string>
<string name="default_reminder_3">Predvolená pripomienka 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Avisering</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Bildirim</string>
<string name="ring_stream">Zil sesi</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">鬧鐘</string>
<string name="notification_stream">通知</string>
<string name="ring_stream">鈴聲</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>

View File

@@ -164,7 +164,7 @@
<string name="alarm_stream">Alarm</string>
<string name="notification_stream">Notification</string>
<string name="ring_stream">Ring</string>
<string name="use_default_reminder">Use the last events\' reminders as the default for new event</string>
<string name="use_last_event_reminders">Use the last events\' reminders as the default for new event</string>
<string name="default_reminder_1">Default reminder 1</string>
<string name="default_reminder_2">Default reminder 2</string>
<string name="default_reminder_3">Default reminder 3</string>