mirror of
https://github.com/SimpleMobileTools/Simple-Calendar.git
synced 2025-06-05 21:59:17 +02:00
fixed a glitch at enabling weekly seekbar visibility
This commit is contained in:
@@ -65,6 +65,7 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
|
|||||||
weekHolder!!.week_view_days_count.beVisibleIf(allow)
|
weekHolder!!.week_view_days_count.beVisibleIf(allow)
|
||||||
weekHolder!!.week_view_seekbar.beVisibleIf(allow)
|
weekHolder!!.week_view_seekbar.beVisibleIf(allow)
|
||||||
}
|
}
|
||||||
|
setupSeekbar()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupFragment() {
|
private fun setupFragment() {
|
||||||
@@ -86,13 +87,6 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// avoid seekbar width changing if the days count changes to 1, 10 etc
|
|
||||||
weekHolder!!.week_view_days_count.onGlobalLayout {
|
|
||||||
weekHolder!!.week_view_seekbar.layoutParams.width = weekHolder!!.week_view_seekbar.width
|
|
||||||
(weekHolder!!.week_view_seekbar.layoutParams as RelativeLayout.LayoutParams).removeRule(RelativeLayout.START_OF)
|
|
||||||
}
|
|
||||||
|
|
||||||
updateDaysCount(context?.config?.weeklyViewDays ?: 7)
|
|
||||||
updateActionBarTitle()
|
updateActionBarTitle()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -216,6 +210,22 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
|
|||||||
setupFragment()
|
setupFragment()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun setupSeekbar() {
|
||||||
|
if (context?.config?.allowCustomizeDayCount != true) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// avoid seekbar width changing if the days count changes to 1, 10 etc
|
||||||
|
weekHolder!!.week_view_days_count.onGlobalLayout {
|
||||||
|
if (weekHolder!!.week_view_seekbar.width != 0) {
|
||||||
|
weekHolder!!.week_view_seekbar.layoutParams.width = weekHolder!!.week_view_seekbar.width
|
||||||
|
}
|
||||||
|
(weekHolder!!.week_view_seekbar.layoutParams as RelativeLayout.LayoutParams).removeRule(RelativeLayout.START_OF)
|
||||||
|
}
|
||||||
|
|
||||||
|
updateDaysCount(context?.config?.weeklyViewDays ?: 7)
|
||||||
|
}
|
||||||
|
|
||||||
private fun updateWeeklyViewDays(days: Int) {
|
private fun updateWeeklyViewDays(days: Int) {
|
||||||
context!!.config.weeklyViewDays = days
|
context!!.config.weeklyViewDays = days
|
||||||
updateDaysCount(days)
|
updateDaysCount(days)
|
||||||
@@ -274,7 +284,8 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
|
|||||||
(viewPager!!.adapter as? MyWeekPagerAdapter)?.updateNotVisibleScaleLevel(viewPager!!.currentItem)
|
(viewPager!!.adapter as? MyWeekPagerAdapter)?.updateNotVisibleScaleLevel(viewPager!!.currentItem)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getFullFragmentHeight() = weekHolder!!.week_view_holder.height - weekHolder!!.week_view_seekbar.height - weekHolder!!.week_view_days_count_divider.height
|
override fun getFullFragmentHeight() =
|
||||||
|
weekHolder!!.week_view_holder.height - weekHolder!!.week_view_seekbar.height - weekHolder!!.week_view_days_count_divider.height
|
||||||
|
|
||||||
override fun printView() {
|
override fun printView() {
|
||||||
weekHolder!!.apply {
|
weekHolder!!.apply {
|
||||||
|
Reference in New Issue
Block a user