fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-08 16:08:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #143, properly set first day of the week in the date pickers

Browse Source
This commit is contained in:
tibbi 2017-04-17 17:20:50 +02:00
parent 15c55a649b
commit c79cce6f34
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package com.simplemobiletools.calendar.activities package com.simplemobiletools.calendar.activities
import android.annotation.SuppressLint
import android.app.DatePickerDialog import android.app.DatePickerDialog
import android.app.TimePickerDialog import android.app.TimePickerDialog
import android.graphics.PorterDuff import android.graphics.PorterDuff
@ -13,10 +14,12 @@ import com.simplemobiletools.calendar.dialogs.RepeatRuleDailyDialog
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.models.Event import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
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.*
class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
private var mWasEndDateSet = false private var mWasEndDateSet = false
@ -165,12 +168,19 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
checkRepetitionRuleText() checkRepetitionRuleText()
} }
@SuppressLint("NewApi")
private fun showRepetitionLimitDialog() { private fun showRepetitionLimitDialog() {
hideKeyboard() hideKeyboard()
val now = (System.currentTimeMillis() / 1000).toInt() val now = (System.currentTimeMillis() / 1000).toInt()
val repeatLimitDateTime = Formatter.getDateTimeFromTS(if (mRepeatLimit != 0) mRepeatLimit else now) val repeatLimitDateTime = Formatter.getDateTimeFromTS(if (mRepeatLimit != 0) mRepeatLimit else now)
DatePickerDialog(this, mDialogTheme, repetitionLimitDateSetListener, repeatLimitDateTime.year, repeatLimitDateTime.monthOfYear - 1, val datepicker = DatePickerDialog(this, mDialogTheme, repetitionLimitDateSetListener, repeatLimitDateTime.year, repeatLimitDateTime.monthOfYear - 1,
repeatLimitDateTime.dayOfMonth).show() repeatLimitDateTime.dayOfMonth)
if (isLollipopPlus()) {
datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY
}
datepicker.show()
} }
private val repetitionLimitDateSetListener = DatePickerDialog.OnDateSetListener { view, year, monthOfYear, dayOfMonth -> private val repetitionLimitDateSetListener = DatePickerDialog.OnDateSetListener { view, year, monthOfYear, dayOfMonth ->
@ -393,11 +403,18 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
event_end_time.text = Formatter.getTime(this, mEventEndDateTime) event_end_time.text = Formatter.getTime(this, mEventEndDateTime)
} }
@SuppressLint("NewApi")
fun setupStartDate() { fun setupStartDate() {
hideKeyboard() hideKeyboard()
config.backgroundColor.getContrastColor() config.backgroundColor.getContrastColor()
DatePickerDialog(this, mDialogTheme, startDateSetListener, mEventStartDateTime.year, mEventStartDateTime.monthOfYear - 1, val datepicker = DatePickerDialog(this, mDialogTheme, startDateSetListener, mEventStartDateTime.year, mEventStartDateTime.monthOfYear - 1,
mEventStartDateTime.dayOfMonth).show() mEventStartDateTime.dayOfMonth)
if (isLollipopPlus()) {
datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY
}
datepicker.show()
} }
fun setupStartTime() { fun setupStartTime() {
@ -405,10 +422,17 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
TimePickerDialog(this, mDialogTheme, startTimeSetListener, mEventStartDateTime.hourOfDay, mEventStartDateTime.minuteOfHour, config.use24hourFormat).show() TimePickerDialog(this, mDialogTheme, startTimeSetListener, mEventStartDateTime.hourOfDay, mEventStartDateTime.minuteOfHour, config.use24hourFormat).show()
} }
@SuppressLint("NewApi")
fun setupEndDate() { fun setupEndDate() {
hideKeyboard() hideKeyboard()
DatePickerDialog(this, mDialogTheme, endDateSetListener, mEventEndDateTime.year, mEventEndDateTime.monthOfYear - 1, val datepicker = DatePickerDialog(this, mDialogTheme, endDateSetListener, mEventEndDateTime.year, mEventEndDateTime.monthOfYear - 1,
mEventEndDateTime.dayOfMonth).show() mEventEndDateTime.dayOfMonth)
if (isLollipopPlus()) {
datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY
}
datepicker.show()
} }
fun setupEndTime() { fun setupEndTime() {