fix slider not showing sometimes
- add check in the week_view_days_count's onGlobalLayout listener that keeps the week_view_seekbar the same so it happens only when the week_view_seekbar is visible
This commit is contained in:
parent
041c2ecbac
commit
6abe17f8b2
|
@ -17,7 +17,6 @@ import com.simplemobiletools.calendar.pro.R
|
||||||
import com.simplemobiletools.calendar.pro.activities.MainActivity
|
import com.simplemobiletools.calendar.pro.activities.MainActivity
|
||||||
import com.simplemobiletools.calendar.pro.adapters.MyWeekPagerAdapter
|
import com.simplemobiletools.calendar.pro.adapters.MyWeekPagerAdapter
|
||||||
import com.simplemobiletools.calendar.pro.extensions.*
|
import com.simplemobiletools.calendar.pro.extensions.*
|
||||||
import com.simplemobiletools.calendar.pro.helpers.Config
|
|
||||||
import com.simplemobiletools.calendar.pro.helpers.Formatter
|
import com.simplemobiletools.calendar.pro.helpers.Formatter
|
||||||
import com.simplemobiletools.calendar.pro.helpers.WEEK_START_DATE_TIME
|
import com.simplemobiletools.calendar.pro.helpers.WEEK_START_DATE_TIME
|
||||||
import com.simplemobiletools.calendar.pro.interfaces.WeekFragmentListener
|
import com.simplemobiletools.calendar.pro.interfaces.WeekFragmentListener
|
||||||
|
@ -26,9 +25,6 @@ import com.simplemobiletools.commons.extensions.*
|
||||||
import com.simplemobiletools.commons.helpers.WEEK_SECONDS
|
import com.simplemobiletools.commons.helpers.WEEK_SECONDS
|
||||||
import com.simplemobiletools.commons.views.MyViewPager
|
import com.simplemobiletools.commons.views.MyViewPager
|
||||||
import kotlinx.android.synthetic.main.fragment_week_holder.view.*
|
import kotlinx.android.synthetic.main.fragment_week_holder.view.*
|
||||||
import kotlinx.android.synthetic.main.fragment_week_holder.week_view_days_count
|
|
||||||
import kotlinx.android.synthetic.main.fragment_week_holder.week_view_days_count_divider
|
|
||||||
import kotlinx.android.synthetic.main.fragment_week_holder.week_view_seekbar
|
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
|
|
||||||
class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
|
class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
|
||||||
|
@ -53,6 +49,7 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
|
||||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
weekHolder = inflater.inflate(R.layout.fragment_week_holder, container, false) as ViewGroup
|
weekHolder = inflater.inflate(R.layout.fragment_week_holder, container, false) as ViewGroup
|
||||||
weekHolder!!.background = ColorDrawable(context!!.config.backgroundColor)
|
weekHolder!!.background = ColorDrawable(context!!.config.backgroundColor)
|
||||||
|
|
||||||
val itemHeight = context!!.getWeeklyViewItemHeight().toInt()
|
val itemHeight = context!!.getWeeklyViewItemHeight().toInt()
|
||||||
weekHolder!!.week_view_hours_holder.setPadding(0, 0, 0, itemHeight)
|
weekHolder!!.week_view_hours_holder.setPadding(0, 0, 0, itemHeight)
|
||||||
|
|
||||||
|
@ -65,8 +62,8 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
context?.config?.allowCustomizeDayCount?.let { allow ->
|
context?.config?.allowCustomizeDayCount?.let { allow ->
|
||||||
week_view_days_count.beVisibleIf(allow)
|
weekHolder!!.week_view_days_count.beVisibleIf(allow)
|
||||||
week_view_seekbar.beVisibleIf(allow)
|
weekHolder!!.week_view_seekbar.beVisibleIf(allow)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,9 +117,11 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener {
|
||||||
|
|
||||||
// avoid seekbar width changing if the days count changes to 1, 10 etc
|
// avoid seekbar width changing if the days count changes to 1, 10 etc
|
||||||
weekHolder!!.week_view_days_count.onGlobalLayout {
|
weekHolder!!.week_view_days_count.onGlobalLayout {
|
||||||
|
if (weekHolder!!.week_view_seekbar.isVisible()) {
|
||||||
weekHolder!!.week_view_seekbar.layoutParams.width = weekHolder!!.week_view_seekbar.width
|
weekHolder!!.week_view_seekbar.layoutParams.width = weekHolder!!.week_view_seekbar.width
|
||||||
(weekHolder!!.week_view_seekbar.layoutParams as RelativeLayout.LayoutParams).removeRule(RelativeLayout.START_OF)
|
(weekHolder!!.week_view_seekbar.layoutParams as RelativeLayout.LayoutParams).removeRule(RelativeLayout.START_OF)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
updateDaysCount(context?.config?.weeklyViewDays ?: 7)
|
updateDaysCount(context?.config?.weeklyViewDays ?: 7)
|
||||||
updateActionBarTitle()
|
updateActionBarTitle()
|
||||||
|
|
Loading…
Reference in New Issue