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

handle sunday as the first day in weekly view properly

Browse Source
This commit is contained in:
tibbi
2017-01-22 13:49:15 +01:00
parent d9f6228a96
commit b96fa64ce1
2 changed files with 9 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/MainActivity.kt
View File

@@ -41,6 +41,7 @@ class MainActivity : SimpleActivity(), EventListFragment.DeleteListener {
private var mSnackbar: Snackbar? = null private var mSnackbar: Snackbar? = null
private var mEventListFragment: EventListFragment? = null private var mEventListFragment: EventListFragment? = null
private var mStoredTextColor = 0 private var mStoredTextColor = 0
private var mStoredIsSundayFirst = false
companion object { companion object {
var mWeekScrollY = 0 var mWeekScrollY = 0
@@ -52,6 +53,7 @@ class MainActivity : SimpleActivity(), EventListFragment.DeleteListener {
calendar_fab.setOnClickListener { addNewEvent() } calendar_fab.setOnClickListener { addNewEvent() }
updateViewPager() updateViewPager()
mStoredTextColor = config.textColor mStoredTextColor = config.textColor
mStoredIsSundayFirst = config.isSundayFirst
checkWhatsNewDialog() checkWhatsNewDialog()
} }
@@ -60,6 +62,9 @@ class MainActivity : SimpleActivity(), EventListFragment.DeleteListener {
if (mStoredTextColor != config.textColor) if (mStoredTextColor != config.textColor)
updateViewPager() updateViewPager()
if (mStoredIsSundayFirst != config.isSundayFirst && config.storedView == WEEKLY_VIEW)
fillWeeklyViewPager()
updateWidgets() updateWidgets()
updateTextColors(calendar_coordinator) updateTextColors(calendar_coordinator)
} }
@@ -68,6 +73,7 @@ class MainActivity : SimpleActivity(), EventListFragment.DeleteListener {
super.onPause() super.onPause()
checkDeleteEvents() checkDeleteEvents()
mStoredTextColor = config.textColor mStoredTextColor = config.textColor
mStoredIsSundayFirst = config.isSundayFirst
} }
override fun onDestroy() { override fun onDestroy() {
@@ -174,7 +180,8 @@ class MainActivity : SimpleActivity(), EventListFragment.DeleteListener {
} }
private fun fillWeeklyViewPager() { private fun fillWeeklyViewPager() {
val thisweek = DateTime().withDayOfWeek(1).withTime(0, 0, 0, 0).seconds() val firstDayIndex = if (config.isSundayFirst) 7 else 1
val thisweek = DateTime().withDayOfWeek(firstDayIndex).withTime(0, 0, 0, 0).seconds()
val weekTSs = getWeekTimestamps(thisweek) val weekTSs = getWeekTimestamps(thisweek)
val weeklyAdapter = MyWeekPagerAdapter(supportFragmentManager, weekTSs, object : WeekFragment.WeekScrollListener { val weeklyAdapter = MyWeekPagerAdapter(supportFragmentManager, weekTSs, object : WeekFragment.WeekScrollListener {
override fun scrollTo(y: Int) { override fun scrollTo(y: Int) {

2
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
View File

@@ -137,7 +137,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
for (event in sorted) { for (event in sorted) {
val startDateTime = Formatter.getDateTimeFromTS(event.startTS) val startDateTime = Formatter.getDateTimeFromTS(event.startTS)
val endDateTime = Formatter.getDateTimeFromTS(event.endTS) val endDateTime = Formatter.getDateTimeFromTS(event.endTS)
val dayOfWeek = startDateTime.dayOfWeek - if (context.config.isSundayFirst) 0 else 1 val dayOfWeek = startDateTime.dayOfWeek - 1
val layout = getColumnWithId(dayOfWeek) val layout = getColumnWithId(dayOfWeek)
val startMinutes = startDateTime.minuteOfDay val startMinutes = startDateTime.minuteOfDay