From d7b4cb97a7fbf757c7934537b8fe0cc4c9b7e24c Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Jan 2023 17:42:09 +0100 Subject: [PATCH] Rename uistrings module --- .../io/element/android/x/features/login/error/ErrorFormatter.kt | 2 +- .../io/element/android/x/features/login/root/LoginRootScreen.kt | 2 +- .../element/android/x/features/logout/LogoutPreferenceScreen.kt | 2 +- .../element/android/x/features/onboarding/OnBoardingScreen.kt | 2 +- .../android/x/features/onboarding/SplashCarouselStateFactory.kt | 2 +- .../android/x/features/preferences/root/PreferencesRootView.kt | 2 +- .../android/x/features/rageshake/bugreport/BugReportView.kt | 2 +- .../x/features/rageshake/crash/ui/CrashDetectionScreen.kt | 2 +- .../x/features/rageshake/detection/RageshakeDetectionView.kt | 2 +- .../features/rageshake/preferences/RageshakePreferencesView.kt | 2 +- .../android/x/features/roomlist/components/RoomListTopBar.kt | 2 +- .../designsystem/components/dialogs/ConfirmationDialog.kt | 2 +- .../libraries/designsystem/components/dialogs/ErrorDialog.kt | 2 +- .../android/libraries/textcomposer/RichTextComposerLayout.kt | 2 +- .../io/element/android/libraries/textcomposer/TextComposer.kt | 2 +- libraries/ui-strings/build.gradle.kts | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt b/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt index f708f712a6..eb90f40936 100644 --- a/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt +++ b/features/login/src/main/kotlin/io/element/android/x/features/login/error/ErrorFormatter.kt @@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import io.element.android.libraries.core.uri.isValidUrl import io.element.android.x.features.login.root.LoginFormState -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun loginError( 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 306fc593c2..31030f56f1 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 @@ -63,7 +63,7 @@ import io.element.android.x.features.login.error.loginError 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 +import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt index 147e890200..e7bc9d3f7f 100644 --- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt +++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt @@ -29,7 +29,7 @@ import io.element.android.libraries.designsystem.components.ProgressDialog import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory import io.element.android.libraries.designsystem.components.preferences.PreferenceText -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun LogoutPreferenceView( 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 8af5c68c3c..be5b4f646a 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 @@ -54,7 +54,7 @@ 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 +import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalPagerApi::class) @Composable diff --git a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt index c25fb89815..681eb09466 100644 --- a/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt +++ b/features/onboarding/src/main/kotlin/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt @@ -17,7 +17,7 @@ package io.element.android.x.features.onboarding import androidx.annotation.DrawableRes -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR class SplashCarouselStateFactory { fun create(): SplashCarouselState { diff --git a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt index d632c1cf87..c467aa15bb 100644 --- a/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt +++ b/features/preferences/src/main/kotlin/io/element/android/x/features/preferences/root/PreferencesRootView.kt @@ -27,7 +27,7 @@ import io.element.android.x.features.logout.LogoutPreferenceView import io.element.android.x.features.preferences.user.UserPreferences import io.element.android.x.features.rageshake.preferences.RageshakePreferencesState import io.element.android.x.features.rageshake.preferences.RageshakePreferencesView -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun PreferencesRootView( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt index 51ec736ffd..945661d6b0 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt @@ -55,7 +55,7 @@ import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.LabelledCheckbox import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt index 578f0eb877..bcde245e0a 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun CrashDetectionView( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt index f2d208e359..e376d7cbcf 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt @@ -29,7 +29,7 @@ import io.element.android.libraries.core.hardware.vibrate import io.element.android.libraries.core.screenshot.ImageResult import io.element.android.libraries.core.screenshot.screenshot import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun RageshakeDetectionView( diff --git a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt index 83e95a52d9..d1c9c201f2 100644 --- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt +++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt @@ -27,7 +27,7 @@ import io.element.android.libraries.designsystem.components.preferences.Preferen import io.element.android.libraries.designsystem.components.preferences.PreferenceSlide import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch import io.element.android.libraries.designsystem.components.preferences.PreferenceText -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun RageshakePreferencesView( diff --git a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt index 096c00a910..79f14fd3f8 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/components/RoomListTopBar.kt @@ -56,7 +56,7 @@ import io.element.android.libraries.core.compose.LogCompositions import io.element.android.libraries.core.compose.textFieldState import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.matrix.ui.model.MatrixUser -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun RoomListTopBar( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt index e5e793a703..6059b6b998 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt @@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun ConfirmationDialog( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt index 22f8624dad..99e473fdbd 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun ErrorDialog( diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt index fbad3680ca..f58e0634eb 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt @@ -51,7 +51,7 @@ import io.element.android.libraries.textcomposer.tools.setTextIfDifferent import uniffi.wysiwyg_composer.ActionState import uniffi.wysiwyg_composer.ComposerAction import io.element.android.x.element.resources.R as ElementR -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR // Imported from Element Android class RichTextComposerLayout @JvmOverloads constructor( diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt index 6d40cdaa5f..930b5d6f77 100644 --- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt +++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt @@ -33,7 +33,7 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView import androidx.core.view.isInvisible import androidx.core.view.isVisible -import io.element.android.x.ui.strings.R as StringR +import io.element.android.libraries.ui.strings.R as StringR @Composable fun TextComposer( diff --git a/libraries/ui-strings/build.gradle.kts b/libraries/ui-strings/build.gradle.kts index dc4693ad7f..33dc7d6ba6 100644 --- a/libraries/ui-strings/build.gradle.kts +++ b/libraries/ui-strings/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } android { - namespace = "io.element.android.x.ui.strings" + namespace = "io.element.android.libraries.ui.strings" } // forcing the stem string template generator to be cacheable, without this the templates