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 b9336e111..f5bd8914d 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 @@ -305,7 +305,6 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { refreshViewPager() updateWidgets() } - } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt index c5efc351b..79399ddda 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt @@ -287,7 +287,7 @@ class SettingsActivity : SimpleActivity() { } private fun showQuickFilterPicker() { - SelectQuickFilterEventTypesDialog(this) {} + SelectQuickFilterEventTypesDialog(this) } private fun setupSundayFirst() { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/QuickFilterEventTypeAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/QuickFilterEventTypeAdapter.kt index 80e7b1434..e879e7f94 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/QuickFilterEventTypeAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/QuickFilterEventTypeAdapter.kt @@ -12,7 +12,12 @@ import com.simplemobiletools.commons.helpers.MEDIUM_ALPHA import kotlinx.android.synthetic.main.quick_filter_event_type_view.view.* import java.util.* -class QuickFilterEventTypeAdapter(val activity: SimpleActivity, val allEventTypes: List, private val quickFilterEventTypeIds: Set, val filterChanged: () -> Unit) : +class QuickFilterEventTypeAdapter( + val activity: SimpleActivity, + val allEventTypes: List, + private val quickFilterEventTypeIds: Set, + val filterChanged: () -> Unit +) : RecyclerView.Adapter() { private val activeKeys = HashSet() private val quickFilterEventTypes = ArrayList() @@ -25,12 +30,9 @@ class QuickFilterEventTypeAdapter(val activity: SimpleActivity, val allEventType init { quickFilterEventTypeIds.forEach { quickFilterEventType -> - // Find the associated eventType, return if none found - val eventType = allEventTypes.find { eventType -> eventType.id.toString() == quickFilterEventType } - ?: return@forEach + val eventType = allEventTypes.find { eventType -> eventType.id.toString() == quickFilterEventType } ?: return@forEach quickFilterEventTypes.add(eventType) - // Check if it is currently active if (displayEventTypes.contains(eventType.id.toString())) { activeKeys.add(eventType.id!!) } @@ -72,10 +74,9 @@ class QuickFilterEventTypeAdapter(val activity: SimpleActivity, val allEventType quick_filter_event_type.text = eventType.title val textColor = if (isSelected) textColorActive else textColorInactive quick_filter_event_type.setTextColor(textColor) - val indicatorHeight = - if (isSelected) resources.getDimensionPixelSize(R.dimen.quick_filter_active_line_size) - else resources.getDimensionPixelSize(R.dimen.quick_filter_inactive_line_size) - quick_filter_event_type_color.layoutParams.height = indicatorHeight + + val indicatorHeightRes = if (isSelected) R.dimen.quick_filter_active_line_size else R.dimen.quick_filter_inactive_line_size + quick_filter_event_type_color.layoutParams.height = resources.getDimensionPixelSize(indicatorHeightRes) quick_filter_event_type_color.setBackgroundColor(eventType.color) quick_filter_event_type.setOnClickListener { viewClicked(!isSelected, eventType) @@ -87,10 +88,12 @@ class QuickFilterEventTypeAdapter(val activity: SimpleActivity, val allEventType } private fun viewClicked(select: Boolean, eventType: EventType) { - if (select) - activity.config.displayEventTypes = activity.config.displayEventTypes.plus(eventType.id.toString()) - else - activity.config.displayEventTypes = activity.config.displayEventTypes.minus(eventType.id.toString()) + activity.config.displayEventTypes = if (select) { + activity.config.displayEventTypes.plus(eventType.id.toString()) + } else { + activity.config.displayEventTypes.minus(eventType.id.toString()) + } + toggleItemSelection(select, eventType, adapterPosition) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectQuickFilterEventTypesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectQuickFilterEventTypesDialog.kt index 912ccac92..475faaa27 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectQuickFilterEventTypesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SelectQuickFilterEventTypesDialog.kt @@ -9,7 +9,7 @@ import com.simplemobiletools.calendar.pro.extensions.eventsHelper import com.simplemobiletools.commons.extensions.setupDialogStuff import kotlinx.android.synthetic.main.dialog_filter_event_types.view.* -class SelectQuickFilterEventTypesDialog(val activity: SimpleActivity, val callback: () -> Unit) { +class SelectQuickFilterEventTypesDialog(val activity: SimpleActivity) { private lateinit var dialog: AlertDialog private val view = activity.layoutInflater.inflate(R.layout.dialog_filter_event_types, null) @@ -31,7 +31,6 @@ class SelectQuickFilterEventTypesDialog(val activity: SimpleActivity, val callba val selectedItems = (view.filter_event_types_list.adapter as FilterEventTypeAdapter).getSelectedItemsList().map { it.toString() }.toHashSet() if (activity.config.quickFilterEventTypes != selectedItems) { activity.config.quickFilterEventTypes = selectedItems - callback() } dialog.dismiss() } diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 5c8a92247..aa4b9229b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -35,6 +35,6 @@ 48dp 88dp - 4dp + 6dp 1dp