From 85e7cbd13f1fb830e058723a755be11f38544395 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 5 Mar 2018 16:14:15 +0100
Subject: [PATCH] update commons to 3.14.17

---
 app/build.gradle                              |  2 +-
 .../calendar/fragments/MonthFragment.kt       | 19 +++++++++++--------
 .../calendar/helpers/Constants.kt             |  6 ------
 .../helpers/MyWidgetMonthlyProvider.kt        |  8 ++++----
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e41a6e1cf..ac053d0c7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,7 +46,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.14.15'
+    implementation 'com.simplemobiletools:commons:3.14.17'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'com.android.support:multidex:1.0.3'
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
index 3eec7a054..6c43546d5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
@@ -17,7 +17,10 @@ import com.simplemobiletools.calendar.activities.MainActivity
 import com.simplemobiletools.calendar.extensions.addDayEvents
 import com.simplemobiletools.calendar.extensions.addDayNumber
 import com.simplemobiletools.calendar.extensions.config
-import com.simplemobiletools.calendar.helpers.*
+import com.simplemobiletools.calendar.helpers.Config
+import com.simplemobiletools.calendar.helpers.DAY_CODE
+import com.simplemobiletools.calendar.helpers.Formatter
+import com.simplemobiletools.calendar.helpers.MonthlyCalendarImpl
 import com.simplemobiletools.calendar.interfaces.MonthlyCalendar
 import com.simplemobiletools.calendar.interfaces.NavigationListener
 import com.simplemobiletools.calendar.models.DayMonthly
@@ -139,8 +142,8 @@ class MonthFragment : Fragment(), MonthlyCalendar {
                 .setNegativeButton(R.string.cancel, null)
                 .setPositiveButton(R.string.ok) { dialog, which -> positivePressed(dateTime, datePicker) }
                 .create().apply {
-            activity?.setupDialogStuff(view, this)
-        }
+                    activity?.setupDialogStuff(view, this)
+                }
     }
 
     private fun positivePressed(dateTime: DateTime, datePicker: DatePicker) {
@@ -151,16 +154,16 @@ class MonthFragment : Fragment(), MonthlyCalendar {
     }
 
     private fun setupLabels() {
-        val letters = letterIDs
-
+        val letters = context!!.resources.getStringArray(R.array.week_day_letters)
         for (i in 0..6) {
             var index = i
-            if (!mSundayFirst)
-                index = (index + 1) % letters.size
+            if (mSundayFirst) {
+                index = (index + 6) % letters.size
+            }
 
             mHolder.findViewById<TextView>(mRes.getIdentifier("label_$i", "id", mPackageName)).apply {
                 setTextColor(mTextColor)
-                text = getString(letters[index])
+                text = letters[index]
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
index cd85943dc..c3d303665 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
@@ -1,7 +1,5 @@
 package com.simplemobiletools.calendar.helpers
 
-import com.simplemobiletools.calendar.R
-
 const val LOW_ALPHA = .3f
 const val MEDIUM_ALPHA = .6f
 const val STORED_LOCALLY_ONLY = 0
@@ -54,10 +52,6 @@ const val DISPLAY_PAST_EVENTS = "display_past_events"
 const val REPLACE_DESCRIPTION = "replace_description"
 const val USE_SAME_SNOOZE = "use_same_snooze"
 
-val letterIDs = intArrayOf(R.string.sunday_letter, R.string.monday_letter, R.string.tuesday_letter, R.string.wednesday_letter,
-        R.string.thursday_letter, R.string.friday_letter, R.string.saturday_letter)
-
-
 // repeat_rule for monthly repetition
 const val REPEAT_MONTH_SAME_DAY = 1                   // ie 25th every month
 const val REPEAT_MONTH_ORDER_WEEKDAY_USE_LAST = 2     // ie every xth sunday. 4th if a month has 4 sundays, 5th if 5
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
index c175eaf97..7ebff7fdd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
@@ -191,18 +191,18 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
         val sundayFirst = context.config.isSundayFirst
         val smallerFontSize = context.config.getFontSize()
         val packageName = context.packageName
-        val letters = letterIDs
+        val letters = context.resources.getStringArray(R.array.week_day_letters)
         for (i in 0..6) {
             val id = resources.getIdentifier("label_$i", "id", packageName)
             views.setTextColor(id, textColor)
             views.setTextSize(id, smallerFontSize)
 
             var index = i
-            if (!sundayFirst) {
-                index = (index + 1) % letters.size
+            if (sundayFirst) {
+                index = (index + 6) % letters.size
             }
 
-            views.setText(id, resources.getString(letters[index]))
+            views.setText(id, letters[index])
         }
     }
 }