improve record filtering, remove allocations

Author: Razeeman

app/src/androidTest/java/com/example/util/simpletimetracker/ComplexRulesTest.kt

@@ -662,7 +662,7 @@ class ComplexRulesTest : BaseUiTest() {
         // Check tag value selection
         NavUtils.openRunningRecordsScreen()
         clickOnViewWithText(typeName)
-        checkViewIsDisplayed(withId(dialogsR.id.tvRecordTagValueSelection))
+        checkViewIsDisplayed(withText(tagName))
         checkViewIsDisplayed(withId(dialogsR.id.btnRecordTagSelectionSave))
     }
 

core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt

@@ -131,6 +131,7 @@ class RecordFilterInteractor @Inject constructor(
         val manuallyFilteredItems: Map<RecordsFilter.ManuallyFilteredItem, Boolean> = filters.getManuallyFilteredItems()
         val daysOfWeek: Set<DayOfWeek> = filters.getDaysOfWeek()
         val timeOfDay: Range? = filters.getTimeOfDay()
+        val timeOfDayRanges: List<Range> = timeOfDay?.let(::getTimeOfDayRanges).orEmpty()
         val durations: List<Range> = filters.getDuration()?.let(::listOf).orEmpty()
         val duplicationItems: List<RecordsFilter.DuplicationsItem> = filters.getDuplicationItems()
 
@@ -238,19 +239,17 @@ class RecordFilterInteractor @Inject constructor(
 
         fun RecordBase.selectedByTag(): Boolean {
             if (selectedTagItems.isEmpty()) return true
-            val tagIds = tags.map(RecordBase.Tag::tagId)
-            return if (tagIds.isNotEmpty()) {
-                tagIds.any { tagId -> tagId in selectedTaggedIds }
+            return if (tags.isNotEmpty()) {
+                tags.any { tag -> tag.tagId in selectedTaggedIds }
             } else {
                 selectedUntagged
             }
         }
 
         fun RecordBase.filteredByTag(): Boolean {
             if (filteredTagItems.isEmpty()) return false
-            val tagIds = tags.map(RecordBase.Tag::tagId)
-            return if (tagIds.isNotEmpty()) {
-                tagIds.any { tagId -> tagId in filteredTaggedIds }
+            return if (tags.isNotEmpty()) {
+                tags.any { tag -> tag.tagId in filteredTaggedIds }
             } else {
                 filteredUntagged
             }
@@ -323,11 +322,6 @@ class RecordFilterInteractor @Inject constructor(
             } else {
                 listOf(Range(0, recordEnd), Range(recordStart, dayInMillis))
             }
-            val timeOfDayRanges = if (timeOfDay.timeStarted <= timeOfDay.timeEnded) {
-                listOf(Range(timeOfDay.timeStarted, timeOfDay.timeEnded))
-            } else {
-                listOf(Range(0, timeOfDay.timeEnded), Range(timeOfDay.timeStarted, dayInMillis))
-            }
 
             return recordRanges.any { recordRange ->
                 timeOfDayRanges.any { it.isOverlappingWith(recordRange) }
@@ -368,6 +362,19 @@ class RecordFilterInteractor @Inject constructor(
         return records
     }
 
+    private fun getTimeOfDayRanges(timeOfDay: Range): List<Range> {
+        return if (timeOfDay.timeStarted <= timeOfDay.timeEnded) {
+            listOf(
+                Range(timeOfDay.timeStarted, timeOfDay.timeEnded),
+            )
+        } else {
+            listOf(
+                Range(0, timeOfDay.timeEnded),
+                Range(timeOfDay.timeStarted, dayInMillis),
+            )
+        }
+    }
+
     companion object {
         private val dayInMillis = TimeUnit.DAYS.toMillis(1)
     }

features/feature_data_edit/src/main/res/layout/data_edit_fragment.xml

@@ -376,7 +376,6 @@
                 style="@style/AppButtonActive"
                 android:layout_width="match_parent"
                 android:layout_marginHorizontal="8dp"
-                android:foreground="?selectableItemBackground"
                 android:text="@string/change_record_duplicate"
                 app:layout_constraintTop_toBottomOf="@id/dividerDataEditChange"
                 tools:ignore="UnusedAttribute" />