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 7452610a8..c290d439d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -152,8 +152,8 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
updateRepetitionText()
checkRepeatTexts(interval)
- if (mRepeatInterval == DAY) {
- setRepeatRule(config.defaultDailyRepetition)
+ if (mRepeatInterval == WEEK) {
+ setRepeatRule(Math.pow(2.0, (mEventStartDateTime.dayOfWeek - 1).toDouble()).toInt())
}
}
@@ -161,7 +161,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
event_repetition_limit_holder.beGoneIf(limit == 0)
checkRepetitionLimitText()
- event_repetition_rule_holder.beVisibleIf(mRepeatInterval == DAY)
+ event_repetition_rule_holder.beVisibleIf(mRepeatInterval == WEEK)
checkRepetitionRuleText()
}
@@ -192,7 +192,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
}
private fun showRepetitionRuleDialog() {
- if (mRepeatInterval == DAY) {
+ if (mRepeatInterval == WEEK) {
RepeatRuleDailyDialog(this, mRepeatRule) {
setRepeatRule(it)
}
@@ -208,7 +208,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
}
private fun checkRepetitionRuleText() {
- if (mRepeatInterval == DAY) {
+ if (mRepeatInterval == WEEK) {
event_repetition_rule.text = getString(if (mRepeatRule == EVERY_DAY) R.string.every_day else R.string.selected_days)
}
}
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 a3839863f..f7e7cc8a2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
@@ -7,11 +7,9 @@ import android.net.Uri
import android.os.Bundle
import android.os.Parcelable
import com.simplemobiletools.calendar.R
-import com.simplemobiletools.calendar.dialogs.RepeatRuleDailyDialog
import com.simplemobiletools.calendar.extensions.config
import com.simplemobiletools.calendar.extensions.dbHelper
import com.simplemobiletools.calendar.extensions.getReminderText
-import com.simplemobiletools.calendar.helpers.EVERY_DAY
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.extensions.updateTextColors
@@ -52,7 +50,6 @@ class SettingsActivity : SimpleActivity() {
setupWeeklyEnd()
setupVibrate()
setupReminderSound()
- setupDailyRepetition()
setupEventReminder()
updateTextColors(settings_holder)
checkPrimaryColor()
@@ -187,20 +184,6 @@ class SettingsActivity : SimpleActivity() {
}
}
- private fun setupDailyRepetition() {
- updateDailyRepetitionText()
- settings_default_daily_repetition_holder.setOnClickListener {
- RepeatRuleDailyDialog(this, config.defaultDailyRepetition) {
- config.defaultDailyRepetition = it
- updateDailyRepetitionText()
- }
- }
- }
-
- private fun updateDailyRepetitionText() {
- settings_default_daily_repetition.text = getString(if (config.defaultDailyRepetition == EVERY_DAY) R.string.every_day else R.string.selected_days)
- }
-
private fun setupEventReminder() {
var reminderMinutes = config.defaultReminderMinutes
settings_default_reminder.text = getReminderText(reminderMinutes)
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 5fa41c541..25540708b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
@@ -57,12 +57,12 @@ fun Context.scheduleNextEventReminder(event: Event) {
reminderSeconds.forEach {
var startTS = event.startTS - it
if (event.repeatInterval == DAY) {
- while (startTS < now || isOccurrenceIgnored(event, startTS, it) || isWrongDay(event, startTS, it)) {
+ while (startTS < now || isOccurrenceIgnored(event, startTS, it)) {
startTS += event.repeatInterval
}
nextTS = Math.min(nextTS, startTS)
} else if (event.repeatInterval == WEEK) {
- while (startTS < now || isOccurrenceIgnored(event, startTS, it)) {
+ while (startTS < now || isOccurrenceIgnored(event, startTS, it) || isWrongDay(event, startTS, it)) {
startTS += event.repeatInterval
}
nextTS = Math.min(nextTS, startTS)
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 8bef4cc15..cb4fdeef5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
@@ -49,10 +49,6 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getInt(VIEW, MONTHLY_VIEW)
set(view) = prefs.edit().putInt(VIEW, view).apply()
- var defaultDailyRepetition: Int
- get() = prefs.getInt(DAILY_REPETITION, EVERY_DAY)
- set(dailyRepetition) = prefs.edit().putInt(DAILY_REPETITION, dailyRepetition).apply()
-
var defaultReminderMinutes: Int
get() = prefs.getInt(REMINDER_MINUTES, 10)
set(mins) = prefs.edit().putInt(REMINDER_MINUTES, mins).apply()
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 2f82e7878..6aab771fa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
@@ -38,7 +38,6 @@ val END_WEEKLY_AT = "end_weekly_at"
val VIBRATE = "vibrate"
val REMINDER_SOUND = "reminder_sound"
val VIEW = "view"
-val DAILY_REPETITION = "daily_repetition"
val REMINDER_MINUTES = "reminder_minutes"
val DISPLAY_EVENT_TYPES = "display_event_types"
val GOOGLE_SYNC = "google_sync"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 80c7704ed..780d94fce 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -255,41 +255,6 @@
-
-
-
-
-
-
-
-
Widerholung
Täglich
an ausgewählten Tagen
- Standard, tägliche Wiederholung
jeden Monat am selben Tag
am letzten Tag des Monat
jeden
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b02aa695f..9f839d6f3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e219395cd..2e8b90dbd 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index d8b248184..d2f9fe540 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1fa10253c..c8f33097d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 573b8319b..41a921d14 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 1bd1b8664..ca607f70f 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a7cef8055..0661bca31 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 656d23fa6..b42147d88 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 23edca4c9..8b2db782e 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -48,7 +48,6 @@
Repetição
Todos os dias
Nos dias selecionados
- Default daily repetition
No mesmo dia de cada mês
No último dia do mês
A cada
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b4e5e367b..8c03e77ae 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index a56847e08..2ff7f0cab 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -48,7 +48,6 @@
Opakovať
Každý deň
Vo vybraných dňoch
- Predvolené denné opakovanie
Každý mesiac v rovnaký deň
Posledný deň v mesiaci
Každý
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 893bdc0eb..08834a29c 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e38ef6a62..325721cd3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,7 +48,6 @@
Repeat
Every day
On selected days
- Default daily repetition
On the same day every month
On the last day of the month
Every