From 183ef15de215491ed144a63b5e1fe15839ba8df2 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 17 May 2017 22:26:34 +0200 Subject: [PATCH] fix #132, refresh the main screen if the date changed since last run --- .../calendar/activities/MainActivity.kt | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 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 4b250d1cc..4d4e7ccfd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -53,6 +53,7 @@ class MainActivity : SimpleActivity(), NavigationListener { private var mStoredTextColor = 0 private var mStoredBackgroundColor = 0 private var mStoredPrimaryColor = 0 + private var mStoredDayCode = "" private var mStoredIsSundayFirst = false private var mStoredUse24HourFormat = false private var mShouldFilterBeVisible = false @@ -78,12 +79,16 @@ class MainActivity : SimpleActivity(), NavigationListener { if (intent?.action == Intent.ACTION_VIEW && intent.data != null) { tryImportEventsFromFile(intent.data) } + storeStateVariables() + updateViewPager() } override fun onResume() { super.onResume() - if (mStoredTextColor != config.textColor || mStoredBackgroundColor != config.backgroundColor || mStoredPrimaryColor != config.primaryColor) + if (mStoredTextColor != config.textColor || mStoredBackgroundColor != config.backgroundColor || mStoredPrimaryColor != config.primaryColor + || mStoredDayCode != getCurrentDayCode()) { updateViewPager() + } dbHelper.getEventTypes { eventTypeColors.clear() @@ -91,10 +96,8 @@ class MainActivity : SimpleActivity(), NavigationListener { mShouldFilterBeVisible = eventTypeColors.size() > 1 || config.displayEventTypes.isEmpty() invalidateOptionsMenu() } - mStoredTextColor = config.textColor - mStoredPrimaryColor = config.primaryColor - mStoredBackgroundColor = config.backgroundColor + storeStateVariables() if (config.storedView == WEEKLY_VIEW) { if (mStoredIsSundayFirst != config.isSundayFirst || mStoredUse24HourFormat != config.use24hourFormat) { fillWeeklyViewPager() @@ -144,6 +147,15 @@ class MainActivity : SimpleActivity(), NavigationListener { } } + private fun storeStateVariables() { + mStoredTextColor = config.textColor + mStoredPrimaryColor = config.primaryColor + mStoredBackgroundColor = config.backgroundColor + mStoredDayCode = getCurrentDayCode() + } + + private fun getCurrentDayCode() = Formatter.getDayCodeFromTS((System.currentTimeMillis() / 1000).toInt()) + private fun showViewDialog() { val res = resources val items = arrayListOf(