fix tests and style

Razeeman · Razeeman · commit 8e6394505941 · 2024-03-24T08:38:13.000+03:00
diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml
@@ -19,6 +19,11 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
 
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '17'
+
       - name: Run style check
         run: ./gradlew ktlintCheck
 
@@ -31,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        api-level: [19, 28, 29]
+        api-level: [21, 28, 29]
 
     steps:
       - name: Check out code
@@ -40,7 +45,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: '11' 
+          java-version: '17'
 
       - name: Run tests
         uses: reactivecircus/android-emulator-runner@v2
diff --git a/.github/workflows/github_build.yml b/.github/workflows/github_build.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: '11'
+          java-version: '17'
 
       - name: Build
         run: ./gradlew assembleDebug
diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/SettingsTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/SettingsTest.kt
@@ -1528,7 +1528,7 @@ class SettingsTest : BaseUiTest() {
     }
 
     @Test
-    fun recordTagSelectionWithOnlyGeneral() {
+    fun recordTagSelectionExcludeActivities() {
         val name = "TypeName"
         val tagGeneral = "TagGeneral"
 
@@ -1542,14 +1542,10 @@ class SettingsTest : BaseUiTest() {
         NavUtils.openSettingsScreen()
         NavUtils.openSettingsAdditional()
         scrollSettingsRecyclerToText(coreR.string.settings_show_record_tag_selection)
-        checkViewDoesNotExist(withText(coreR.string.settings_show_record_tag_general_hint))
+        checkViewIsNotDisplayed(settingsButtonBesideText(coreR.string.settings_show_record_tag_selection))
 
         clickOnSettingsCheckboxBesideText(coreR.string.settings_show_record_tag_selection)
-        scrollSettingsRecyclerToText(coreR.string.settings_show_record_tag_general_hint)
-        checkViewIsDisplayed(withText(coreR.string.settings_show_record_tag_general_hint))
-        checkCheckboxIsNotChecked(settingsCheckboxBesideText(coreR.string.settings_show_record_tag_general_hint))
-        clickOnSettingsCheckboxBesideText(coreR.string.settings_show_record_tag_general_hint)
-        checkCheckboxIsChecked(settingsCheckboxBesideText(coreR.string.settings_show_record_tag_general_hint))
+        checkViewIsDisplayed(settingsButtonBesideText(coreR.string.settings_show_record_tag_selection))
 
         // No tags - started right away
         NavUtils.openRunningRecordsScreen()
@@ -1559,20 +1555,21 @@ class SettingsTest : BaseUiTest() {
         // Add tag
         testUtils.addRecordTag(tagGeneral)
 
-        // Has a tag - show dialog
+        // Has a tag but not excluded - show dialog
         clickOnViewWithText(name)
         tryAction { checkViewIsDisplayed(withText(coreR.string.change_record_untagged)) }
         checkViewIsDisplayed(withText(tagGeneral))
         pressBack()
 
         // Change setting
         NavUtils.openSettingsScreen()
-        scrollSettingsRecyclerToText(coreR.string.settings_show_record_tag_general_hint)
-        checkCheckboxIsChecked(settingsCheckboxBesideText(coreR.string.settings_show_record_tag_general_hint))
-        clickOnSettingsCheckboxBesideText(coreR.string.settings_show_record_tag_general_hint)
-        checkCheckboxIsNotChecked(settingsCheckboxBesideText(coreR.string.settings_show_record_tag_general_hint))
+        scrollSettingsRecyclerToText(coreR.string.settings_show_record_tag_selection)
+        clickOnSettingsButtonBesideText(coreR.string.settings_show_record_tag_selection)
+        Thread.sleep(1000)
+        clickOnViewWithText(name)
+        clickOnViewWithText(coreR.string.duration_dialog_save)
 
-        // Start with tags - no dialog
+        // Has a tag but excluded - no dialog
         NavUtils.openRunningRecordsScreen()
         clickOnViewWithText(name)
         tryAction { clickOnView(allOf(isDescendantOfA(withId(baseR.id.viewRunningRecordItem)), withText(name))) }
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
@@ -26,7 +26,11 @@
             app:popExitAnim="@anim/slide_out_right" />
         <action
             android:id="@+id/action_mainFragment_to_changeRunningRecordFragment"
-            app:destination="@id/changeRunningRecordFragment" />
+            app:destination="@id/changeRunningRecordFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
         <action
             android:id="@+id/action_mainFragment_to_changeActivityFilterFragment"
             app:destination="@+id/changeActivityFilterFragment"
@@ -134,14 +138,14 @@
             app:enterAnim="@anim/slide_in_right"
             app:exitAnim="@anim/slide_out_left"
             app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right"/>
+            app:popExitAnim="@anim/slide_out_right" />
         <action
             android:id="@+id/action_categoriesFragment_to_changeRecordTagFragment"
             app:destination="@id/changeRecordTagFragment"
             app:enterAnim="@anim/slide_in_right"
             app:exitAnim="@anim/slide_out_left"
             app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right"/>
+            app:popExitAnim="@anim/slide_out_right" />
     </fragment>
     <fragment
         android:id="@+id/changeCategoryFragment"
diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt
@@ -207,7 +207,7 @@ class PrefsRepoImpl @Inject constructor(
     )
 
     override var recordTagSelectionExcludeActivities: Set<String> by prefs.delegate(
-        KEY_SHOW_RECORD_TAG_SELECTION_EXCLUDE_ACTIVITIES, emptySet()
+        KEY_SHOW_RECORD_TAG_SELECTION_EXCLUDE_ACTIVITIES, emptySet(),
     )
 
     override var automatedTrackingSendEvents: Boolean by prefs.delegate(
diff --git a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordTagSelectionTypes/view/RecordTagSelectionTypesDialogFragment.kt b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordTagSelectionTypes/view/RecordTagSelectionTypesDialogFragment.kt
@@ -14,9 +14,7 @@ import com.example.util.simpletimetracker.feature_base_adapter.empty.createEmpty
 import com.example.util.simpletimetracker.feature_base_adapter.info.createInfoAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.loader.createLoaderAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.recordType.createRecordTypeAdapterDelegate
-import com.example.util.simpletimetracker.feature_dialogs.R
 import com.example.util.simpletimetracker.feature_dialogs.recordTagSelectionTypes.viewModel.RecordTagSelectionTypesViewModel
-import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexWrap
diff --git a/features/feature_statistics_detail/src/main/res/layout/statistics_detail_fragment.xml b/features/feature_statistics_detail/src/main/res/layout/statistics_detail_fragment.xml
@@ -137,6 +137,7 @@
             <com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowView
                 android:id="@+id/buttonsStatisticsDetailLength"
                 android:layout_width="match_parent"
+                android:layout_marginTop="-10dp"
                 android:layout_height="wrap_content"
                 app:layout_constraintTop_toBottomOf="@id/buttonsStatisticsDetailGrouping" />
 
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/navigation/WearNavigator.kt b/wear/src/main/java/com/example/util/simpletimetracker/navigation/WearNavigator.kt
@@ -34,7 +34,7 @@ fun WearNavigator() {
                 },
                 onSettingsClick = {
                     navigation.navigate(Route.SETTINGS)
-                }
+                },
             )
         }
         composable(Route.TAGS) {
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/settings/SettingsItemType.kt b/wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/settings/SettingsItemType.kt
@@ -7,6 +7,6 @@ package com.example.util.simpletimetracker.presentation.screens.settings
 
 interface SettingsItemType {
 
-    object AllowMultitasking: SettingsItemType
-    object ShowCompactList: SettingsItemType
+    object AllowMultitasking : SettingsItemType
+    object ShowCompactList : SettingsItemType
 }
diff --git a/wear/src/main/java/com/example/util/simpletimetracker/presentation/ui/layout/ScaffoldedScrollingColumn.kt b/wear/src/main/java/com/example/util/simpletimetracker/presentation/ui/layout/ScaffoldedScrollingColumn.kt
@@ -12,7 +12,7 @@ import androidx.wear.compose.material.rememberScalingLazyListState
 @Composable
 fun ScaffoldedScrollingColumn(
     startItemIndex: Int,
-    content: ScalingLazyListScope.() -> Unit
+    content: ScalingLazyListScope.() -> Unit,
 ) {
     val scrollState = rememberScalingLazyListState()
     Scaffolding(scrollState) {
diff --git a/wear/src/test/java/com/example/util/simpletimetracker/wear/StartActivityMediatorTest.kt b/wear/src/test/java/com/example/util/simpletimetracker/wear/StartActivityMediatorTest.kt
@@ -47,7 +47,7 @@ class StartActivityMediatorTest {
         allowMultitasking = false,
         showRecordTagSelection = false,
         recordTagSelectionCloseAfterOne = false,
-        recordTagSelectionEvenForGeneralTags = false,
+        recordTagSelectionExcludedActivities = emptyList(),
     )
 
     @Before
@@ -59,7 +59,9 @@ class StartActivityMediatorTest {
     fun `tag selection disabled`() = runTest {
         // Given
         Mockito.`when`(wearDataRepo.loadSettings()).thenReturn(
-            Result.success(settings.copy(showRecordTagSelection = false)),
+            settings.copy(
+                showRecordTagSelection = false,
+            ).let(Result.Companion::success),
         )
         var onRequestTagSelectionCalled = false
 
@@ -78,7 +80,10 @@ class StartActivityMediatorTest {
     fun `tag selection enabled and activity has no tags`() = runTest {
         // Given
         Mockito.`when`(wearDataRepo.loadSettings()).thenReturn(
-            Result.success(settings.copy(showRecordTagSelection = true)),
+            settings.copy(
+                showRecordTagSelection = true,
+                recordTagSelectionExcludedActivities = emptyList(),
+            ).let(Result.Companion::success),
         )
         Mockito.`when`(wearDataRepo.loadTagsForActivity(Mockito.anyLong())).thenReturn(
             Result.success(emptyList()),
@@ -97,13 +102,13 @@ class StartActivityMediatorTest {
     }
 
     @Test
-    fun `tag selection enabled, but not for generals alone, and activity has only general tags`() = runTest {
+    fun `tag selection enabled, but not for this activity`() = runTest {
         // Given
         Mockito.`when`(wearDataRepo.loadSettings()).thenReturn(
             Result.success(
                 settings.copy(
                     showRecordTagSelection = true,
-                    recordTagSelectionEvenForGeneralTags = false,
+                    recordTagSelectionExcludedActivities = listOf(sampleActivity.id),
                 ),
             ),
         )
@@ -124,13 +129,13 @@ class StartActivityMediatorTest {
     }
 
     @Test
-    fun `activity has non-general tags`() = runTest {
+    fun `tag selection enabled, activity has tags`() = runTest {
         // Given
         Mockito.`when`(wearDataRepo.loadSettings()).thenReturn(
             Result.success(
                 settings.copy(
                     showRecordTagSelection = true,
-                    recordTagSelectionEvenForGeneralTags = false,
+                    recordTagSelectionExcludedActivities = emptyList(),
                 ),
             ),
         )
@@ -149,26 +154,4 @@ class StartActivityMediatorTest {
         Mockito.verify(currentActivitiesMediator, Mockito.never()).start(sampleActivity.id)
         assertEquals(true, onRequestTagSelectionCalled)
     }
-
-    @Test
-    fun `activity has only general tags and tag selection enabled for only generals`() = runTest {
-        // Given
-        Mockito.`when`(wearDataRepo.loadSettings()).thenReturn(
-            Result.success(settings.copy(recordTagSelectionEvenForGeneralTags = true)),
-        )
-        Mockito.`when`(wearDataRepo.loadTagsForActivity(Mockito.anyLong())).thenReturn(
-            Result.success(listOf(sampleGeneralTag)),
-        )
-        var onRequestTagSelectionCalled = false
-
-        // When
-        mediator.requestStart(
-            activityId = sampleActivity.id,
-            onRequestTagSelection = { onRequestTagSelectionCalled = true },
-        )
-
-        // Then
-        Mockito.verify(currentActivitiesMediator).start(sampleActivity.id)
-        assertEquals(false, onRequestTagSelectionCalled)
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ class PrefsRepoImpl @Inject constructor(`
`207`	`207`	`)`
`208`	`208`
`209`	`209`	`override var recordTagSelectionExcludeActivities: Set<String> by prefs.delegate(`
`210`		`- KEY_SHOW_RECORD_TAG_SELECTION_EXCLUDE_ACTIVITIES, emptySet()`
	`210`	`+ KEY_SHOW_RECORD_TAG_SELECTION_EXCLUDE_ACTIVITIES, emptySet(),`
`211`	`211`	`)`
`212`	`212`
`213`	`213`	`override var automatedTrackingSendEvents: Boolean by prefs.delegate(`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ fun WearNavigator() {`
`34`	`34`	`},`
`35`	`35`	`onSettingsClick = {`
`36`	`36`	`navigation.navigate(Route.SETTINGS)`
`37`		`- }`
	`37`	`+ },`
`38`	`38`	`)`
`39`	`39`	`}`
`40`	`40`	`composable(Route.TAGS) {`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ package com.example.util.simpletimetracker.presentation.screens.settings`
`7`	`7`
`8`	`8`	`interface SettingsItemType {`
`9`	`9`
`10`		`- object AllowMultitasking: SettingsItemType`
`11`		`- object ShowCompactList: SettingsItemType`
	`10`	`+ object AllowMultitasking : SettingsItemType`
	`11`	`+ object ShowCompactList : SettingsItemType`
`12`	`12`	`}`