From d5e14828f50892aeb53b4a5f2263d9e1a6e5cf9b Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 10 Sep 2017 16:50:07 +0200 Subject: [PATCH] rename Day model to DayMonthly --- .../calendar/activities/WidgetMonthlyConfigureActivity.kt | 6 +++--- .../simplemobiletools/calendar/fragments/MonthFragment.kt | 8 ++++---- .../calendar/helpers/MonthlyCalendarImpl.kt | 8 ++++---- .../calendar/helpers/MyWidgetMonthlyProvider.kt | 6 +++--- .../calendar/interfaces/MonthlyCalendar.kt | 4 ++-- .../kotlin/com/simplemobiletools/calendar/models/Day.kt | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt index 8e6fb95a2..a923251cd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt @@ -17,7 +17,7 @@ import com.simplemobiletools.calendar.helpers.LOW_ALPHA import com.simplemobiletools.calendar.helpers.MonthlyCalendarImpl import com.simplemobiletools.calendar.helpers.MyWidgetMonthlyProvider import com.simplemobiletools.calendar.interfaces.MonthlyCalendar -import com.simplemobiletools.calendar.models.Day +import com.simplemobiletools.calendar.models.DayMonthly import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.beVisible @@ -29,7 +29,7 @@ import org.joda.time.DateTime class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar { lateinit var mRes: Resources - private var mDays: List? = null + private var mDays: List? = null private var mPackageName = "" private var mBgAlpha = 0f @@ -192,7 +192,7 @@ class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar { } } - override fun updateMonthlyCalendar(month: String, days: List) { + override fun updateMonthlyCalendar(month: String, days: List) { runOnUiThread { mDays = days updateMonth(month) 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 eb21d53b0..f3929a6b1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt @@ -19,7 +19,7 @@ import com.simplemobiletools.calendar.extensions.getAppropriateTheme import com.simplemobiletools.calendar.helpers.* import com.simplemobiletools.calendar.interfaces.MonthlyCalendar import com.simplemobiletools.calendar.interfaces.NavigationListener -import com.simplemobiletools.calendar.models.Day +import com.simplemobiletools.calendar.models.DayMonthly import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.beGone import com.simplemobiletools.commons.extensions.beVisibleIf @@ -82,7 +82,7 @@ class MonthFragment : Fragment(), MonthlyCalendar { mCalendar.updateMonthlyCalendar(Formatter.getDateTimeFromCode(mDayCode)) } - override fun updateMonthlyCalendar(month: String, days: List) { + override fun updateMonthlyCalendar(month: String, days: List) { activity?.runOnUiThread { mHolder.top_value.text = month mHolder.top_value.setTextColor(mConfig.textColor) @@ -156,7 +156,7 @@ class MonthFragment : Fragment(), MonthlyCalendar { } } - private fun updateDays(days: List) { + private fun updateDays(days: List) { val displayWeekNumbers = mConfig.displayWeekNumbers val len = days.size @@ -210,7 +210,7 @@ class MonthFragment : Fragment(), MonthlyCalendar { } } - private fun getDayDotColor(day: Day, defaultColor: Int): Int { + private fun getDayDotColor(day: DayMonthly, defaultColor: Int): Int { val colors = day.eventColors.distinct() return if (colors.size == 1) colors[0] diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt index bcb96f409..339056b32 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt @@ -6,7 +6,7 @@ import com.simplemobiletools.calendar.extensions.dbHelper import com.simplemobiletools.calendar.extensions.getFilteredEvents import com.simplemobiletools.calendar.extensions.seconds import com.simplemobiletools.calendar.interfaces.MonthlyCalendar -import com.simplemobiletools.calendar.models.Day +import com.simplemobiletools.calendar.models.DayMonthly import com.simplemobiletools.calendar.models.Event import org.joda.time.DateTime import java.util.* @@ -36,7 +36,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context) } fun getDays() { - val days = ArrayList(DAYS_CNT) + val days = ArrayList(DAYS_CNT) val currMonthDays = mTargetDate.dayOfMonth().maximumValue var firstDayIndex = mTargetDate.withDayOfMonth(1).dayOfWeek @@ -67,7 +67,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context) val newDay = curDay.withDayOfMonth(value) val dayCode = Formatter.getDayCodeFromDateTime(newDay) - val day = Day(value, isThisMonth, isToday, dayCode, false, newDay.weekOfWeekyear, ArrayList()) + val day = DayMonthly(value, isThisMonth, isToday, dayCode, false, newDay.weekOfWeekyear, ArrayList()) days.add(day) value++ } @@ -76,7 +76,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context) } // it works more often than not, dont touch - private fun markDaysWithEvents(days: ArrayList) { + private fun markDaysWithEvents(days: ArrayList) { mContext.dbHelper.getEventTypes { val dayEvents = HashMap>() mEvents.forEach { 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 d023a93ae..3c570dd99 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt @@ -18,7 +18,7 @@ import com.simplemobiletools.calendar.activities.SplashActivity import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.extensions.launchNewEventIntent import com.simplemobiletools.calendar.interfaces.MonthlyCalendar -import com.simplemobiletools.calendar.models.Day +import com.simplemobiletools.calendar.models.DayMonthly import com.simplemobiletools.commons.extensions.adjustAlpha import org.joda.time.DateTime @@ -135,7 +135,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar { mCalendar?.getMonth(mTargetDate) } - fun updateDays(days: List) { + fun updateDays(days: List) { val displayWeekNumbers = mContext.config.displayWeekNumbers val len = days.size val packageName = mContext.packageName @@ -215,7 +215,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar { mRemoteViews?.setTextViewText(R.id.top_value, month) } - override fun updateMonthlyCalendar(month: String, days: List) { + override fun updateMonthlyCalendar(month: String, days: List) { try { updateMonth(month) updateDays(days) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt index 4405e5948..b6ae53991 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/interfaces/MonthlyCalendar.kt @@ -1,7 +1,7 @@ package com.simplemobiletools.calendar.interfaces -import com.simplemobiletools.calendar.models.Day +import com.simplemobiletools.calendar.models.DayMonthly interface MonthlyCalendar { - fun updateMonthlyCalendar(month: String, days: List) + fun updateMonthlyCalendar(month: String, days: List) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/models/Day.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/models/Day.kt index 2301d9bd8..ce4eab27f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/Day.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/models/Day.kt @@ -1,4 +1,4 @@ package com.simplemobiletools.calendar.models -data class Day(val value: Int, val isThisMonth: Boolean, val isToday: Boolean, val code: String, var hasEvent: Boolean, val weekOfYear: Int, +data class DayMonthly(val value: Int, val isThisMonth: Boolean, val isToday: Boolean, val code: String, var hasEvent: Boolean, val weekOfYear: Int, var eventColors: ArrayList)