From dbb8b797dc73c2a13d4503ad4bc39effa36957fe Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 18 Feb 2018 10:43:48 +0100 Subject: [PATCH] removing a redundant variable --- .../simplemobiletools/calendar/activities/MainActivity.kt | 2 -- .../simplemobiletools/calendar/fragments/DayFragment.kt | 2 -- .../calendar/fragments/DayFragmentsHolder.kt | 7 ++++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index ef647a68d..b6a66fc45 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -13,7 +13,6 @@ import android.os.Handler import android.provider.ContactsContract import android.support.v4.view.MenuItemCompat import android.support.v7.widget.SearchView -import android.util.SparseIntArray import android.view.Menu import android.view.MenuItem import android.widget.Toast @@ -55,7 +54,6 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { private var mSearchMenuItem: MenuItem? = null private var shouldGoToTodayBeVisible = false private var goToTodayButton: MenuItem? = null - private var eventTypeColors = SparseIntArray() private var currentFragments = ArrayList() private var mStoredTextColor = 0 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 a5a0c943f..4e2b04304 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt @@ -82,8 +82,6 @@ class DayFragment : Fragment() { } } - fun getDayEventsAdapter() = mHolder.day_events?.adapter as? DayEventsAdapter - private fun pickDay() { activity!!.setTheme(context!!.getDialogTheme()) val view = layoutInflater.inflate(R.layout.date_picker, null) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt index 88b0d940f..34e6629b9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragmentsHolder.kt @@ -22,7 +22,7 @@ class DayFragmentsHolder : MyFragmentHolder(), NavigationListener { private val PREFILLED_DAYS = 121 private var viewPager: MyViewPager? = null - private var defaultDaylyPage = 0 + private var defaultDailyPage = 0 private var todayDayCode = "" private var currentDayCode = "" private var isGoToTodayVisible = false @@ -44,7 +44,8 @@ class DayFragmentsHolder : MyFragmentHolder(), NavigationListener { private fun setupFragment() { val codes = getDays(currentDayCode) val dailyAdapter = MyDayPagerAdapter(activity!!.supportFragmentManager, codes, this) - defaultDaylyPage = codes.size / 2 + defaultDailyPage = codes.size / 2 + viewPager!!.apply { adapter = dailyAdapter @@ -64,7 +65,7 @@ class DayFragmentsHolder : MyFragmentHolder(), NavigationListener { } } }) - currentItem = defaultDaylyPage + currentItem = defaultDailyPage } updateActionBarTitle() }