Skip to content

Commit dac3623

Browse files
committed
fix excluding activity deselecting all tags
1 parent 32641e6 commit dac3623

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterUpdateInteractor.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -515,11 +515,12 @@ class RecordsFilterUpdateInteractor @Inject constructor(
515515
typesToTags: List<RecordTypeToTag>,
516516
): List<RecordsFilter> {
517517
val filters = currentFilters.toMutableList()
518-
// Update tags according to selected activities
519-
val newTypeIds: List<Long> = filters.getAllTypeIds(
520-
recordTypes = recordTypes,
521-
recordTypeCategories = recordTypeCategories,
522-
)
518+
// Update tags according to selected activities.
519+
// If no activities selected - show all tags.
520+
val newTypeIds: List<Long> = filters
521+
.getAllTypeIds(recordTypes, recordTypeCategories)
522+
.takeUnless { it.isEmpty() }
523+
?: recordTypes.map(RecordType::id)
523524
val tagIds = recordTags.map(RecordTag::id)
524525
val selectableTagIds = filterSelectableTagsInteractor.execute(
525526
tagIds = tagIds,

0 commit comments

Comments
 (0)