fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the "Go to today" button at monthly view opened from yearly view

This commit is contained in:
tibbi 2017-03-22 19:37:04 +01:00
parent 50e0c206ac
commit 98f29fad55
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View File

@ -155,7 +155,11 @@ class MainActivity : SimpleActivity(), NavigationListener {
} else if (config.storedView == MONTHLY_VIEW) { } else if (config.storedView == MONTHLY_VIEW) {
main_view_pager.currentItem = mDefaultMonthlyPage main_view_pager.currentItem = mDefaultMonthlyPage
} else if (config.storedView == YEARLY_VIEW) { } else if (config.storedView == YEARLY_VIEW) {
main_view_pager.currentItem = mDefaultYearlyPage if (mIsMonthSelected) {
openMonthlyToday()
} else {
main_view_pager.currentItem = mDefaultYearlyPage
}
} }
} }
@ -193,13 +197,17 @@ class MainActivity : SimpleActivity(), NavigationListener {
} else if (config.storedView == WEEKLY_VIEW) { } else if (config.storedView == WEEKLY_VIEW) {
fillWeeklyViewPager() fillWeeklyViewPager()
} else { } else {
val targetDay = DateTime().toString(Formatter.DAYCODE_PATTERN) openMonthlyToday()
fillMonthlyViewPager(targetDay)
} }
mWeekScrollY = 0 mWeekScrollY = 0
} }
private fun openMonthlyToday() {
val targetDay = DateTime().toString(Formatter.DAYCODE_PATTERN)
fillMonthlyViewPager(targetDay)
}
private fun refreshViewPager() { private fun refreshViewPager() {
if (config.storedView == YEARLY_VIEW) { if (config.storedView == YEARLY_VIEW) {
(main_view_pager.adapter as MyYearPagerAdapter).refreshEvents(main_view_pager.currentItem) (main_view_pager.adapter as MyYearPagerAdapter).refreshEvents(main_view_pager.currentItem)