fix tests

Author: Razeeman

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

@@ -12,10 +12,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.example.util.simpletimetracker.core.mapper.ColorMapper
 import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
 import com.example.util.simpletimetracker.feature_base_adapter.recordTypeSuggestion.RecordTypeSuggestionViewData
+import com.example.util.simpletimetracker.feature_change_record_type.R
+import com.example.util.simpletimetracker.feature_records_filter.viewData.CategoryFilteredType
 import com.example.util.simpletimetracker.feature_statistics_detail.adapter.StatisticsDetailBlock
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.Direction
 import com.example.util.simpletimetracker.utils.NavUtils
+import com.example.util.simpletimetracker.utils.NavUtils.fixToCurrentDate
 import com.example.util.simpletimetracker.utils.checkViewDoesNotExist
 import com.example.util.simpletimetracker.utils.clickOnView
 import com.example.util.simpletimetracker.utils.drag
@@ -210,6 +213,7 @@ class StatisticsDetailExcludeTest : BaseUiTest() {
         clickOnView(
             allOf(
                 withId(baseR.id.viewCategoryItem),
+                withTag(CategoryFilteredType),
                 hasDescendant(withText(category2)),
             ),
         )
@@ -331,6 +335,7 @@ class StatisticsDetailExcludeTest : BaseUiTest() {
         // Check default
         NavUtils.openFilter()
         Thread.sleep(1000)
+        clickOnView(withSubstring(getString(R.string.records_filter_exclude)))
         clickOnView(
             allOf(
                 isDescendantOfA(withId(baseR.id.viewCategoryItem)),
@@ -385,6 +390,7 @@ class StatisticsDetailExcludeTest : BaseUiTest() {
     private fun openStats() {
         NavUtils.openStatisticsScreen()
         tryAction { clickOnView(allOf(withText(R.string.statistics_total_tracked), isCompletelyDisplayed())) }
+        fixToCurrentDate()
     }
 
     private fun checkDefault() {

app/src/androidTest/java/com/example/util/simpletimetracker/utils/TestUtils.kt

@@ -5,9 +5,9 @@ import android.view.ViewGroup
 import android.view.ViewParent
 import com.google.android.material.appbar.AppBarLayout
 
-internal fun View.collapseAllAppBarsInParent() {
+internal fun View.changeAllAppBarsInParent(expanded: Boolean) {
     findViewsInParent(AppBarLayout::class.java)
-        .forEach { it.setExpanded(false) }
+        .forEach { it.setExpanded(expanded) }
 }
 
 internal fun <T> View.findViewsInParent(

app/src/androidTest/java/com/example/util/simpletimetracker/utils/ViewActions.kt

@@ -222,7 +222,7 @@ fun collapseToolbar(): ViewAction = object : ViewAction {
         isDisplayed()
 
     override fun perform(uiController: UiController?, view: View?) {
-        view?.collapseAllAppBarsInParent()
+        view?.changeAllAppBarsInParent(expanded = false)
     }
 }
 

domain/src/main/java/com/example/util/simpletimetracker/domain/complexRule/interactor/ComplexRuleProcessActionInteractor.kt

@@ -43,6 +43,8 @@ class ComplexRuleProcessActionInteractor @Inject constructor(
             .filter { it.actionDisallowOnlyPrevious }
             .map { it.conditionCurrentTypeIds }
             .flatten().toSet()
+            .takeUnless { rulesThatDisallow.any { !it.actionDisallowOnlyPrevious } }
+            .orEmpty()
 
         val additionalTags = assignTagRules.map { it.actionAssignTagIds }
             .flatten().toSet()

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/category/CategoryAdapterDelegate.kt

@@ -22,6 +22,8 @@ fun createCategoryAdapterDelegate(
     with(binding.viewCategoryItem) {
         item as ViewData
 
+        tag = item.type
+
         val transitionName = when (item) {
             is ViewData.Category -> TransitionNames.CATEGORY
             is ViewData.Record -> TransitionNames.RECORD_TAG

features/feature_complex_rules/src/main/java/com/example/util/simpletimetracker/feature_complex_rules/interactor/ComplexRulesViewDataInteractor.kt

@@ -48,7 +48,7 @@ class ComplexRulesViewDataInteractor @Inject constructor(
                 if (anyAction != null) {
                     val hint = complexRuleViewDataMapper.mapActionTitle(
                         action = anyAction,
-                        disallowOnlyPrevious = false
+                        disallowOnlyPrevious = false,
                     )
                     result += HintViewData(hint)
                 }

features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/grid/WidgetGridRemoveViewsFactory.kt

@@ -202,7 +202,6 @@ class WidgetGridRemoveViewsFactory @Inject constructor(
 
     // TODO WIDGET:
     // TODO add settings activity to select number of cards
-    // TODO add settings to filter some activities
     // TODO add settings for padding between cards?
     // TODO add repeat
     private fun getView(

resources/src/main/res/values-ar/strings.xml

@@ -217,6 +217,7 @@
     <string name="complex_rules_hint">يسمح بتطبيق أكثر دقة لبعض الإعدادات</string>
     <string name="complex_rules_disable">إبطال</string>
     <string name="complex_rules_enable">يُمكَِن</string>
+    <string name="complex_rules_action_disallow_only_previous_detail">السابق فقط</string>
 
     <!--  Change complex rules  -->
     <string name="change_complex_actions_title">فعل</string>
@@ -225,6 +226,7 @@
     <string name="change_complex_conditions_title">شروط</string>
     <string name="change_complex_starting_activity">نشاط البداية</string>
     <string name="change_complex_previous_activity">النشاط السابق</string>
+    <string name="change_complex_disallow_only_previous">إيقاف الأنشطة المحددة فقط</string>
     <string name="change_complex_rule_removed">تمت إزالة القاعدة</string>
     <string name="change_complex_rule_choose_action">اختر الإجراء</string>
     <string name="change_complex_rule_choose_condition">اختر الشروط</string>

resources/src/main/res/values-ca/strings.xml

@@ -217,6 +217,7 @@ Això et permet veure quant de temps dediques a activitats productives versus no
     <string name="complex_rules_hint">Permet una aplicació més afinada d\'alguns paràmetres</string>
     <string name="complex_rules_disable">Desactivar</string>
     <string name="complex_rules_enable">Activa</string>
+    <string name="complex_rules_action_disallow_only_previous_detail">Només l\'anterior</string>
 
     <!--  Change complex rules  -->
     <string name="change_complex_actions_title">Acció</string>
@@ -225,6 +226,7 @@ Això et permet veure quant de temps dediques a activitats productives versus no
     <string name="change_complex_conditions_title">Condicions</string>
     <string name="change_complex_starting_activity">L\'activitat inicial</string>
     <string name="change_complex_previous_activity">Activitat prèvia</string>
+    <string name="change_complex_disallow_only_previous">Només atura les activitats seleccionades</string>
     <string name="change_complex_rule_removed">Regla eliminada</string>
     <string name="change_complex_rule_choose_action">Trieu l\'acció</string>
     <string name="change_complex_rule_choose_condition">Trieu condicions</string>

resources/src/main/res/values-de/strings.xml

@@ -217,6 +217,7 @@ Dies ermöglicht es dir, zu sehen, wie viel Zeit du insgesamt für produktive ve
     <string name="complex_rules_hint">Ermöglicht eine genauere Anwendung einiger Einstellungen</string>
     <string name="complex_rules_disable">Deaktivieren</string>
     <string name="complex_rules_enable">Aktivieren</string>
+    <string name="complex_rules_action_disallow_only_previous_detail">Nur vorherige</string>
 
     <!--  Change complex rules  -->
     <string name="change_complex_actions_title">Aktion</string>
@@ -225,6 +226,7 @@ Dies ermöglicht es dir, zu sehen, wie viel Zeit du insgesamt für produktive ve
     <string name="change_complex_conditions_title">Bedingungen</string>
     <string name="change_complex_starting_activity">Die Startaktivität</string>
     <string name="change_complex_previous_activity">Vorherige Aktivität</string>
+    <string name="change_complex_disallow_only_previous">Nur ausgewählte Aktivitäten stoppen</string>
     <string name="change_complex_rule_removed">Regel entfernt</string>
     <string name="change_complex_rule_choose_action">Aktion wählen</string>
     <string name="change_complex_rule_choose_condition">Wählen Sie Bedingungen</string>