remove a redundant function

This commit is contained in:
tibbi 2017-10-07 21:32:58 +02:00
parent b8f53d97c2
commit 5f1d76e0d9
2 changed files with 6 additions and 11 deletions

View File

@ -21,7 +21,7 @@ class MyMonthPagerAdapter(fm: FragmentManager, private val mCodes: List<String>,
val fragment = MonthFragment() val fragment = MonthFragment()
fragment.arguments = bundle fragment.arguments = bundle
fragment.setListener(mListener) fragment.listener = mListener
mFragments.put(position, fragment) mFragments.put(position, fragment)
return fragment return fragment

View File

@ -37,7 +37,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
private var mSundayFirst = false private var mSundayFirst = false
private var mDayCode = "" private var mDayCode = ""
private var mListener: NavigationListener? = null var listener: NavigationListener? = null
lateinit var mRes: Resources lateinit var mRes: Resources
lateinit var mHolder: RelativeLayout lateinit var mHolder: RelativeLayout
@ -91,10 +91,6 @@ class MonthFragment : Fragment(), MonthlyCalendar {
} }
} }
fun setListener(listener: NavigationListener) {
mListener = listener
}
private fun setupButtons() { private fun setupButtons() {
val baseColor = mConfig.textColor val baseColor = mConfig.textColor
mTextColor = baseColor mTextColor = baseColor
@ -107,11 +103,11 @@ class MonthFragment : Fragment(), MonthlyCalendar {
top_right_arrow.background = null top_right_arrow.background = null
top_left_arrow.setOnClickListener { top_left_arrow.setOnClickListener {
mListener?.goLeft() listener?.goLeft()
} }
top_right_arrow.setOnClickListener { top_right_arrow.setOnClickListener {
mListener?.goRight() listener?.goRight()
} }
top_value.setOnClickListener { showMonthDialog() } top_value.setOnClickListener { showMonthDialog() }
@ -139,7 +135,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
val month = datePicker.month + 1 val month = datePicker.month + 1
val year = datePicker.year val year = datePicker.year
val newDateTime = dateTime.withDate(year, month, 1) val newDateTime = dateTime.withDate(year, month, 1)
mListener?.goToDateTime(newDateTime) listener?.goToDateTime(newDateTime)
} }
private fun setupLabels() { private fun setupLabels() {
@ -176,9 +172,8 @@ class MonthFragment : Fragment(), MonthlyCalendar {
} }
for (i in 0 until len) { for (i in 0 until len) {
val day = days[i]
(mHolder.findViewById(mRes.getIdentifier("day_$i", "id", mPackageName)) as DayMonthlyView).apply { (mHolder.findViewById(mRes.getIdentifier("day_$i", "id", mPackageName)) as DayMonthlyView).apply {
val day = days[i]
setDay(day) setDay(day)
setOnClickListener { openDay(day.code) } setOnClickListener { openDay(day.code) }
} }