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

add a monthly repeat rule picker

Browse Source
This commit is contained in:
tibbi
2017-05-07 18:39:21 +02:00
parent ec37fb5f50
commit 77778c520d
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,14 +11,16 @@ import android.view.MenuItem
import android.view.WindowManager import android.view.WindowManager
import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.dialogs.DeleteEventDialog import com.simplemobiletools.calendar.dialogs.DeleteEventDialog
import com.simplemobiletools.calendar.dialogs.RepeatRuleWeeklyDialog
import com.simplemobiletools.calendar.dialogs.RepeatLimitTypePickerDialog import com.simplemobiletools.calendar.dialogs.RepeatLimitTypePickerDialog
import com.simplemobiletools.calendar.dialogs.RepeatRuleWeeklyDialog
import com.simplemobiletools.calendar.dialogs.SelectEventTypeDialog import com.simplemobiletools.calendar.dialogs.SelectEventTypeDialog
import com.simplemobiletools.calendar.extensions.* import com.simplemobiletools.calendar.extensions.*
import com.simplemobiletools.calendar.helpers.* import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.calendar.models.Event import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.models.RadioItem
import kotlinx.android.synthetic.main.activity_event.* import kotlinx.android.synthetic.main.activity_event.*
import org.joda.time.DateTime import org.joda.time.DateTime
import java.util.* import java.util.*
@@ -212,8 +214,21 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
RepeatRuleWeeklyDialog(this, mRepeatRule) { RepeatRuleWeeklyDialog(this, mRepeatRule) {
setRepeatRule(it) setRepeatRule(it)
} }
} else if (isXMonthlyRepetition()) {
val items = arrayListOf(
RadioItem(REPEAT_MONTH_SAME_DAY, getString(R.string.repeat_on_the_same_day)),
RadioItem(REPEAT_MONTH_EVERY_XTH_DAY, getRepeatXthDayString()),
RadioItem(REPEAT_MONTH_LAST_DAY, getString(R.string.repeat_on_the_last_day)))
RadioGroupDialog(this, items, mRepeatRule) {
setRepeatRule(it as Int)
} }
} }
}
private fun getRepeatXthDayString(): String {
return getString(R.string.repeat_every_m)
}
private fun setRepeatRule(rule: Int) { private fun setRepeatRule(rule: Int) {
mRepeatRule = rule mRepeatRule = rule

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
View File

@@ -58,7 +58,7 @@ val EVERY_DAY = 127
// repeat_rule for monthly repetition // repeat_rule for monthly repetition
val REPEAT_MONTH_SAME_DAY = 1 val REPEAT_MONTH_SAME_DAY = 1
val REPEAT_MONTH_EVERY_XTH_DAY = 3 val REPEAT_MONTH_EVERY_XTH_DAY = 2
val REPEAT_MONTH_LAST_DAY = 3 val REPEAT_MONTH_LAST_DAY = 3
// special event flags // special event flags