From c2177beb139caa0ff34cad7c2d476304fbe31a4d Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:30:35 +0100 Subject: [PATCH] Rename testtags module --- .../android/x/features/login/changeserver/ChangeServerView.kt | 4 ++-- .../element/android/x/features/login/root/LoginRootScreen.kt | 4 ++-- .../element/android/x/features/onboarding/OnBoardingScreen.kt | 4 ++-- libraries/testtags/build.gradle.kts | 2 +- .../io/element/android/{x => }/libraries/testtags/Compose.kt | 3 ++- .../io/element/android/{x => }/libraries/testtags/TestTags.kt | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) rename libraries/testtags/src/main/kotlin/io/element/android/{x => }/libraries/testtags/Compose.kt (91%) rename libraries/testtags/src/main/kotlin/io/element/android/{x => }/libraries/testtags/TestTags.kt (96%) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt index 56d54b44d7..8e7a98f919 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt @@ -57,8 +57,8 @@ import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.VectorIcon import io.element.android.x.features.login.R import io.element.android.x.features.login.error.changeServerError -import io.element.android.x.libraries.testtags.TestTags -import io.element.android.x.libraries.testtags.testTag +import io.element.android.libraries.testtags.TestTags +import io.element.android.libraries.testtags.testTag @Composable fun ChangeServerView( diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt index 671b58ac32..306fc593c2 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt @@ -60,8 +60,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.element.android.libraries.core.compose.textFieldState import io.element.android.x.features.login.error.loginError -import io.element.android.x.libraries.testtags.TestTags -import io.element.android.x.libraries.testtags.testTag +import io.element.android.libraries.testtags.TestTags +import io.element.android.libraries.testtags.testTag import io.element.android.libraries.matrix.core.SessionId import io.element.android.x.ui.strings.R as StringR diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt index 634ce740be..8af5c68c3c 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/OnBoardingScreen.kt @@ -50,8 +50,8 @@ import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.rememberPagerState import io.element.android.libraries.designsystem.components.VectorButton -import io.element.android.x.libraries.testtags.TestTags -import io.element.android.x.libraries.testtags.testTag +import io.element.android.libraries.testtags.TestTags +import io.element.android.libraries.testtags.testTag import kotlinx.coroutines.delay import kotlinx.coroutines.launch import io.element.android.x.ui.strings.R as StringR diff --git a/libraries/testtags/build.gradle.kts b/libraries/testtags/build.gradle.kts index 21e6f2a384..88ad19677c 100644 --- a/libraries/testtags/build.gradle.kts +++ b/libraries/testtags/build.gradle.kts @@ -19,5 +19,5 @@ plugins { } android { - namespace = "io.element.android.x.libraries.testtags" + namespace = "io.element.android.libraries.testtags" } diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt similarity index 91% rename from libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt rename to libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt index 5d75a31674..5a2d8fee19 100644 --- a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/Compose.kt +++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt @@ -14,13 +14,14 @@ * limitations under the License. */ -package io.element.android.x.libraries.testtags +package io.element.android.libraries.testtags import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag import androidx.compose.ui.semantics.testTagsAsResourceId +import io.element.android.libraries.testtags.TestTag /** * Add a testTag to a Modifier, to be used by external tool, like TrafficLight for instance. diff --git a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt similarity index 96% rename from libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt rename to libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt index 1e96c61373..a254a636ef 100644 --- a/libraries/testtags/src/main/kotlin/io/element/android/x/libraries/testtags/TestTags.kt +++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.x.libraries.testtags +package io.element.android.libraries.testtags @JvmInline value class TestTag internal constructor(val value: String)