diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt index e41a1c5a3..8ad2cd907 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt @@ -3,7 +3,6 @@ package com.simplemobiletools.calendar.activities import android.annotation.SuppressLint import android.app.DatePickerDialog import android.app.TimePickerDialog -import android.graphics.PorterDuff import android.os.Bundle import android.text.method.LinkMovementMethod import android.view.Menu @@ -732,11 +731,12 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener { } private fun updateIconColors() { - event_time_image.setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN) - event_repetition_image.setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN) - event_reminder_image.setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN) - event_type_image.setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN) - event_caldav_calendar_image.setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN) + val textColor = config.textColor + event_time_image.applyColorFilter(textColor) + event_repetition_image.applyColorFilter(textColor) + event_reminder_image.applyColorFilter(textColor) + event_type_image.applyColorFilter(textColor) + event_caldav_calendar_image.applyColorFilter(textColor) } override fun eventInserted(event: Event) { 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 6147db496..89833af77 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt @@ -6,7 +6,6 @@ import android.content.Context import android.content.Intent import android.content.res.Resources import android.graphics.Color -import android.graphics.PorterDuff import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.widget.LinearLayout @@ -23,6 +22,7 @@ import com.simplemobiletools.calendar.interfaces.MonthlyCalendar import com.simplemobiletools.calendar.models.DayMonthly import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.extensions.adjustAlpha +import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.beVisible import kotlinx.android.synthetic.main.first_row.* import kotlinx.android.synthetic.main.top_navigation.* @@ -130,8 +130,8 @@ class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar { mWeakTextColor = mTextColorWithoutTransparency.adjustAlpha(LOW_ALPHA) mPrimaryColor = config.primaryColor - top_left_arrow.drawable.mutate().setColorFilter(mTextColor, PorterDuff.Mode.SRC_ATOP) - top_right_arrow.drawable.mutate().setColorFilter(mTextColor, PorterDuff.Mode.SRC_ATOP) + top_left_arrow.applyColorFilter(mTextColor) + top_right_arrow.applyColorFilter(mTextColor) top_value.setTextColor(mTextColor) config_text_color.setBackgroundColor(mTextColor) config_save.setTextColor(mTextColor) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt index 2e96e3fe2..c7e5e489a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt @@ -1,6 +1,5 @@ package com.simplemobiletools.calendar.adapters -import android.graphics.PorterDuff import android.view.View import android.view.ViewGroup import com.simplemobiletools.calendar.R @@ -10,6 +9,7 @@ import com.simplemobiletools.calendar.extensions.shareEvents import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.interfaces.DeleteEventsListener import com.simplemobiletools.calendar.models.Event +import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.beInvisible import com.simplemobiletools.commons.extensions.beInvisibleIf import kotlinx.android.synthetic.main.event_item_day_view.view.* @@ -55,7 +55,7 @@ class DayEventsAdapter(activity: SimpleActivity, val events: List, val li event_item_description.text = if (replaceDescriptionWithLocation) event.location else event.description event_item_start.text = if (event.getIsAllDay()) allDayString else Formatter.getTimeFromTS(context, event.startTS) event_item_end.beInvisibleIf(event.startTS == event.endTS) - event_item_color.setColorFilter(event.color, PorterDuff.Mode.SRC_IN) + event_item_color.applyColorFilter(event.color) if (event.startTS != event.endTS) { val startCode = Formatter.getDayCodeFromTS(event.startTS) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt index 711eeb4f2..2b91cbac6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt @@ -1,6 +1,5 @@ package com.simplemobiletools.calendar.adapters -import android.graphics.PorterDuff import android.view.View import android.view.ViewGroup import com.simplemobiletools.calendar.R @@ -12,6 +11,7 @@ import com.simplemobiletools.calendar.interfaces.DeleteEventsListener import com.simplemobiletools.calendar.models.ListEvent import com.simplemobiletools.calendar.models.ListItem import com.simplemobiletools.calendar.models.ListSection +import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.beInvisible import com.simplemobiletools.commons.extensions.beInvisibleIf import kotlinx.android.synthetic.main.event_list_item.view.* @@ -72,7 +72,7 @@ class EventListAdapter(activity: SimpleActivity, val listItems: List, event_item_description.text = if (replaceDescriptionWithLocation) listEvent.location else listEvent.description event_item_start.text = if (listEvent.isAllDay) allDayString else Formatter.getTimeFromTS(context, listEvent.startTS) event_item_end.beInvisibleIf(listEvent.startTS == listEvent.endTS) - event_item_color.setColorFilter(listEvent.color, PorterDuff.Mode.SRC_IN) + event_item_color.applyColorFilter(listEvent.color) if (listEvent.startTS != listEvent.endTS) { val startCode = Formatter.getDayCodeFromTS(listEvent.startTS) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapterOld.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapterOld.kt index 531c09b7a..524d92143 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapterOld.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapterOld.kt @@ -1,7 +1,6 @@ package com.simplemobiletools.calendar.adapters import android.content.Context -import android.graphics.PorterDuff import android.graphics.drawable.Drawable import android.view.LayoutInflater import android.view.View @@ -14,6 +13,7 @@ import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.models.ListEvent import com.simplemobiletools.calendar.models.ListItem import com.simplemobiletools.calendar.models.ListSection +import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.beInvisibleIf import kotlinx.android.synthetic.main.event_list_item_widget.view.* @@ -69,7 +69,7 @@ class EventListWidgetAdapterOld(val context: Context, val mEvents: List