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

improving the weekly views scale UX

Browse Source
This commit is contained in:
tibbi
2020-03-24 22:00:52 +01:00
parent d3e6705226
commit 24b524bbe2
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -64,7 +64,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:5.23.8' implementation 'com.simplemobiletools:commons:5.23.9'
implementation 'joda-time:joda-time:2.10.1' implementation 'joda-time:joda-time:2.10.1'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'

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

@@ -38,8 +38,8 @@ class MyWeekPagerAdapter(fm: FragmentManager, private val mWeekTimestamps: List<
} }
} }
fun updateNotVisibleZoomLevel(pos: Int) { fun updateNotVisibleScaleLevel(pos: Int) {
mFragments[pos - 1]?.updateNotVisibleViewZoomLevel() mFragments[pos - 1]?.updateNotVisibleViewScaleLevel()
mFragments[pos + 1]?.updateNotVisibleViewZoomLevel() mFragments[pos + 1]?.updateNotVisibleViewScaleLevel()
} }
} }

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

@@ -33,8 +33,9 @@ import java.util.*
class WeekFragment : Fragment(), WeeklyCalendar { class WeekFragment : Fragment(), WeeklyCalendar {
private val PLUS_FADEOUT_DELAY = 5000L private val PLUS_FADEOUT_DELAY = 5000L
private val MIN_ZOOM_FACTOR = 0.3f private val MIN_SCALE_FACTOR = 0.3f
private val MAX_ZOOM_FACTOR = 5f private val MAX_SCALE_FACTOR = 5f
private val SCALE_RANGE = MAX_SCALE_FACTOR - MIN_SCALE_FACTOR
var listener: WeekFragmentListener? = null var listener: WeekFragmentListener? = null
private var weekTimestamp = 0L private var weekTimestamp = 0L
@@ -42,8 +43,9 @@ class WeekFragment : Fragment(), WeeklyCalendar {
private var todayColumnIndex = -1 private var todayColumnIndex = -1
private var primaryColor = 0 private var primaryColor = 0
private var lastHash = 0 private var lastHash = 0
private var scaleAtStart = 1f private var prevScaleSpanY = 0f
private var defaultRowHeight = 0f private var defaultRowHeight = 0f
private var screenHeight = 0
private var mWasDestroyed = false private var mWasDestroyed = false
private var isFragmentVisible = false private var isFragmentVisible = false
private var wasFragmentInit = false private var wasFragmentInit = false
@@ -147,7 +149,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
listener?.updateHoursTopMargin(mView.week_top_holder.height) listener?.updateHoursTopMargin(mView.week_top_holder.height)
checkScrollLimits(scrollView.scrollY) checkScrollLimits(scrollView.scrollY)
// fix some glitches like at swiping from a fully zoomed out fragment will all-day events to an empty one // fix some glitches like at swiping from a fully scaled out fragment will all-day events to an empty one
val fullFragmentHeight = (listener?.getFullFragmentHeight() ?: 0) - mView.week_top_holder.height val fullFragmentHeight = (listener?.getFullFragmentHeight() ?: 0) - mView.week_top_holder.height
if (scrollView.height < fullFragmentHeight) { if (scrollView.height < fullFragmentHeight) {
config.weeklyViewItemHeightMultiplier = fullFragmentHeight / 24 / defaultRowHeight config.weeklyViewItemHeightMultiplier = fullFragmentHeight / 24 / defaultRowHeight
@@ -236,9 +238,11 @@ class WeekFragment : Fragment(), WeeklyCalendar {
private fun getViewScaleDetector(): ScaleGestureDetector { private fun getViewScaleDetector(): ScaleGestureDetector {
return ScaleGestureDetector(context, object : ScaleGestureDetector.SimpleOnScaleGestureListener() { return ScaleGestureDetector(context, object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
override fun onScale(detector: ScaleGestureDetector): Boolean { override fun onScale(detector: ScaleGestureDetector): Boolean {
val scaleDifference = detector.scaleFactor - scaleAtStart val percent = (prevScaleSpanY - detector.currentSpanY) / screenHeight
scaleAtStart = detector.scaleFactor prevScaleSpanY = detector.currentSpanY
var newFactor = Math.max(Math.min(config.weeklyViewItemHeightMultiplier + scaleDifference, MAX_ZOOM_FACTOR), MIN_ZOOM_FACTOR)
val wantedFactor = config.weeklyViewItemHeightMultiplier - (SCALE_RANGE * percent)
var newFactor = Math.max(Math.min(wantedFactor, MAX_SCALE_FACTOR), MIN_SCALE_FACTOR)
if (scrollView.height > defaultRowHeight * newFactor * 24) { if (scrollView.height > defaultRowHeight * newFactor * 24) {
newFactor = scrollView.height / 24f / defaultRowHeight newFactor = scrollView.height / 24f / defaultRowHeight
} }
@@ -251,8 +255,9 @@ class WeekFragment : Fragment(), WeeklyCalendar {
override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
scrollView.isScrollable = false scrollView.isScrollable = false
scaleAtStart = detector.scaleFactor prevScaleSpanY = detector.currentSpanY
wasScaled = true wasScaled = true
screenHeight = context!!.realScreenSize.y
return super.onScaleBegin(detector) return super.onScaleBegin(detector)
} }
}) })
@@ -554,7 +559,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
} }
} }
fun updateNotVisibleViewZoomLevel() { fun updateNotVisibleViewScaleLevel() {
if (!isFragmentVisible) { if (!isFragmentVisible) {
updateViewScale() updateViewScale()
} }

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

@@ -220,7 +220,7 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
} }
weekHolder!!.week_view_hours_holder.setPadding(0, 0, 0, rowHeight) weekHolder!!.week_view_hours_holder.setPadding(0, 0, 0, rowHeight)
(viewPager!!.adapter as? MyWeekPagerAdapter)?.updateNotVisibleZoomLevel(viewPager!!.currentItem) (viewPager!!.adapter as? MyWeekPagerAdapter)?.updateNotVisibleScaleLevel(viewPager!!.currentItem)
} }
override fun getFullFragmentHeight() = weekHolder!!.week_view_holder.height override fun getFullFragmentHeight() = weekHolder!!.week_view_holder.height