fix tests and code style

Author: Razeeman

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

@@ -19,6 +19,7 @@ import com.example.util.simpletimetracker.utils.tryAction
 import com.example.util.simpletimetracker.utils.withCardColor
 import com.example.util.simpletimetracker.utils.withTag
 import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.Matcher
 import org.junit.Test
@@ -35,6 +36,7 @@ class ChangeUntrackedTest : BaseUiTest() {
         val icon = firstIcon
 
         // Add activity
+        runBlocking { prefsInteractor.setShowUntrackedInRecords(true) }
         testUtils.addActivity(name = name, color = color, icon = icon)
 
         // Open edit view

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

@@ -21,6 +21,7 @@ import com.example.util.simpletimetracker.utils.longClickOnViewWithId
 import com.example.util.simpletimetracker.utils.tryAction
 import com.example.util.simpletimetracker.utils.typeTextIntoView
 import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.allOf
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -54,6 +55,8 @@ class MainScreenEmptyTest : BaseUiTest() {
 
     @Test
     fun recordsEmpty() {
+        runBlocking { prefsInteractor.setShowUntrackedInRecords(true) }
+
         NavUtils.openRecordsScreen()
         checkViewIsDisplayed(
             allOf(

app/src/androidTest/java/com/example/util/simpletimetracker/RecordsRangesTest.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.longClickOnViewWithId
 import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.equalTo
 import org.junit.Test
@@ -34,6 +35,8 @@ class RecordsRangesTest : BaseUiTest() {
     fun recordsRanges() {
         val name = "Test"
 
+        runBlocking { prefsInteractor.setShowUntrackedInRecords(true) }
+
         // Add activity
         NavUtils.addActivity(name)
 

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

@@ -50,6 +50,7 @@ import com.example.util.simpletimetracker.utils.tryAction
 import com.example.util.simpletimetracker.utils.unconstrainedClickOnView
 import com.example.util.simpletimetracker.utils.withPluralText
 import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.Matcher
@@ -71,40 +72,40 @@ class SettingsTest : BaseUiTest() {
         // Add activity
         testUtils.addActivity(name = name, color = color, icon = icon)
 
-        // Untracked is shown
+        // Untracked is not shown
         NavUtils.openRecordsScreen()
-        checkViewIsDisplayed(allOf(withText(R.string.untracked_time_name), isCompletelyDisplayed()))
+        checkViewDoesNotExist(
+            allOf(withText(R.string.untracked_time_name), isCompletelyDisplayed())
+        )
 
         // Change setting
         NavUtils.openSettingsScreen()
         onView(withId(R.id.checkboxSettingsShowUntracked)).perform(nestedScrollTo())
-        onView(withId(R.id.checkboxSettingsShowUntracked)).check(matches(isChecked()))
-        unconstrainedClickOnView(withId(R.id.checkboxSettingsShowUntracked))
         onView(withId(R.id.checkboxSettingsShowUntracked)).check(matches(isNotChecked()))
+        unconstrainedClickOnView(withId(R.id.checkboxSettingsShowUntracked))
+        onView(withId(R.id.checkboxSettingsShowUntracked)).check(matches(isChecked()))
 
-        // Untracked is not shown
+        // Untracked is shown
         NavUtils.openRecordsScreen()
-        checkViewDoesNotExist(
-            allOf(withText(R.string.untracked_time_name), isCompletelyDisplayed())
-        )
+        checkViewIsDisplayed(allOf(withText(R.string.untracked_time_name), isCompletelyDisplayed()))
 
         // Add record
         NavUtils.addRecord(name)
-        checkViewDoesNotExist(
-            allOf(withText(R.string.untracked_time_name), isCompletelyDisplayed())
-        )
+        checkViewIsDisplayed(allOf(withText(R.string.untracked_time_name), isCompletelyDisplayed()))
         checkViewIsDisplayed(allOf(withText(name), isCompletelyDisplayed()))
 
         // Change setting
         NavUtils.openSettingsScreen()
         onView(withId(R.id.checkboxSettingsShowUntracked)).perform(nestedScrollTo())
-        onView(withId(R.id.checkboxSettingsShowUntracked)).check(matches(isNotChecked()))
-        unconstrainedClickOnView(withId(R.id.checkboxSettingsShowUntracked))
         onView(withId(R.id.checkboxSettingsShowUntracked)).check(matches(isChecked()))
+        unconstrainedClickOnView(withId(R.id.checkboxSettingsShowUntracked))
+        onView(withId(R.id.checkboxSettingsShowUntracked)).check(matches(isNotChecked()))
 
-        // Untracked is shown
+        // Untracked is not shown
         NavUtils.openRecordsScreen()
-        checkViewIsDisplayed(allOf(withText(R.string.untracked_time_name), isCompletelyDisplayed()))
+        checkViewDoesNotExist(
+            allOf(withText(R.string.untracked_time_name), isCompletelyDisplayed())
+        )
         checkViewIsDisplayed(allOf(withText(name), isCompletelyDisplayed()))
     }
 
@@ -807,6 +808,7 @@ class SettingsTest : BaseUiTest() {
         val name = "Test"
 
         // Add data
+        runBlocking { prefsInteractor.setShowUntrackedInRecords(true) }
         testUtils.addActivity(name)
         val calendar = Calendar.getInstance().apply {
             setToStartOfDay()

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

@@ -617,7 +617,7 @@ class StatisticsDetailTest : BaseUiTest() {
         checkRangeAverages(
             rangeId = R.string.statistics_detail_chart_weekly,
             checkAverage = false,
-            averageNonEmpty = "2$hourString 0$minuteString"
+            averageNonEmpty = "3$hourString 0$minuteString"
         )
         clickOnViewWithId(R.id.btnStatisticsDetailPrevious)
         clickOnChartGrouping(R.string.statistics_detail_chart_daily)

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

@@ -18,11 +18,11 @@ class RemoveRunningRecordMediator @Inject constructor(
 ) {
 
     suspend fun removeWithRecordAdd(runningRecord: RunningRecord) {
-        val duration = TimeUnit.MILLISECONDS.toSeconds(
-            System.currentTimeMillis() - runningRecord.timeStarted
-        )
+        val durationToIgnore = prefsInteractor.getIgnoreShortRecordsDuration()
+        val duration = TimeUnit.MILLISECONDS
+            .toSeconds(System.currentTimeMillis() - runningRecord.timeStarted)
 
-        if (duration > prefsInteractor.getIgnoreShortRecordsDuration()) {
+        if (duration > durationToIgnore || durationToIgnore == 0L) {
             recordInteractor.add(
                 typeId = runningRecord.id,
                 timeStarted = runningRecord.timeStarted,

data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/RecordRepoImpl.kt

@@ -35,7 +35,8 @@ class RecordRepoImpl @Inject constructor(
     }
 
     override suspend fun searchComments(
-        typeIds: List<Long>, text: String,
+        typeIds: List<Long>,
+        text: String,
     ): List<Record> = withContext(Dispatchers.IO) {
         Timber.d("searchComments")
         recordDao.searchComments(typeIds, text)

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/interactor/ChangeRecordViewDataInteractor.kt

@@ -7,8 +7,6 @@ import com.example.util.simpletimetracker.domain.interactor.RecordTagInteractor
 import com.example.util.simpletimetracker.domain.interactor.RecordTypeInteractor
 import com.example.util.simpletimetracker.domain.model.Record
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
-import com.example.util.simpletimetracker.feature_base_adapter.info.InfoViewData
-import com.example.util.simpletimetracker.feature_change_record.R
 import com.example.util.simpletimetracker.feature_change_record.mapper.ChangeRecordViewDataMapper
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordCommentViewData
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordViewData