From 9df5855897c7ae2836a126a733f7c5ba56de6e7e Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 10 Jan 2023 15:54:44 +0100 Subject: [PATCH] warn the user if he has all event types filtered out --- app/build.gradle | 2 +- .../calendar/pro/activities/MainActivity.kt | 7 +++++++ .../calendar/pro/fragments/EventListFragment.kt | 12 +++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c39061c7c..379ccd7eb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,7 +70,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:a95c7109bd' + implementation 'com.github.SimpleMobileTools:Simple-Commons:4dc76358a0' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' 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 f509a2d6f..1218117fb 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 @@ -1193,6 +1193,13 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { search_results_list.adapter = null } + val placeholderTextId = if (config.displayEventTypes.isEmpty()) { + R.string.everything_filtered_out + } else { + R.string.no_items_found + } + + search_placeholder.setText(placeholderTextId) search_placeholder_2.beVisibleIf(text.length == 1) if (text.length >= 2) { if (search_results_list.adapter == null) { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/EventListFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/EventListFragment.kt index 1572c5129..31cf24590 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/EventListFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/EventListFragment.kt @@ -162,8 +162,18 @@ class EventListFragment : MyFragmentHolder(), RefreshRecyclerViewListener { mView.calendar_empty_list_placeholder.beVisibleIf(mEvents.isEmpty()) mView.calendar_empty_list_placeholder_2.beVisibleIf(mEvents.isEmpty()) mView.calendar_events_list.beGoneIf(mEvents.isEmpty()) - if (activity != null) + if (activity != null) { mView.calendar_empty_list_placeholder.setTextColor(requireActivity().getProperTextColor()) + if (mEvents.isEmpty()) { + val placeholderTextId = if (requireActivity().config.displayEventTypes.isEmpty()) { + R.string.everything_filtered_out + } else { + R.string.no_upcoming_events + } + + mView.calendar_empty_list_placeholder.setText(placeholderTextId) + } + } } private fun fetchPreviousPeriod() {