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

couple weekly view scrolling related fixes

Browse Source
This commit is contained in:
tibbi
2017-02-04 14:44:56 +01:00
parent 90168af9f4
commit 1290883716
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,6 +261,7 @@ class MainActivity : SimpleActivity(), EventListFragment.DeleteListener {
weeklyAdapter.updateScrollY(week_view_view_pager.currentItem, y) weeklyAdapter.updateScrollY(week_view_view_pager.currentItem, y)
} }
}) })
week_view_hours_scrollview.setOnTouchListener({ view, motionEvent -> true })
} }
fun updateHoursTopMargin(margin: Int) { fun updateHoursTopMargin(margin: Int) {

4
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt
View File

@@ -27,7 +27,7 @@ class MyWeekPagerAdapter(fm: FragmentManager, val mWeekTimestamps: List<Int>, va
} }
fun updateScrollY(pos: Int, y: Int) { fun updateScrollY(pos: Int, y: Int) {
(-1..1).map { mFragments[pos + it] } mFragments[pos - 1].updateScrollY(y)
.forEach { it?.updateScrollY(y) } mFragments[pos + 1].updateScrollY(y)
} }
} }

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

@@ -60,8 +60,8 @@ class WeekFragment : Fragment(), WeeklyCalendar {
week_events_scrollview.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener { week_events_scrollview.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
override fun onGlobalLayout() { override fun onGlobalLayout() {
updateScrollY(Math.max(MainActivity.mWeekScrollY, minScrollY))
week_events_scrollview.viewTreeObserver.removeOnGlobalLayoutListener(this) week_events_scrollview.viewTreeObserver.removeOnGlobalLayoutListener(this)
updateScrollY(Math.max(MainActivity.mWeekScrollY, minScrollY))
} }
}) })
@@ -145,7 +145,8 @@ class WeekFragment : Fragment(), WeeklyCalendar {
} else if (maxScrollY != -1 && y > maxScrollY) { } else if (maxScrollY != -1 && y > maxScrollY) {
mView.week_events_scrollview.scrollY = maxScrollY mView.week_events_scrollview.scrollY = maxScrollY
} else { } else {
mListener?.scrollTo(y) if (isFragmentVisible)
mListener?.scrollTo(y)
} }
} }