From 3cef66f2bfb5bb1cb1518d57449ed40088588901 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 21 Oct 2017 16:24:37 +0200
Subject: [PATCH] reordering some functions

---
 .../calendar/activities/MainActivity.kt       | 22 +++++++++----------
 .../calendar/helpers/Formatter.kt             |  2 ++
 2 files changed, 12 insertions(+), 12 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 b3b5895e9..dac8567ed 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -124,7 +124,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
     override fun onResume() {
         super.onResume()
         if (mStoredTextColor != config.textColor || mStoredBackgroundColor != config.backgroundColor || mStoredPrimaryColor != config.primaryColor
-                || mStoredDayCode != getCurrentDayCode()) {
+                || mStoredDayCode != Formatter.getTodayCode()) {
             updateViewPager()
         }
 
@@ -199,11 +199,9 @@ class MainActivity : SimpleActivity(), NavigationListener {
         mStoredTextColor = config.textColor
         mStoredPrimaryColor = config.primaryColor
         mStoredBackgroundColor = config.backgroundColor
-        mStoredDayCode = getCurrentDayCode()
+        mStoredDayCode = Formatter.getTodayCode()
     }
 
-    private fun getCurrentDayCode() = Formatter.getDayCodeFromTS((System.currentTimeMillis() / 1000).toInt())
-
     private fun showViewDialog() {
         val res = resources
         val items = arrayListOf(
@@ -304,6 +302,14 @@ class MainActivity : SimpleActivity(), NavigationListener {
         }
     }
 
+    private fun handleParseResult(result: IcsImporter.ImportResult) {
+        toast(when (result) {
+            IcsImporter.ImportResult.IMPORT_OK -> R.string.holidays_imported_successfully
+            IcsImporter.ImportResult.IMPORT_PARTIAL -> R.string.importing_some_holidays_failed
+            else -> R.string.importing_holidays_failed
+        }, Toast.LENGTH_LONG)
+    }
+
     private fun addBirthdays() {
         val birthdays = getString(R.string.birthdays)
         var eventTypeId = dbHelper.getEventTypeIdWithTitle(birthdays)
@@ -355,14 +361,6 @@ class MainActivity : SimpleActivity(), NavigationListener {
         }
     }
 
-    private fun handleParseResult(result: IcsImporter.ImportResult) {
-        toast(when (result) {
-            IcsImporter.ImportResult.IMPORT_OK -> R.string.holidays_imported_successfully
-            IcsImporter.ImportResult.IMPORT_PARTIAL -> R.string.importing_some_holidays_failed
-            else -> R.string.importing_holidays_failed
-        }, Toast.LENGTH_LONG)
-    }
-
     private fun updateView(view: Int) {
         calendar_fab.beGoneIf(view == YEARLY_VIEW)
         mIsMonthSelected = view == MONTHLY_VIEW
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Formatter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Formatter.kt
index 5d20e9f69..0e2651cf4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Formatter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Formatter.kt
@@ -54,6 +54,8 @@ object Formatter {
         return "$month $day $year"
     }
 
+    fun getTodayCode() = Formatter.getDayCodeFromTS((System.currentTimeMillis() / 1000).toInt())
+
     fun getHours(context: Context, dateTime: DateTime) = dateTime.toString(getHourPattern(context))
 
     fun getTime(context: Context, dateTime: DateTime) = dateTime.toString(getTimePattern(context))