fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

show the Last Day repeat option only when the last day is selected

Browse Source
This commit is contained in:
tibbi
2017-05-08 18:58:43 +02:00
parent 331d99ef57
commit fbdc667b8f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@@ -217,8 +217,11 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
} else if (isXMonthlyRepetition()) { } else if (isXMonthlyRepetition()) {
val items = arrayListOf( val items = arrayListOf(
RadioItem(REPEAT_MONTH_SAME_DAY, getString(R.string.repeat_on_the_same_day)), RadioItem(REPEAT_MONTH_SAME_DAY, getString(R.string.repeat_on_the_same_day)),
RadioItem(REPEAT_MONTH_EVERY_XTH_DAY, getRepeatXthDayString(true)), RadioItem(REPEAT_MONTH_EVERY_XTH_DAY, getRepeatXthDayString(true)))
RadioItem(REPEAT_MONTH_LAST_DAY, getString(R.string.repeat_on_the_last_day)))
if (isLastDayOfTheMonth()) {
items.add(RadioItem(REPEAT_MONTH_LAST_DAY, getString(R.string.repeat_on_the_last_day)))
}
RadioGroupDialog(this, items, mRepeatRule) { RadioGroupDialog(this, items, mRepeatRule) {
setRepeatRule(it as Int) setRepeatRule(it as Int)
@@ -226,6 +229,8 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
} }
} }
private fun isLastDayOfTheMonth() = mEventStartDateTime.dayOfMonth == mEventStartDateTime.dayOfMonth().withMaximumValue().dayOfMonth
private fun getRepeatXthDayString(includeBase: Boolean): String { private fun getRepeatXthDayString(includeBase: Boolean): String {
val dayOfWeek = mEventStartDateTime.dayOfWeek val dayOfWeek = mEventStartDateTime.dayOfWeek
val base = getBaseString(dayOfWeek) val base = getBaseString(dayOfWeek)