From 5e8a41d4c76d016d3449ac596ab3a63dd522b98d Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 21 Oct 2017 19:17:34 +0200 Subject: [PATCH] remove some local variables --- .../calendar/adapters/MyDayPagerAdapter.kt | 2 +- .../calendar/adapters/MyWeekPagerAdapter.kt | 2 +- .../calendar/adapters/MyYearPagerAdapter.kt | 2 +- .../com/simplemobiletools/calendar/fragments/DayFragment.kt | 6 +----- .../simplemobiletools/calendar/fragments/WeekFragment.kt | 6 +----- .../simplemobiletools/calendar/fragments/YearFragment.kt | 6 +----- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt index acbcde4d6..1e825d63a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyDayPagerAdapter.kt @@ -22,7 +22,7 @@ class MyDayPagerAdapter(fm: FragmentManager, private val mCodes: List, p val fragment = DayFragment() fragment.arguments = bundle - fragment.setListener(mListener) + fragment.mListener = mListener mFragments.put(position, fragment) return fragment diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt index 9afc7f142..475f55293 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyWeekPagerAdapter.kt @@ -20,7 +20,7 @@ class MyWeekPagerAdapter(fm: FragmentManager, val mWeekTimestamps: List, va val fragment = WeekFragment() fragment.arguments = bundle - fragment.setListener(mListener) + fragment.mListener = mListener mFragments.put(position, fragment) return fragment diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt index 6741a2d1d..0590bc7e2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/MyYearPagerAdapter.kt @@ -21,7 +21,7 @@ class MyYearPagerAdapter(fm: FragmentManager, val mYears: List, val mListen val fragment = YearFragment() fragment.arguments = bundle - fragment.setListener(mListener) + fragment.mListener = mListener mFragments.put(position, fragment) return fragment diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt index 813c3c7c8..2baef2de7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt @@ -33,9 +33,9 @@ import org.joda.time.DateTime import java.util.* class DayFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEventsListener { + var mListener: NavigationListener? = null private var mTextColor = 0 private var mDayCode = "" - private var mListener: NavigationListener? = null private var lastHash = 0 lateinit var mRes: Resources @@ -82,10 +82,6 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEventsListen } } - fun setListener(listener: NavigationListener) { - mListener = listener - } - private fun pickDay() { activity.setTheme(context.getAppropriateTheme()) val view = getLayoutInflater(arguments).inflate(R.layout.date_picker, null) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt index 4f05263a1..e99801d80 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt @@ -33,7 +33,7 @@ class WeekFragment : Fragment(), WeeklyCalendar { private val CLICK_DURATION_THRESHOLD = 150 private val PLUS_FADEOUT_DELAY = 5000L - private var mListener: WeekScrollListener? = null + var mListener: WeekScrollListener? = null private var mWeekTimestamp = 0 private var mRowHeight = 0 private var minScrollY = -1 @@ -424,10 +424,6 @@ class WeekFragment : Fragment(), WeeklyCalendar { private fun getColumnWithId(id: Int) = mView.findViewById(mRes.getIdentifier("week_column_$id", "id", context.packageName)) as ViewGroup - fun setListener(listener: WeekScrollListener) { - mListener = listener - } - fun updateScrollY(y: Int) { if (wasFragmentInit) mView.week_events_scrollview.scrollY = y diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt index 7d3cbe172..ec4564706 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt @@ -22,7 +22,7 @@ import org.joda.time.DateTime import java.util.* class YearFragment : Fragment(), YearlyCalendar { - private var mListener: NavigationListener? = null + var mListener: NavigationListener? = null private var mYear = 0 private var mSundayFirst = false private var lastHash = 0 @@ -87,10 +87,6 @@ class YearFragment : Fragment(), YearlyCalendar { } } - fun setListener(listener: NavigationListener) { - mListener = listener - } - override fun updateYearlyCalendar(events: SparseArray>, hashCode: Int) { if (!isAdded) return