minor mainactivity refactoring
This commit is contained in:
parent
f58a1beba6
commit
7fd1907b3e
|
@ -109,12 +109,15 @@ class MainActivity : SimpleActivity(), NavigationListener, ChangeViewDialog.Chan
|
||||||
|
|
||||||
private fun fillMonthlyViewPager(targetDay: String) {
|
private fun fillMonthlyViewPager(targetDay: String) {
|
||||||
val codes = getMonths(targetDay)
|
val codes = getMonths(targetDay)
|
||||||
val adapter = MyMonthPagerAdapter(supportFragmentManager, codes, this)
|
val monthlyAdapter = MyMonthPagerAdapter(supportFragmentManager, codes, this)
|
||||||
view_pager.clearOnPageChangeListeners()
|
|
||||||
view_pager.adapter = adapter
|
view_pager.apply {
|
||||||
view_pager.currentItem = codes.size / 2
|
clearOnPageChangeListeners()
|
||||||
|
adapter = monthlyAdapter
|
||||||
|
currentItem = codes.size / 2
|
||||||
|
visibility = View.VISIBLE
|
||||||
|
}
|
||||||
title = getString(R.string.app_launcher_name)
|
title = getString(R.string.app_launcher_name)
|
||||||
view_pager.visibility = View.VISIBLE
|
|
||||||
calendar_events_list.visibility = View.GONE
|
calendar_events_list.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,12 +134,12 @@ class MainActivity : SimpleActivity(), NavigationListener, ChangeViewDialog.Chan
|
||||||
private fun fillYearlyViewPager() {
|
private fun fillYearlyViewPager() {
|
||||||
val targetYear = DateTime().toString(Formatter.YEAR_PATTERN).toInt()
|
val targetYear = DateTime().toString(Formatter.YEAR_PATTERN).toInt()
|
||||||
val years = getYears(targetYear)
|
val years = getYears(targetYear)
|
||||||
val adapter = MyYearPagerAdapter(supportFragmentManager, years, this)
|
val yearlyAdapter = MyYearPagerAdapter(supportFragmentManager, years, this)
|
||||||
view_pager.adapter = adapter
|
|
||||||
view_pager.currentItem = years.size / 2
|
|
||||||
|
|
||||||
title = "${getString(R.string.app_launcher_name)} - ${years[years.size / 2]}"
|
view_pager.apply {
|
||||||
view_pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
|
adapter = yearlyAdapter
|
||||||
|
currentItem = years.size / 2
|
||||||
|
addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
|
||||||
override fun onPageScrollStateChanged(state: Int) {
|
override fun onPageScrollStateChanged(state: Int) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,7 +151,9 @@ class MainActivity : SimpleActivity(), NavigationListener, ChangeViewDialog.Chan
|
||||||
title = "${getString(R.string.app_launcher_name)} - ${years[position]}"
|
title = "${getString(R.string.app_launcher_name)} - ${years[position]}"
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
view_pager.visibility = View.VISIBLE
|
visibility = View.VISIBLE
|
||||||
|
}
|
||||||
|
title = "${getString(R.string.app_launcher_name)} - ${years[years.size / 2]}"
|
||||||
calendar_events_list.visibility = View.GONE
|
calendar_events_list.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue