diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt index b59add11d..c0ff3ce5f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt @@ -60,6 +60,7 @@ class SettingsActivity : SimpleActivity() { setupDisplayPastEvents() setupFontSize() setupCustomizeWidgetColors() + setupDimEvents() updateTextColors(settings_holder) checkPrimaryColor() setupSectionColors() @@ -84,7 +85,7 @@ class SettingsActivity : SimpleActivity() { private fun setupSectionColors() { val adjustedPrimaryColor = getAdjustedPrimaryColor() - arrayListOf(reminders_label, caldav_label, weekly_view_label, monthly_view_label, simple_event_list_label, simple_font_size_label).forEach { + arrayListOf(reminders_label, caldav_label, weekly_view_label, monthly_view_label, simple_event_list_label, simple_font_size_label, events_label).forEach { it.setTextColor(adjustedPrimaryColor) } } @@ -409,6 +410,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupDimEvents() { + settings_dim_past_events.isChecked = config.dimPastEvents + settings_dim_past_events_holder.setOnClickListener { + settings_dim_past_events.toggle() + config.dimPastEvents = settings_dim_past_events.isChecked + } + } + override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { super.onActivityResult(requestCode, resultCode, resultData) if (requestCode == GET_RINGTONE_URI && resultCode == RESULT_OK && resultData != null) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt index a39b856b0..292a2d222 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt @@ -97,6 +97,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(LOOP_REMINDERS, false) set(loopReminders) = prefs.edit().putBoolean(LOOP_REMINDERS, loopReminders).apply() + var dimPastEvents: Boolean + get() = prefs.getBoolean(DIM_PAST_EVENTS, true) + set(dimPastEvents) = prefs.edit().putBoolean(DIM_PAST_EVENTS, dimPastEvents).apply() + fun getSyncedCalendarIdsAsList() = caldavSyncedCalendarIDs.split(",").filter { it.trim().isNotEmpty() } as ArrayList fun addDisplayEventType(type: String) { 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 4023b8ac8..77ec4db33 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt @@ -51,6 +51,7 @@ const val REPLACE_DESCRIPTION = "replace_description" const val SHOW_GRID = "show_grid" const val IS_CUSTOMIZING_COLORS = "is_customizing_colors" const val LOOP_REMINDERS = "loop_reminders" +const val DIM_PAST_EVENTS = "dim_past_events" // repeat_rule for monthly repetition const val REPEAT_MONTH_SAME_DAY = 1 // ie 25th every month diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 32dad5eef..58683dcaa 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -147,28 +147,6 @@ - - - - - - + + + + + + + + + + + + + + + +