From 4c3648e648f9bb71e0a5b5fcb309da4d98531619 Mon Sep 17 00:00:00 2001 From: razeeman Date: Sat, 10 Aug 2024 23:26:10 +0300 Subject: [PATCH] fix tests --- .github/workflows/github_actions.yml | 30 +++++++------------ .../util/simpletimetracker/AddCategoryTest.kt | 1 + .../simpletimetracker/AddRecordTypeTest.kt | 1 + .../util/simpletimetracker/GoalsDaysOfWeek.kt | 11 +++++++ .../util/simpletimetracker/GoalsTabTest.kt | 4 +++ .../RecordActionsAdjustTest.kt | 6 ++++ .../RecordActionsContinueTest.kt | 13 ++++++++ .../RecordActionsDuplicateTest.kt | 9 ++++++ .../RecordActionsMergeTest.kt | 11 +++++++ .../RecordActionsRepeatTest.kt | 11 +++++++ .../RecordActionsSplitTest.kt | 13 ++++++++ .../simpletimetracker/RecordRepeatTest.kt | 3 -- .../simpletimetracker/utils/BaseUiTest.kt | 1 - .../ChangeRecordActionsContinueDelegate.kt | 2 +- .../ChangeRecordActionsDelegateImpl.kt | 2 -- .../ChangeRecordActionsDuplicateDelegate.kt | 2 +- .../ChangeRecordActionsRepeatDelegate.kt | 2 +- .../viewModel/ChangeRecordBaseViewModel.kt | 2 +- .../RecordsFilterViewDataInteractor.kt | 2 +- .../mapper/RecordsFilterViewDataMapper.kt | 2 +- 20 files changed, 97 insertions(+), 31 deletions(-) diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index 689c7545b..07282eb4a 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - api-level: [21, 28, 29] + api-level: [21, 23, 29, 32, 34] steps: - name: Check out code @@ -55,28 +55,20 @@ jobs: sudo udevadm control --reload-rules sudo udevadm trigger --name-match=kvm - - name: Run tests - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: ${{ matrix.api-level }} - target: google_apis - arch: x86_64 - disable-animations: true - script: ./gradlew app:connectedPlayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.example.util.simpletimetracker.utils.Widget --stacktrace + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + + - name: Disable animations + run: | + adb shell settings put global window_animation_scale 0 + adb shell settings put global transition_animation_scale 0 + adb shell settings put global animator_duration_scale 0 - # For some reason widget tests make other tests to fail, so run them separately. - - name: Run widget tests + - name: Run tests uses: reactivecircus/android-emulator-runner@v2 with: api-level: ${{ matrix.api-level }} target: google_apis arch: x86_64 disable-animations: true - script: ./gradlew app:connectedPlayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.util.simpletimetracker.utils.Widget --stacktrace - - - name: Upload tests results - if: ${{ failure() }} - uses: actions/upload-artifact@v2 - with: - name: android_tests_results - path: app/build/reports/androidTests/connected + script: ./gradlew app:connectedPlayDebugAndroidTest --stacktrace diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/AddCategoryTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/AddCategoryTest.kt index 0e47900b1..26d0edd83 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/AddCategoryTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/AddCategoryTest.kt @@ -149,6 +149,7 @@ class AddCategoryTest : BaseUiTest() { // Check types saved longClickOnView(withText(name)) + Thread.sleep(1000) clickOnViewWithText(coreR.string.change_category_types_hint) checkViewIsDisplayed(withText(coreR.string.something_selected)) checkViewIsDisplayed(withId(baseR.id.viewDividerItem)) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt index ca9be198c..e1d6f49d8 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt @@ -176,6 +176,7 @@ class AddRecordTypeTest : BaseUiTest() { @Test fun addRecordTypeEmpty() { tryAction { clickOnViewWithText(coreR.string.running_records_add_type) } + closeSoftKeyboard() // Goal time is disabled clickOnViewWithText(coreR.string.change_record_type_goal_time_hint) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsDaysOfWeek.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsDaysOfWeek.kt index 7502c9ad8..a937a7354 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsDaysOfWeek.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsDaysOfWeek.kt @@ -1,6 +1,7 @@ package com.example.util.simpletimetracker import android.view.View +import androidx.test.espresso.Espresso.onView import androidx.test.espresso.Espresso.pressBack import androidx.test.espresso.ViewInteraction import androidx.test.espresso.matcher.ViewMatchers.hasDescendant @@ -24,6 +25,7 @@ import com.example.util.simpletimetracker.utils.clickOnView import com.example.util.simpletimetracker.utils.clickOnViewWithId import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.longClickOnView +import com.example.util.simpletimetracker.utils.nestedScrollTo import com.example.util.simpletimetracker.utils.scrollRecyclerInPagerToView import com.example.util.simpletimetracker.utils.tryAction import com.example.util.simpletimetracker.utils.withCardColor @@ -68,8 +70,10 @@ class GoalsDaysOfWeek : BaseUiTest() { // Check tryAction { longClickOnView(withText(name)) } + onView(withText(R.string.change_record_type_goal_time_hint)).perform(nestedScrollTo()) clickOnViewWithText(R.string.change_record_type_goal_time_hint) + onView(withId(changeRecordTypeR.id.layoutChangeRecordTypeGoalSession)).perform(nestedScrollTo()) checkString( changeRecordTypeR.id.layoutChangeRecordTypeGoalSession, withText("1$secondString"), @@ -81,6 +85,7 @@ class GoalsDaysOfWeek : BaseUiTest() { ::checkViewDoesNotExist, ) + onView(withId(changeRecordTypeR.id.layoutChangeRecordTypeGoalDaily)).perform(nestedScrollTo()) checkString( changeRecordTypeR.id.layoutChangeRecordTypeGoalDaily, withText("1$secondString"), @@ -92,6 +97,7 @@ class GoalsDaysOfWeek : BaseUiTest() { ::checkViewIsDisplayed, ) + onView(withId(changeRecordTypeR.id.layoutChangeRecordTypeGoalWeekly)).perform(nestedScrollTo()) checkString( changeRecordTypeR.id.layoutChangeRecordTypeGoalWeekly, withText("1$secondString"), @@ -103,6 +109,7 @@ class GoalsDaysOfWeek : BaseUiTest() { ::checkViewDoesNotExist, ) + onView(withId(changeRecordTypeR.id.layoutChangeRecordTypeGoalMonthly)).perform(nestedScrollTo()) checkString( changeRecordTypeR.id.layoutChangeRecordTypeGoalMonthly, withText("1$secondString"), @@ -125,6 +132,7 @@ class GoalsDaysOfWeek : BaseUiTest() { tryAction { longClickOnView(withText(name)) } // No days by default + onView(withText(R.string.change_record_type_goal_time_hint)).perform(nestedScrollTo()) clickOnViewWithText(R.string.change_record_type_goal_time_hint) checkViewDoesNotExist(withText(R.string.day_of_week_sunday)) @@ -198,6 +206,7 @@ class GoalsDaysOfWeek : BaseUiTest() { // Change days tryAction { longClickOnView(withText(name1)) } + onView(withText(R.string.change_record_type_goal_time_hint)).perform(nestedScrollTo()) clickOnViewWithText(R.string.change_record_type_goal_time_hint) clickOnView(withText(R.string.day_of_week_monday)) clickOnView(withText(R.string.day_of_week_wednesday)) @@ -206,6 +215,7 @@ class GoalsDaysOfWeek : BaseUiTest() { // Days are saved tryAction { longClickOnView(withText(name1)) } + onView(withText(R.string.change_record_type_goal_time_hint)).perform(nestedScrollTo()) clickOnViewWithText(R.string.change_record_type_goal_time_hint) checkTypeDay(stringResId = R.string.day_of_week_sunday, colorResId = R.color.colorActive) checkTypeDay(stringResId = R.string.day_of_week_monday, colorResId = R.color.colorInactive) @@ -218,6 +228,7 @@ class GoalsDaysOfWeek : BaseUiTest() { pressBack() tryAction { longClickOnView(withText(name2)) } + onView(withText(R.string.change_record_type_goal_time_hint)).perform(nestedScrollTo()) clickOnViewWithText(R.string.change_record_type_goal_time_hint) daysResIdList.forEach { checkTypeDay(stringResId = it, colorResId = R.color.colorActive) } } diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTabTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTabTest.kt index a9e9c651c..4e28e3d68 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTabTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTabTest.kt @@ -30,6 +30,7 @@ import com.example.util.simpletimetracker.utils.checkViewIsDisplayed import com.example.util.simpletimetracker.utils.clickOnView import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.longClickOnView +import com.example.util.simpletimetracker.utils.nestedScrollTo import com.example.util.simpletimetracker.utils.scrollRecyclerToView import com.example.util.simpletimetracker.utils.selectTabAtPosition import com.example.util.simpletimetracker.utils.tryAction @@ -91,6 +92,7 @@ class GoalsTabTest : BaseUiTest() { is RecordTypeGoal.Type.Count -> goal.value.toString() } + onView(withId(layout)).perform(nestedScrollTo()) checkViewIsDisplayed( allOf( isDescendantOfA(withId(layout)), @@ -107,6 +109,7 @@ class GoalsTabTest : BaseUiTest() { goals.forEach { goalsToAdd -> // Add goals tryAction { longClickOnView(withText(type)) } + onView(withText(coreR.string.change_record_type_goal_time_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_type_goal_time_hint) goalsToAdd.forEach { goal -> NavUtils.addGoalToActivity(goal) @@ -116,6 +119,7 @@ class GoalsTabTest : BaseUiTest() { // Check goals saved longClickOnView(withText(type)) + onView(withText(coreR.string.change_record_type_goal_time_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_type_goal_time_hint) goalsToAdd.forEach { goal -> checkGoal(goal) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsAdjustTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsAdjustTest.kt index f897dbef0..f8584f67b 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsAdjustTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsAdjustTest.kt @@ -23,6 +23,7 @@ import com.example.util.simpletimetracker.utils.clickOnView import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.getMillis import com.example.util.simpletimetracker.utils.longClickOnView +import com.example.util.simpletimetracker.utils.nestedScrollTo import com.example.util.simpletimetracker.utils.scrollRecyclerToView import dagger.hilt.android.testing.HiltAndroidTest import kotlinx.coroutines.runBlocking @@ -91,6 +92,7 @@ class RecordActionsAdjustTest : BaseUiTest() { adjust(isStart = true, buttonText = "-30") adjust(isStart = false, buttonText = "+30") adjust(isStart = false, buttonText = "+30") + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust)) clickOnViewWithText(coreR.string.change_record_adjust) @@ -176,6 +178,7 @@ class RecordActionsAdjustTest : BaseUiTest() { adjust(isStart = false, buttonText = "+1") clickOnViewWithText(coreR.string.change_record_type_field) clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name2)) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust)) clickOnViewWithText(coreR.string.change_record_adjust) @@ -240,6 +243,7 @@ class RecordActionsAdjustTest : BaseUiTest() { allOf(isDescendantOfA(withId(baseR.id.viewRunningRecordItem)), withText(name2), isCompletelyDisplayed()), ) clickOnViewWithText("-5") + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust)) clickOnViewWithText(coreR.string.change_record_adjust) @@ -292,6 +296,7 @@ class RecordActionsAdjustTest : BaseUiTest() { adjust(isStart = true, buttonText = "-30") adjust(isStart = false, buttonText = "+30") adjust(isStart = false, buttonText = "+30") + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_adjust)) clickOnViewWithText(coreR.string.change_record_adjust) @@ -391,6 +396,7 @@ class RecordActionsAdjustTest : BaseUiTest() { } // Deselect + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollToView(name5) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsContinueTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsContinueTest.kt index dc2ef9ae8..a2a010a92 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsContinueTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsContinueTest.kt @@ -17,6 +17,7 @@ import com.example.util.simpletimetracker.utils.clickOnView import com.example.util.simpletimetracker.utils.clickOnViewWithId import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.longClickOnView +import com.example.util.simpletimetracker.utils.nestedScrollTo import com.example.util.simpletimetracker.utils.recyclerItemCount import com.example.util.simpletimetracker.utils.scrollRecyclerToView import com.example.util.simpletimetracker.utils.tryAction @@ -72,6 +73,7 @@ class RecordActionsContinueTest : BaseUiTest() { // Continue clickOnViewWithText(fullName) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue)) clickOnViewWithText(coreR.string.change_record_continue) @@ -120,10 +122,12 @@ class RecordActionsContinueTest : BaseUiTest() { clickOnViewWithText(coreR.string.untracked_time_name) // Continue untracked doesn't work + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue)) clickOnViewWithText(coreR.string.change_record_continue) clickOnViewWithId(com.google.android.material.R.id.snackbar_text) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) // Select activity @@ -131,6 +135,7 @@ class RecordActionsContinueTest : BaseUiTest() { clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name)) // Continue + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue)) clickOnViewWithText(coreR.string.change_record_continue) @@ -178,10 +183,12 @@ class RecordActionsContinueTest : BaseUiTest() { clickOnViewWithId(recordsR.id.btnRecordAdd) // Continue untracked doesn't work + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue)) clickOnViewWithText(coreR.string.change_record_continue) clickOnViewWithId(com.google.android.material.R.id.snackbar_text) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) // Select activity @@ -189,6 +196,7 @@ class RecordActionsContinueTest : BaseUiTest() { clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name)) // Continue + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue)) clickOnViewWithText(coreR.string.change_record_continue) @@ -241,6 +249,7 @@ class RecordActionsContinueTest : BaseUiTest() { // Try continue record NavUtils.openRecordsScreen() clickOnView(allOf(withText(name), isCompletelyDisplayed())) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue)) clickOnViewWithText(coreR.string.change_record_continue) @@ -261,6 +270,7 @@ class RecordActionsContinueTest : BaseUiTest() { adjust("+30") adjust("+30") adjust("+5") + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue)) clickOnViewWithText(coreR.string.change_record_continue) @@ -288,6 +298,7 @@ class RecordActionsContinueTest : BaseUiTest() { } // Try continue record + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) checkViewDoesNotExist(withText(coreR.string.change_record_continue)) } @@ -305,6 +316,7 @@ class RecordActionsContinueTest : BaseUiTest() { clickOnViewWithId(recordsR.id.btnRecordAdd) clickOnViewWithText(coreR.string.change_record_type_field) clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name)) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue)) clickOnViewWithText(coreR.string.change_record_continue) @@ -337,6 +349,7 @@ class RecordActionsContinueTest : BaseUiTest() { clickOnViewWithId(recordsR.id.btnRecordAdd) clickOnViewWithText(coreR.string.change_record_type_field) clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name2)) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_continue)) clickOnViewWithText(coreR.string.change_record_continue) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsDuplicateTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsDuplicateTest.kt index 9ac395f9f..0d56e6039 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsDuplicateTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsDuplicateTest.kt @@ -18,6 +18,7 @@ import com.example.util.simpletimetracker.utils.clickOnViewWithId import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.getMillis import com.example.util.simpletimetracker.utils.longClickOnView +import com.example.util.simpletimetracker.utils.nestedScrollTo import com.example.util.simpletimetracker.utils.nthChildOf import com.example.util.simpletimetracker.utils.recyclerItemCount import com.example.util.simpletimetracker.utils.scrollRecyclerToView @@ -57,6 +58,7 @@ class RecordActionsDuplicateTest : BaseUiTest() { allOf(withId(baseR.id.viewRunningRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()), ) } + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) checkViewDoesNotExist(withText(coreR.string.change_record_duplicate)) pressBack() @@ -67,6 +69,7 @@ class RecordActionsDuplicateTest : BaseUiTest() { clickOnView( allOf(withId(baseR.id.viewRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()), ) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate)) checkViewIsDisplayed(withText(coreR.string.change_record_duplicate)) @@ -115,6 +118,7 @@ class RecordActionsDuplicateTest : BaseUiTest() { // Duplicate clickOnViewWithText(fullName) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate)) clickOnViewWithText(coreR.string.change_record_duplicate) @@ -170,10 +174,12 @@ class RecordActionsDuplicateTest : BaseUiTest() { clickOnViewWithText(coreR.string.untracked_time_name) // Duplicate untracked doesn't work + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate)) clickOnViewWithText(coreR.string.change_record_duplicate) clickOnViewWithId(com.google.android.material.R.id.snackbar_text) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) // Select activity @@ -185,6 +191,7 @@ class RecordActionsDuplicateTest : BaseUiTest() { clickOnViewWithText(coreR.string.change_record_comment_field) // Duplicate + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate)) clickOnViewWithText(coreR.string.change_record_duplicate) @@ -232,6 +239,7 @@ class RecordActionsDuplicateTest : BaseUiTest() { scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate)) clickOnViewWithText(coreR.string.change_record_duplicate) clickOnViewWithId(com.google.android.material.R.id.snackbar_text) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) // Select activity @@ -243,6 +251,7 @@ class RecordActionsDuplicateTest : BaseUiTest() { clickOnViewWithText(coreR.string.change_record_comment_field) // Duplicate + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_duplicate)) clickOnViewWithText(coreR.string.change_record_duplicate) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsMergeTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsMergeTest.kt index 4efc0d220..fb9dea5e3 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsMergeTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsMergeTest.kt @@ -1,5 +1,6 @@ package com.example.util.simpletimetracker +import androidx.test.espresso.Espresso.onView import androidx.test.espresso.Espresso.pressBack import androidx.test.espresso.matcher.ViewMatchers.hasDescendant import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed @@ -14,6 +15,7 @@ import com.example.util.simpletimetracker.utils.clickOnView import com.example.util.simpletimetracker.utils.clickOnViewWithId import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.longClickOnView +import com.example.util.simpletimetracker.utils.nestedScrollTo import com.example.util.simpletimetracker.utils.scrollRecyclerToView import com.example.util.simpletimetracker.utils.tryAction import dagger.hilt.android.testing.HiltAndroidTest @@ -55,8 +57,10 @@ class RecordActionsMergeTest : BaseUiTest() { allOf(withId(baseR.id.viewRunningRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()), ) } + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) checkViewDoesNotExist(withText(coreR.string.change_record_merge)) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) pressBack() @@ -65,23 +69,29 @@ class RecordActionsMergeTest : BaseUiTest() { clickOnView( allOf(withId(baseR.id.viewRecordItem), hasDescendant(withText(name)), isCompletelyDisplayed()), ) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) checkViewDoesNotExist(withText(coreR.string.change_record_merge)) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) pressBack() // New record - not shown clickOnViewWithId(recordsR.id.btnRecordAdd) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) checkViewDoesNotExist(withText(coreR.string.change_record_merge)) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) pressBack() // Untracked and have prev record - shown clickOnView(allOf(withText(coreR.string.untracked_time_name), isCompletelyDisplayed())) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_merge)) checkViewIsDisplayed(withText(coreR.string.change_record_merge)) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) pressBack() } @@ -135,6 +145,7 @@ class RecordActionsMergeTest : BaseUiTest() { isCompletelyDisplayed(), ), ) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_merge)) clickOnViewWithText(coreR.string.change_record_merge) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsRepeatTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsRepeatTest.kt index 74632aa1f..ef176637f 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsRepeatTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsRepeatTest.kt @@ -15,6 +15,7 @@ import com.example.util.simpletimetracker.utils.clickOnView import com.example.util.simpletimetracker.utils.clickOnViewWithId import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.longClickOnView +import com.example.util.simpletimetracker.utils.nestedScrollTo import com.example.util.simpletimetracker.utils.recyclerItemCount import com.example.util.simpletimetracker.utils.scrollRecyclerToView import com.example.util.simpletimetracker.utils.tryAction @@ -70,6 +71,7 @@ class RecordActionsRepeatTest : BaseUiTest() { // Repeat clickOnViewWithText(fullName) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_repeat)) clickOnViewWithText(coreR.string.change_record_repeat) @@ -116,10 +118,12 @@ class RecordActionsRepeatTest : BaseUiTest() { clickOnViewWithText(coreR.string.untracked_time_name) // Repeat untracked doesn't work + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_repeat)) clickOnViewWithText(coreR.string.change_record_repeat) clickOnViewWithId(com.google.android.material.R.id.snackbar_text) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) // Select activity @@ -127,6 +131,7 @@ class RecordActionsRepeatTest : BaseUiTest() { clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name)) // Repeat + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_repeat)) clickOnViewWithText(coreR.string.change_record_repeat) @@ -175,10 +180,12 @@ class RecordActionsRepeatTest : BaseUiTest() { clickOnViewWithId(recordsR.id.btnRecordAdd) // Repeat untracked doesn't work + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_repeat)) clickOnViewWithText(coreR.string.change_record_repeat) clickOnViewWithId(com.google.android.material.R.id.snackbar_text) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) // Select activity @@ -186,6 +193,7 @@ class RecordActionsRepeatTest : BaseUiTest() { clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name)) // Repeat + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_repeat)) clickOnViewWithText(coreR.string.change_record_repeat) @@ -241,6 +249,7 @@ class RecordActionsRepeatTest : BaseUiTest() { } // Try continue record + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) checkViewDoesNotExist(withText(coreR.string.change_record_repeat)) } @@ -258,6 +267,7 @@ class RecordActionsRepeatTest : BaseUiTest() { clickOnViewWithId(recordsR.id.btnRecordAdd) clickOnViewWithText(coreR.string.change_record_type_field) clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name)) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_repeat)) clickOnViewWithText(coreR.string.change_record_repeat) @@ -295,6 +305,7 @@ class RecordActionsRepeatTest : BaseUiTest() { clickOnViewWithId(recordsR.id.btnRecordAdd) clickOnViewWithText(coreR.string.change_record_type_field) clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name2)) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) scrollRecyclerToView(changeRecordR.id.rvChangeRecordAction, withText(coreR.string.change_record_repeat)) clickOnViewWithText(coreR.string.change_record_repeat) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsSplitTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsSplitTest.kt index adec1dbc0..3d0a3d5ed 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsSplitTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordActionsSplitTest.kt @@ -19,6 +19,7 @@ import com.example.util.simpletimetracker.utils.clickOnViewWithId import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.getMillis import com.example.util.simpletimetracker.utils.longClickOnView +import com.example.util.simpletimetracker.utils.nestedScrollTo import com.example.util.simpletimetracker.utils.recyclerItemCount import com.example.util.simpletimetracker.utils.setPickerTime import com.example.util.simpletimetracker.utils.tryAction @@ -55,6 +56,7 @@ class RecordActionsSplitTest : BaseUiTest() { // Open record NavUtils.openRecordsScreen() clickOnView(allOf(withText(name), isCompletelyDisplayed())) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) // Check new time set @@ -90,6 +92,7 @@ class RecordActionsSplitTest : BaseUiTest() { // Check record limits NavUtils.openRecordsScreen() clickOnView(allOf(withText(name), isCompletelyDisplayed())) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) repeat(4) { clickOnAdjustment("-30") } @@ -106,6 +109,7 @@ class RecordActionsSplitTest : BaseUiTest() { testUtils.addRunningRecord(typeName = name, timeStarted = timeStartedTimestamp) NavUtils.openRunningRecordsScreen() longClickOnView(allOf(isDescendantOfA(withId(baseR.id.viewRunningRecordItem)), withText(name))) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) repeat(4) { clickOnAdjustment("-30") } @@ -149,6 +153,7 @@ class RecordActionsSplitTest : BaseUiTest() { // Check time split set to time started clickOnViewWithText(fullName) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) timeStartedPreview = timeStartedTimestamp.formatDateTime() checkViewIsDisplayed( @@ -197,8 +202,11 @@ class RecordActionsSplitTest : BaseUiTest() { clickOnViewWithText(coreR.string.untracked_time_name) // Split untracked doesn't work + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) clickOnViewWithText(coreR.string.change_record_split) + clickOnViewWithId(com.google.android.material.R.id.snackbar_text) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) // Select activity @@ -206,6 +214,7 @@ class RecordActionsSplitTest : BaseUiTest() { clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name)) // Split + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) clickOnAdjustment("+1") clickOnViewWithText(coreR.string.change_record_split) @@ -235,8 +244,10 @@ class RecordActionsSplitTest : BaseUiTest() { clickOnViewWithId(recordsR.id.btnRecordAdd) // Split untracked doesn't work + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) clickOnViewWithText(coreR.string.change_record_split) + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) // Select activity @@ -244,6 +255,7 @@ class RecordActionsSplitTest : BaseUiTest() { clickOnRecyclerItem(changeRecordR.id.rvChangeRecordType, withText(name)) // Split + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) clickOnViewWithText(coreR.string.change_record_split) @@ -285,6 +297,7 @@ class RecordActionsSplitTest : BaseUiTest() { clickOnViewWithText("-30") // Check time split set to time started + onView(withText(coreR.string.change_record_actions_hint)).perform(nestedScrollTo()) clickOnViewWithText(coreR.string.change_record_actions_hint) timeStartedPreview = currentTime.formatDateTime() checkViewIsDisplayed( diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordRepeatTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordRepeatTest.kt index 9efc0e219..90ac31216 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordRepeatTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordRepeatTest.kt @@ -1,15 +1,12 @@ package com.example.util.simpletimetracker import androidx.test.espresso.matcher.ViewMatchers.hasDescendant -import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.runners.AndroidJUnit4 import com.example.util.simpletimetracker.domain.model.RepeatButtonType import com.example.util.simpletimetracker.feature_base_adapter.R import com.example.util.simpletimetracker.utils.BaseUiTest -import com.example.util.simpletimetracker.utils.NavUtils -import com.example.util.simpletimetracker.utils.checkViewDoesNotExist import com.example.util.simpletimetracker.utils.checkViewIsDisplayed import com.example.util.simpletimetracker.utils.clickOnViewWithText import com.example.util.simpletimetracker.utils.tryAction diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt index 684f91f6b..1b5517892 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt @@ -16,7 +16,6 @@ import com.example.util.simpletimetracker.core.mapper.IconImageMapper import com.example.util.simpletimetracker.core.mapper.TimeMapper import com.example.util.simpletimetracker.core.utils.CountingIdlingResourceProvider import com.example.util.simpletimetracker.core.utils.TestUtils -import com.example.util.simpletimetracker.domain.interactor.ComplexRuleInteractor import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.repo.ComplexRuleRepo import com.example.util.simpletimetracker.feature_records.view.RecordsContainerFragment diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsContinueDelegate.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsContinueDelegate.kt index 0b531f59d..36d0cf43c 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsContinueDelegate.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsContinueDelegate.kt @@ -14,7 +14,7 @@ class ChangeRecordActionsContinueDelegate @Inject constructor( private val router: Router, private val resourceRepo: ResourceRepo, private val recordActionContinueMediator: RecordActionContinueMediator, -): ChangeRecordActionsSubDelegate { +) : ChangeRecordActionsSubDelegate { private var parent: Parent? = null private var viewData: List = emptyList() diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDelegateImpl.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDelegateImpl.kt index a9032bc15..3a4bb9ad6 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDelegateImpl.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDelegateImpl.kt @@ -1,7 +1,6 @@ package com.example.util.simpletimetracker.feature_change_record.viewModel import androidx.lifecycle.LiveData -import com.example.util.simpletimetracker.core.base.ScopeHolder import com.example.util.simpletimetracker.core.base.ViewModelDelegate import com.example.util.simpletimetracker.core.extension.lazySuspend import com.example.util.simpletimetracker.core.extension.set @@ -10,7 +9,6 @@ import com.example.util.simpletimetracker.feature_base_adapter.divider.DividerVi import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordButtonViewData import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordChangePreviewViewData import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordTimeDoublePreviewViewData -import com.example.util.simpletimetracker.feature_change_record.mapper.ChangeRecordActionsDelegateMapper import com.example.util.simpletimetracker.feature_change_record.model.ChangeRecordActionsBlock import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDuplicateDelegate.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDuplicateDelegate.kt index 3e2fd80f9..a6dc83c60 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDuplicateDelegate.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsDuplicateDelegate.kt @@ -12,7 +12,7 @@ import javax.inject.Inject class ChangeRecordActionsDuplicateDelegate @Inject constructor( private val resourceRepo: ResourceRepo, private val recordActionDuplicateMediator: RecordActionDuplicateMediator, -): ChangeRecordActionsSubDelegate { +) : ChangeRecordActionsSubDelegate { private var parent: Parent? = null private var viewData: List = emptyList() diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsRepeatDelegate.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsRepeatDelegate.kt index 735f052ea..e22a76b02 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsRepeatDelegate.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsRepeatDelegate.kt @@ -12,7 +12,7 @@ import javax.inject.Inject class ChangeRecordActionsRepeatDelegate @Inject constructor( private val resourceRepo: ResourceRepo, private val recordActionRepeatMediator: RecordActionRepeatMediator, -): ChangeRecordActionsSubDelegate { +) : ChangeRecordActionsSubDelegate { private var parent: Parent? = null private var viewData: List = emptyList() diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt index 0e6f66afc..ef0636a99 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt @@ -615,7 +615,7 @@ abstract class ChangeRecordBaseViewModel( mergeParams = ChangeRecordActionsDelegate.Parent.ViewDataParams.MergeParams( mergeAvailable = mergeAvailable, prevRecord = prevRecord, - ) + ), ) } diff --git a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterViewDataInteractor.kt b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterViewDataInteractor.kt index 93a92377e..f338d0ffc 100644 --- a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterViewDataInteractor.kt +++ b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterViewDataInteractor.kt @@ -227,7 +227,7 @@ class RecordsFilterViewDataInteractor @Inject constructor( selectedRecordsCount = mapper.mapRecordsCount( extra = extra, count = count, - filterSelected = filterSelected + filterSelected = filterSelected, ), showListButtonIsVisible = filterSelected, recordsViewData = viewData, diff --git a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/mapper/RecordsFilterViewDataMapper.kt b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/mapper/RecordsFilterViewDataMapper.kt index f8b10fb75..6446892bf 100644 --- a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/mapper/RecordsFilterViewDataMapper.kt +++ b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/mapper/RecordsFilterViewDataMapper.kt @@ -39,7 +39,7 @@ class RecordsFilterViewDataMapper @Inject constructor( fun mapRecordsCount( extra: RecordsFilterParams, count: Int, - filterSelected: Boolean + filterSelected: Boolean, ): String { if (!filterSelected) return extra.title