Skip to content

Commit 683b675

Browse files
authored
Merge pull request #280 from SwEnt-Group13/refactor/ui-bug-qol-fixes
Refactor: UI bugs and QOL fixes
2 parents 8347ee8 + 37193a0 commit 683b675

File tree

79 files changed

+295
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+295
-221
lines changed

app/src/androidTest/java/com/android/unio/Utils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import androidx.compose.ui.test.performClick
99
import androidx.compose.ui.test.performScrollTo
1010
import androidx.compose.ui.test.performTextInput
1111
import com.android.unio.model.authentication.unregisterAllAuthStateListeners
12-
import com.android.unio.model.strings.test_tags.SocialsOverlayTestTags
12+
import com.android.unio.model.strings.test_tags.authentication.SocialsOverlayTestTags
1313
import com.google.firebase.Firebase
1414
import com.google.firebase.auth.auth
1515
import io.mockk.clearAllMocks

app/src/androidTest/java/com/android/unio/components/BottomNavigationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.android.unio.model.event.EventViewModel
1010
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
1111
import com.android.unio.model.search.SearchRepository
1212
import com.android.unio.model.search.SearchViewModel
13-
import com.android.unio.model.strings.test_tags.NavigationActionTestTags
13+
import com.android.unio.model.strings.test_tags.navigation.NavigationActionTestTags
1414
import com.android.unio.model.user.UserRepository
1515
import com.android.unio.model.user.UserRepositoryFirestore
1616
import com.android.unio.model.user.UserViewModel

app/src/androidTest/java/com/android/unio/components/ScreenDisplayingTest.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ import com.android.unio.model.map.nominatim.NominatimLocationRepository
2424
import com.android.unio.model.map.nominatim.NominatimLocationSearchViewModel
2525
import com.android.unio.model.search.SearchRepository
2626
import com.android.unio.model.search.SearchViewModel
27-
import com.android.unio.model.strings.test_tags.AccountDetailsTestTags
28-
import com.android.unio.model.strings.test_tags.AssociationProfileTestTags
29-
import com.android.unio.model.strings.test_tags.EmailVerificationTestTags
30-
import com.android.unio.model.strings.test_tags.EventCreationTestTags
31-
import com.android.unio.model.strings.test_tags.EventDetailsTestTags
32-
import com.android.unio.model.strings.test_tags.ExploreContentTestTags
33-
import com.android.unio.model.strings.test_tags.ExploreTestTags
34-
import com.android.unio.model.strings.test_tags.HomeTestTags
35-
import com.android.unio.model.strings.test_tags.MapTestTags
36-
import com.android.unio.model.strings.test_tags.SavedTestTags
37-
import com.android.unio.model.strings.test_tags.SettingsTestTags
38-
import com.android.unio.model.strings.test_tags.SomeoneElseUserProfileTestTags
39-
import com.android.unio.model.strings.test_tags.UserProfileTestTags
40-
import com.android.unio.model.strings.test_tags.WelcomeTestTags
27+
import com.android.unio.model.strings.test_tags.association.AssociationProfileTestTags
28+
import com.android.unio.model.strings.test_tags.authentication.AccountDetailsTestTags
29+
import com.android.unio.model.strings.test_tags.authentication.EmailVerificationTestTags
30+
import com.android.unio.model.strings.test_tags.authentication.WelcomeTestTags
31+
import com.android.unio.model.strings.test_tags.event.EventCreationTestTags
32+
import com.android.unio.model.strings.test_tags.event.EventDetailsTestTags
33+
import com.android.unio.model.strings.test_tags.explore.ExploreContentTestTags
34+
import com.android.unio.model.strings.test_tags.explore.ExploreTestTags
35+
import com.android.unio.model.strings.test_tags.home.HomeTestTags
36+
import com.android.unio.model.strings.test_tags.map.MapTestTags
37+
import com.android.unio.model.strings.test_tags.saved.SavedTestTags
38+
import com.android.unio.model.strings.test_tags.settings.SettingsTestTags
39+
import com.android.unio.model.strings.test_tags.user.SomeoneElseUserProfileTestTags
40+
import com.android.unio.model.strings.test_tags.user.UserProfileTestTags
4141
import com.android.unio.model.user.User
4242
import com.android.unio.model.user.UserRepositoryFirestore
4343
import com.android.unio.model.user.UserViewModel

app/src/androidTest/java/com/android/unio/components/association/AssociationProfileBottomSheetTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.android.unio.components.association
22

3-
import androidx.compose.ui.test.assert
43
import androidx.compose.ui.test.assertHasClickAction
54
import androidx.compose.ui.test.junit4.createComposeRule
65
import androidx.compose.ui.test.onNodeWithTag
76
import androidx.compose.ui.test.performClick
87
import com.android.unio.TearDown
9-
import com.android.unio.model.strings.test_tags.AssociationProfileTestTags
8+
import com.android.unio.model.strings.test_tags.association.AssociationProfileTestTags
109
import com.android.unio.ui.association.AssociationProfileBottomSheet
1110
import org.junit.Rule
1211
import org.junit.Test

app/src/androidTest/java/com/android/unio/components/association/AssociationProfileTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import com.android.unio.model.firestore.emptyFirestoreReferenceList
2828
import com.android.unio.model.follow.ConcurrentAssociationUserRepositoryFirestore
2929
import com.android.unio.model.hilt.module.FirebaseModule
3030
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
31-
import com.android.unio.model.strings.test_tags.AssociationProfileTestTags
31+
import com.android.unio.model.strings.test_tags.association.AssociationProfileTestTags
3232
import com.android.unio.model.user.User
3333
import com.android.unio.model.user.UserRepositoryFirestore
3434
import com.android.unio.model.user.UserViewModel

app/src/androidTest/java/com/android/unio/components/association/EditAssociationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.android.unio.assertDisplayComponentInScroll
88
import com.android.unio.mocks.association.MockAssociation
99
import com.android.unio.model.association.Association
1010
import com.android.unio.model.association.AssociationRepository
11-
import com.android.unio.model.strings.test_tags.EditAssociationTestTags
11+
import com.android.unio.model.strings.test_tags.association.EditAssociationTestTags
1212
import com.android.unio.ui.association.EditAssociationScaffold
1313
import com.android.unio.ui.navigation.NavigationAction
1414
import com.google.firebase.firestore.CollectionReference

app/src/androidTest/java/com/android/unio/components/authentication/AccountDetailsTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import com.android.unio.addNewUserSocial
1414
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
1515
import com.android.unio.model.image.ImageViewModel
1616
import com.android.unio.model.strings.TextLengthSamples
17-
import com.android.unio.model.strings.test_tags.AccountDetailsTestTags
18-
import com.android.unio.model.strings.test_tags.InterestsOverlayTestTags
19-
import com.android.unio.model.strings.test_tags.SocialsOverlayTestTags
17+
import com.android.unio.model.strings.test_tags.authentication.AccountDetailsTestTags
18+
import com.android.unio.model.strings.test_tags.authentication.InterestsOverlayTestTags
19+
import com.android.unio.model.strings.test_tags.authentication.SocialsOverlayTestTags
2020
import com.android.unio.model.user.UserViewModel
2121
import com.android.unio.ui.authentication.AccountDetailsScreen
2222
import com.android.unio.ui.navigation.NavigationAction

app/src/androidTest/java/com/android/unio/components/authentication/PictureSelectionToolTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
66
import androidx.compose.ui.test.onNodeWithTag
77
import androidx.test.filters.LargeTest
88
import com.android.unio.TearDown
9-
import com.android.unio.model.strings.test_tags.PictureSelectionToolTestTags
9+
import com.android.unio.model.strings.test_tags.authentication.PictureSelectionToolTestTags
1010
import com.android.unio.ui.components.PictureSelectionTool
1111
import com.google.firebase.Firebase
1212
import com.google.firebase.auth.FirebaseAuth

app/src/androidTest/java/com/android/unio/components/authentication/WelcomeTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import androidx.compose.ui.test.performTextInput
1010
import com.android.unio.TearDown
1111
import com.android.unio.mocks.user.MockUser
1212
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
13-
import com.android.unio.model.strings.test_tags.WelcomeTestTags
13+
import com.android.unio.model.strings.test_tags.authentication.WelcomeTestTags
1414
import com.android.unio.model.user.User
1515
import com.android.unio.model.user.UserRepositoryFirestore
1616
import com.android.unio.model.user.UserViewModel

app/src/androidTest/java/com/android/unio/components/authentication/overlay/InterestOverlayTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import androidx.compose.ui.test.onNodeWithTag
88
import androidx.compose.ui.test.performClick
99
import androidx.compose.ui.test.performScrollTo
1010
import com.android.unio.TearDown
11-
import com.android.unio.model.strings.test_tags.InterestsOverlayTestTags
11+
import com.android.unio.model.strings.test_tags.authentication.InterestsOverlayTestTags
1212
import com.android.unio.model.user.Interest
1313
import com.android.unio.ui.authentication.overlay.InterestOverlay
1414
import org.junit.Before

app/src/androidTest/java/com/android/unio/components/authentication/overlay/SocialOverlayTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.compose.ui.test.performClick
77
import androidx.compose.ui.test.performScrollTo
88
import com.android.unio.TearDown
99
import com.android.unio.addNewUserSocial
10-
import com.android.unio.model.strings.test_tags.SocialsOverlayTestTags
10+
import com.android.unio.model.strings.test_tags.authentication.SocialsOverlayTestTags
1111
import com.android.unio.model.user.UserSocial
1212
import com.android.unio.ui.authentication.overlay.SocialOverlay
1313
import org.junit.Before

app/src/androidTest/java/com/android/unio/components/event/EventCardTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import com.android.unio.model.event.EventType
2121
import com.android.unio.model.event.EventViewModel
2222
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
2323
import com.android.unio.model.notification.NotificationWorker
24-
import com.android.unio.model.strings.test_tags.EventCardTestTags
25-
import com.android.unio.model.strings.test_tags.EventDetailsTestTags
24+
import com.android.unio.model.strings.test_tags.event.EventCardTestTags
25+
import com.android.unio.model.strings.test_tags.event.EventDetailsTestTags
2626
import com.android.unio.model.user.UserRepositoryFirestore
2727
import com.android.unio.model.user.UserViewModel
2828
import com.android.unio.ui.event.EventCard

app/src/androidTest/java/com/android/unio/components/event/EventCreationTest.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import com.android.unio.model.map.nominatim.NominatimLocationSearchViewModel
2828
import com.android.unio.model.search.SearchRepository
2929
import com.android.unio.model.search.SearchViewModel
3030
import com.android.unio.model.strings.TextLengthSamples
31-
import com.android.unio.model.strings.test_tags.EventCreationOverlayTestTags
32-
import com.android.unio.model.strings.test_tags.EventCreationTestTags
31+
import com.android.unio.model.strings.test_tags.event.EventCreationOverlayTestTags
32+
import com.android.unio.model.strings.test_tags.event.EventCreationTestTags
3333
import com.android.unio.ui.event.EventCreationScreen
3434
import com.android.unio.ui.navigation.NavigationAction
3535
import com.google.firebase.Firebase
@@ -347,7 +347,8 @@ class EventCreationTest : TearDown() {
347347
composeTestRule
348348
.onNodeWithTag(EventCreationTestTags.LOCATION, useUnmergedTree = true)
349349
.assertTextEquals(
350-
"Test Road, 123, 12345 Test City, Test State, Test Country", includeEditableText = true)
350+
"Test Road, 123, 12345, Test City, Test State, Test Country",
351+
includeEditableText = true)
351352

352353
server.shutdown()
353354
}

app/src/androidTest/java/com/android/unio/components/event/EventDetailsTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.android.unio.model.event.EventViewModel
2222
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
2323
import com.android.unio.model.map.MapViewModel
2424
import com.android.unio.model.strings.FormatStrings.DAY_MONTH_FORMAT
25-
import com.android.unio.model.strings.test_tags.EventDetailsTestTags
25+
import com.android.unio.model.strings.test_tags.event.EventDetailsTestTags
2626
import com.android.unio.model.user.User
2727
import com.android.unio.model.user.UserRepositoryFirestore
2828
import com.android.unio.model.user.UserViewModel

app/src/androidTest/java/com/android/unio/components/event/EventEditTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.android.unio.model.map.nominatim.NominatimLocationRepository
2525
import com.android.unio.model.map.nominatim.NominatimLocationSearchViewModel
2626
import com.android.unio.model.search.SearchRepository
2727
import com.android.unio.model.search.SearchViewModel
28-
import com.android.unio.model.strings.test_tags.EventEditTestTags
28+
import com.android.unio.model.strings.test_tags.event.EventEditTestTags
2929
import com.android.unio.ui.event.EventEditScreen
3030
import com.android.unio.ui.navigation.NavigationAction
3131
import com.google.firebase.Firebase

app/src/androidTest/java/com/android/unio/components/explore/ExploreScreenTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import com.android.unio.model.follow.ConcurrentAssociationUserRepositoryFirestor
1818
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
1919
import com.android.unio.model.search.SearchRepository
2020
import com.android.unio.model.search.SearchViewModel
21-
import com.android.unio.model.strings.test_tags.ExploreContentTestTags
22-
import com.android.unio.model.strings.test_tags.ExploreTestTags
21+
import com.android.unio.model.strings.test_tags.explore.ExploreContentTestTags
22+
import com.android.unio.model.strings.test_tags.explore.ExploreTestTags
2323
import com.android.unio.ui.explore.ExploreScreen
2424
import com.android.unio.ui.explore.getFilteredAssociationsByAlphabeticalOrder
2525
import com.android.unio.ui.explore.getSortedEntriesAssociationsByCategory

app/src/androidTest/java/com/android/unio/components/home/HomeTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.android.unio.model.hilt.module.FirebaseModule
2323
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
2424
import com.android.unio.model.search.SearchRepository
2525
import com.android.unio.model.search.SearchViewModel
26-
import com.android.unio.model.strings.test_tags.HomeTestTags
26+
import com.android.unio.model.strings.test_tags.home.HomeTestTags
2727
import com.android.unio.model.user.User
2828
import com.android.unio.model.user.UserRepositoryFirestore
2929
import com.android.unio.model.user.UserViewModel

app/src/androidTest/java/com/android/unio/components/map/MapScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import com.android.unio.model.event.EventRepositoryFirestore
1717
import com.android.unio.model.event.EventViewModel
1818
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
1919
import com.android.unio.model.map.MapViewModel
20-
import com.android.unio.model.strings.test_tags.MapTestTags
20+
import com.android.unio.model.strings.test_tags.map.MapTestTags
2121
import com.android.unio.model.user.User
2222
import com.android.unio.model.user.UserRepositoryFirestore
2323
import com.android.unio.model.user.UserViewModel

app/src/androidTest/java/com/android/unio/components/saved/SavedTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.android.unio.model.event.Event
1212
import com.android.unio.model.event.EventRepositoryFirestore
1313
import com.android.unio.model.event.EventViewModel
1414
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
15-
import com.android.unio.model.strings.test_tags.SavedTestTags
15+
import com.android.unio.model.strings.test_tags.saved.SavedTestTags
1616
import com.android.unio.model.user.UserRepositoryFirestore
1717
import com.android.unio.model.user.UserViewModel
1818
import com.android.unio.ui.navigation.NavigationAction

app/src/androidTest/java/com/android/unio/components/settings/SettingsTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.android.unio.mocks.user.MockUser
88
import com.android.unio.model.authentication.AuthViewModel
99
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
1010
import com.android.unio.model.preferences.AppPreferences
11-
import com.android.unio.model.strings.test_tags.SettingsTestTags
11+
import com.android.unio.model.strings.test_tags.settings.SettingsTestTags
1212
import com.android.unio.model.user.UserRepositoryFirestore
1313
import com.android.unio.model.user.UserViewModel
1414
import com.android.unio.ui.navigation.NavigationAction

app/src/androidTest/java/com/android/unio/components/user/UserClaimAssociationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import com.android.unio.model.follow.ConcurrentAssociationUserRepositoryFirestor
1313
import com.android.unio.model.image.ImageRepositoryFirebaseStorage
1414
import com.android.unio.model.search.SearchRepository
1515
import com.android.unio.model.search.SearchViewModel
16-
import com.android.unio.model.strings.test_tags.UserClaimAssociationTestTags
16+
import com.android.unio.model.strings.test_tags.user.UserClaimAssociationTestTags
1717
import com.android.unio.ui.navigation.NavigationAction
1818
import com.android.unio.ui.user.UserClaimAssociationScreen
1919
import dagger.hilt.android.testing.HiltAndroidRule

app/src/androidTest/java/com/android/unio/components/user/UserProfileEditionTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import com.android.unio.addNewUserSocial
1717
import com.android.unio.assertDisplayComponentInScroll
1818
import com.android.unio.mocks.user.MockUser
1919
import com.android.unio.model.strings.TextLengthSamples
20-
import com.android.unio.model.strings.test_tags.InterestsOverlayTestTags
21-
import com.android.unio.model.strings.test_tags.SocialsOverlayTestTags
22-
import com.android.unio.model.strings.test_tags.UserEditionTestTags
20+
import com.android.unio.model.strings.test_tags.authentication.InterestsOverlayTestTags
21+
import com.android.unio.model.strings.test_tags.authentication.SocialsOverlayTestTags
22+
import com.android.unio.model.strings.test_tags.user.UserEditionTestTags
2323
import com.android.unio.model.user.User
2424
import com.android.unio.ui.navigation.NavigationAction
2525
import com.android.unio.ui.navigation.Screen

app/src/androidTest/java/com/android/unio/components/user/UserProfileTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.android.unio.TearDown
99
import com.android.unio.mocks.user.MockUser
1010
import com.android.unio.model.search.SearchRepository
1111
import com.android.unio.model.search.SearchViewModel
12-
import com.android.unio.model.strings.test_tags.UserProfileTestTags
12+
import com.android.unio.model.strings.test_tags.user.UserProfileTestTags
1313
import com.android.unio.ui.navigation.NavigationAction
1414
import com.android.unio.ui.user.UserProfileBottomSheet
1515
import com.android.unio.ui.user.UserProfileScreenScaffold

app/src/androidTest/java/com/android/unio/end2end/AssociationProfileE2ETest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import androidx.compose.ui.test.onNodeWithText
77
import androidx.compose.ui.test.performClick
88
import androidx.test.filters.LargeTest
99
import com.android.unio.assertDisplayComponentInScroll
10-
import com.android.unio.model.strings.test_tags.AssociationProfileTestTags
11-
import com.android.unio.model.strings.test_tags.BottomNavBarTestTags
12-
import com.android.unio.model.strings.test_tags.ExploreTestTags
13-
import com.android.unio.model.strings.test_tags.HomeTestTags
14-
import com.android.unio.model.strings.test_tags.SomeoneElseUserProfileTestTags
10+
import com.android.unio.model.strings.test_tags.association.AssociationProfileTestTags
11+
import com.android.unio.model.strings.test_tags.explore.ExploreTestTags
12+
import com.android.unio.model.strings.test_tags.home.HomeTestTags
13+
import com.android.unio.model.strings.test_tags.navigation.BottomNavBarTestTags
14+
import com.android.unio.model.strings.test_tags.user.SomeoneElseUserProfileTestTags
1515
import dagger.hilt.android.testing.HiltAndroidTest
1616
import org.junit.Test
1717

app/src/androidTest/java/com/android/unio/end2end/ClaimAdminRightsTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import androidx.compose.ui.test.onNodeWithTag
66
import androidx.compose.ui.test.performClick
77
import androidx.compose.ui.test.performTextInput
88
import androidx.test.filters.LargeTest
9-
import com.android.unio.model.strings.test_tags.BottomNavBarTestTags
10-
import com.android.unio.model.strings.test_tags.ExploreContentTestTags
11-
import com.android.unio.model.strings.test_tags.HomeTestTags
12-
import com.android.unio.model.strings.test_tags.UserClaimAssociationPresidentialRightsTestTags
13-
import com.android.unio.model.strings.test_tags.UserProfileTestTags
9+
import com.android.unio.model.strings.test_tags.explore.ExploreContentTestTags
10+
import com.android.unio.model.strings.test_tags.home.HomeTestTags
11+
import com.android.unio.model.strings.test_tags.navigation.BottomNavBarTestTags
12+
import com.android.unio.model.strings.test_tags.user.UserClaimAssociationPresidentialRightsTestTags
13+
import com.android.unio.model.strings.test_tags.user.UserProfileTestTags
1414
import com.google.firebase.Firebase
1515
import com.google.firebase.firestore.firestore
1616
import dagger.hilt.android.testing.HiltAndroidTest

app/src/androidTest/java/com/android/unio/end2end/EditUserDetailsTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import androidx.compose.ui.test.performTextClearance
1010
import androidx.compose.ui.test.performTextInput
1111
import androidx.test.filters.LargeTest
1212
import com.android.unio.addNewUserSocial
13-
import com.android.unio.model.strings.test_tags.BottomNavBarTestTags
14-
import com.android.unio.model.strings.test_tags.HomeTestTags
15-
import com.android.unio.model.strings.test_tags.InterestsOverlayTestTags
16-
import com.android.unio.model.strings.test_tags.SocialsOverlayTestTags
17-
import com.android.unio.model.strings.test_tags.UserEditionTestTags
18-
import com.android.unio.model.strings.test_tags.UserProfileTestTags
13+
import com.android.unio.model.strings.test_tags.authentication.InterestsOverlayTestTags
14+
import com.android.unio.model.strings.test_tags.authentication.SocialsOverlayTestTags
15+
import com.android.unio.model.strings.test_tags.home.HomeTestTags
16+
import com.android.unio.model.strings.test_tags.navigation.BottomNavBarTestTags
17+
import com.android.unio.model.strings.test_tags.user.UserEditionTestTags
18+
import com.android.unio.model.strings.test_tags.user.UserProfileTestTags
1919
import dagger.hilt.android.testing.HiltAndroidTest
2020
import org.junit.Test
2121

app/src/androidTest/java/com/android/unio/end2end/EndToEndTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import androidx.compose.ui.test.performTextInput
1010
import com.android.unio.MainActivity
1111
import com.android.unio.clearTest
1212
import com.android.unio.model.authentication.currentAuthStateListenerCount
13-
import com.android.unio.model.strings.test_tags.BottomNavBarTestTags
14-
import com.android.unio.model.strings.test_tags.UserProfileTestTags
15-
import com.android.unio.model.strings.test_tags.WelcomeTestTags
13+
import com.android.unio.model.strings.test_tags.authentication.WelcomeTestTags
14+
import com.android.unio.model.strings.test_tags.navigation.BottomNavBarTestTags
15+
import com.android.unio.model.strings.test_tags.user.UserProfileTestTags
1616
import com.google.firebase.Firebase
1717
import com.google.firebase.auth.auth
1818
import com.google.firebase.firestore.firestore

0 commit comments

Comments
 (0)