From ab0a8153f1ad9e247694e87838144f201801214f Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 21 Mar 2021 19:33:34 +0100 Subject: [PATCH] fix #1313, dim past events at the month/day view too --- .../simplemobiletools/calendar/pro/activities/MainActivity.kt | 2 +- .../calendar/pro/activities/WidgetListConfigureActivity.kt | 2 +- .../calendar/pro/adapters/EventListAdapter.kt | 4 ++-- .../calendar/pro/fragments/EventListFragment.kt | 2 +- .../calendar/pro/fragments/MonthDayFragment.kt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index ef32b91a0..a51098621 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -958,7 +958,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { search_results_list.beVisibleIf(events.isNotEmpty()) search_placeholder.beVisibleIf(events.isEmpty()) val listItems = getEventListItems(events) - val eventsAdapter = EventListAdapter(this, listItems, true, this, search_results_list, true) { + val eventsAdapter = EventListAdapter(this, listItems, true, this, search_results_list) { if (it is ListEvent) { Intent(applicationContext, EventActivity::class.java).apply { putExtra(EVENT_ID, it.id) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt index 72cc256e1..29f2c8f50 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt @@ -46,7 +46,7 @@ class WidgetListConfigureActivity : SimpleActivity() { finish() } - EventListAdapter(this, getListItems(), false, null, config_events_list, true) {}.apply { + EventListAdapter(this, getListItems(), false, null, config_events_list) {}.apply { updateTextColor(mTextColor) config_events_list.adapter = this } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListAdapter.kt index e27d10b0b..89cbaea5c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListAdapter.kt @@ -29,7 +29,7 @@ import kotlinx.android.synthetic.main.event_list_section.view.* import java.util.* class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList, val allowLongClick: Boolean, val listener: RefreshRecyclerViewListener?, - recyclerView: MyRecyclerView, val tryDimPastEvents: Boolean, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { + recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { private val topDivider = resources.getDrawable(R.drawable.divider_width) private val allDayString = resources.getString(R.string.all_day) @@ -177,7 +177,7 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList