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

if the current week is shown, use Today as the default date at weekly view

Browse Source
This commit is contained in:
tibbi
2019-08-07 16:33:54 +02:00
parent 0010c5df25
commit 969f860d63
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt
View File

@ -181,7 +181,14 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
setupWeeklyActionbarTitle(currentWeekTS) setupWeeklyActionbarTitle(currentWeekTS)
} }
override fun getNewEventDayCode() = Formatter.getDayCodeFromTS(currentWeekTS) override fun getNewEventDayCode(): String {
val currentTS = System.currentTimeMillis() / 1000
return if (currentTS > currentWeekTS && currentTS < currentWeekTS + WEEK_SECONDS) {
Formatter.getTodayCode()
} else {
Formatter.getDayCodeFromTS(currentWeekTS)
}
}
override fun scrollTo(y: Int) { override fun scrollTo(y: Int) {
weekHolder!!.week_view_hours_scrollview.scrollY = y weekHolder!!.week_view_hours_scrollview.scrollY = y