diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 772df369b8..e1c9205473 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -11,7 +11,7 @@ jobs: - run: | npm install --save-dev @babel/plugin-transform-flow-strip-types - name: Danger - uses: danger/danger-js@11.3.0 + uses: danger/danger-js@11.3.1 with: args: "--dangerfile ./tools/danger/dangerfile.js" env: diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index c9d2ea7d18..280e6ba080 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -60,7 +60,7 @@ jobs: yarn add danger-plugin-lint-report --dev - name: Danger lint if: always() - uses: danger/danger-js@11.3.0 + uses: danger/danger-js@11.3.1 with: args: "--dangerfile ./tools/danger/dangerfile-lint.js" env: diff --git a/.github/workflows/sync-localazy.yml b/.github/workflows/sync-localazy.yml index f3acb4675b..7331d750bd 100644 --- a/.github/workflows/sync-localazy.yml +++ b/.github/workflows/sync-localazy.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Setup Localazy diff --git a/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt b/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt index b567395c1e..96febc3751 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt @@ -34,6 +34,8 @@ class IntentResolver @Inject constructor( private val oidcIntentResolver: OidcIntentResolver ) { fun resolve(intent: Intent): ResolvedIntent? { + if (intent.canBeIgnored()) return null + val deepLinkData = deeplinkParser.getFromIntent(intent) if (deepLinkData != null) return ResolvedIntent.Navigation(deepLinkData) @@ -45,3 +47,8 @@ class IntentResolver @Inject constructor( return null } } + +private fun Intent.canBeIgnored(): Boolean { + return action == Intent.ACTION_MAIN && + categories?.contains(Intent.CATEGORY_LAUNCHER) == true +} diff --git a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt index c2a4bcbd3a..3ad11787df 100644 --- a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt +++ b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt @@ -37,6 +37,17 @@ import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) class IntentResolverTest { + @Test + fun `resolve launcher intent should return null`() { + val sut = createIntentResolver() + val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply { + action = Intent.ACTION_MAIN + addCategory(Intent.CATEGORY_LAUNCHER) + } + val result = sut.resolve(intent) + assertThat(result).isNull() + } + @Test fun `test resolve navigation intent root`() { val sut = createIntentResolver() diff --git a/changelog.d/1950.bugfix b/changelog.d/1950.bugfix new file mode 100644 index 0000000000..2253ca74b8 --- /dev/null +++ b/changelog.d/1950.bugfix @@ -0,0 +1 @@ +Fix rendering of user name with vertical text by clipping the text. diff --git a/features/analytics/api/src/main/res/values-in/values-id/translations.xml b/features/analytics/api/src/main/res/values-in/translations.xml similarity index 100% rename from features/analytics/api/src/main/res/values-in/values-id/translations.xml rename to features/analytics/api/src/main/res/values-in/translations.xml diff --git a/features/analytics/impl/src/main/res/values-in/values-id/translations.xml b/features/analytics/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/analytics/impl/src/main/res/values-in/values-id/translations.xml rename to features/analytics/impl/src/main/res/values-in/translations.xml diff --git a/features/call/src/main/res/values-in/values-id/translations.xml b/features/call/src/main/res/values-in/translations.xml similarity index 100% rename from features/call/src/main/res/values-in/values-id/translations.xml rename to features/call/src/main/res/values-in/translations.xml diff --git a/features/createroom/impl/src/main/res/values-in/values-id/translations.xml b/features/createroom/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/createroom/impl/src/main/res/values-in/values-id/translations.xml rename to features/createroom/impl/src/main/res/values-in/translations.xml diff --git a/features/ftue/impl/src/main/res/values-in/values-id/translations.xml b/features/ftue/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/ftue/impl/src/main/res/values-in/values-id/translations.xml rename to features/ftue/impl/src/main/res/values-in/translations.xml diff --git a/features/invitelist/impl/src/main/res/values-in/values-id/translations.xml b/features/invitelist/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/invitelist/impl/src/main/res/values-in/values-id/translations.xml rename to features/invitelist/impl/src/main/res/values-in/translations.xml diff --git a/features/leaveroom/api/src/main/res/values-in/values-id/translations.xml b/features/leaveroom/api/src/main/res/values-in/translations.xml similarity index 100% rename from features/leaveroom/api/src/main/res/values-in/values-id/translations.xml rename to features/leaveroom/api/src/main/res/values-in/translations.xml diff --git a/features/lockscreen/impl/src/main/res/values-in/values-id/translations.xml b/features/lockscreen/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/lockscreen/impl/src/main/res/values-in/values-id/translations.xml rename to features/lockscreen/impl/src/main/res/values-in/translations.xml diff --git a/features/login/impl/src/main/res/values-in/values-id/translations.xml b/features/login/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/login/impl/src/main/res/values-in/values-id/translations.xml rename to features/login/impl/src/main/res/values-in/translations.xml diff --git a/features/logout/impl/src/main/res/values-in/values-id/translations.xml b/features/logout/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/logout/impl/src/main/res/values-in/values-id/translations.xml rename to features/logout/impl/src/main/res/values-in/translations.xml diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt index 99fb5d3fb7..0a76523016 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt @@ -360,6 +360,7 @@ private fun MessageSenderInformation( Avatar(senderAvatar) Spacer(modifier = Modifier.width(4.dp)) Text( + modifier = Modifier.clipToBounds(), text = sender, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/features/messages/impl/src/main/res/values-in/values-id/translations.xml b/features/messages/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/messages/impl/src/main/res/values-in/values-id/translations.xml rename to features/messages/impl/src/main/res/values-in/translations.xml diff --git a/features/onboarding/impl/src/main/res/values-in/values-id/translations.xml b/features/onboarding/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/onboarding/impl/src/main/res/values-in/values-id/translations.xml rename to features/onboarding/impl/src/main/res/values-in/translations.xml diff --git a/features/poll/impl/src/main/res/values-in/values-id/translations.xml b/features/poll/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/poll/impl/src/main/res/values-in/values-id/translations.xml rename to features/poll/impl/src/main/res/values-in/translations.xml diff --git a/features/preferences/impl/src/main/res/values-fr/translations.xml b/features/preferences/impl/src/main/res/values-fr/translations.xml index 294843c7e9..dc5e6ff790 100644 --- a/features/preferences/impl/src/main/res/values-fr/translations.xml +++ b/features/preferences/impl/src/main/res/values-fr/translations.xml @@ -31,6 +31,7 @@ Si vous continuez, il est possible que certains de vos paramètres soient modifi "Activer les notifications sur cet appareil" "La configuration n’a pas été corrigée, veuillez réessayer." "Discussions de groupe" + "Invitations" "Votre serveur d’accueil ne supporte pas cette option pour les salons chiffrés, vous pourriez ne pas être notifié(e) dans certains salons." "Mentions" "Tous" diff --git a/features/preferences/impl/src/main/res/values-in/values-id/translations.xml b/features/preferences/impl/src/main/res/values-in/translations.xml similarity index 98% rename from features/preferences/impl/src/main/res/values-in/values-id/translations.xml rename to features/preferences/impl/src/main/res/values-in/translations.xml index 89979aaec2..f33bf54cfb 100644 --- a/features/preferences/impl/src/main/res/values-in/values-id/translations.xml +++ b/features/preferences/impl/src/main/res/values-in/translations.xml @@ -31,6 +31,7 @@ Jika Anda melanjutkan, beberapa pengaturan Anda dapat berubah." "Aktifkan pemberitahuan di perangkat ini" "Pengaturan belum diperbaiki, silakan coba lagi." "Obrolan grup" + "Undangan" "Homeserver Anda tidak mendukung opsi ini dalam ruangan terenkripsi, Anda mungkin tidak diberi tahu dalam beberapa ruangan." "Sebutan" "Semua" diff --git a/features/preferences/impl/src/main/res/values-sk/translations.xml b/features/preferences/impl/src/main/res/values-sk/translations.xml index 0464bf8bee..8171748e1d 100644 --- a/features/preferences/impl/src/main/res/values-sk/translations.xml +++ b/features/preferences/impl/src/main/res/values-sk/translations.xml @@ -31,6 +31,7 @@ Ak budete pokračovať, niektoré z vašich nastavení sa môžu zmeniť.""Povoliť oznámenia na tomto zariadení" "Konfigurácia nebola opravená, skúste to prosím znova." "Skupinové rozhovory" + "Pozvánky" "Váš domovský server nepodporuje túto možnosť v šifrovaných miestnostiach, v niektorých miestnostiach nemusíte dostať upozornenie." "Zmienky" "Všetky" diff --git a/features/rageshake/api/src/main/res/values-in/values-id/translations.xml b/features/rageshake/api/src/main/res/values-in/translations.xml similarity index 100% rename from features/rageshake/api/src/main/res/values-in/values-id/translations.xml rename to features/rageshake/api/src/main/res/values-in/translations.xml diff --git a/features/rageshake/impl/src/main/res/values-in/values-id/translations.xml b/features/rageshake/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/rageshake/impl/src/main/res/values-in/values-id/translations.xml rename to features/rageshake/impl/src/main/res/values-in/translations.xml diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberHeaderSection.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberHeaderSection.kt index 5025f37b65..a5cc975b48 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberHeaderSection.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberHeaderSection.kt @@ -29,13 +29,14 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp +import io.element.android.compound.theme.ElementTheme import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.theme.components.Text -import io.element.android.compound.theme.ElementTheme @Composable fun RoomMemberHeaderSection( @@ -56,7 +57,11 @@ fun RoomMemberHeaderSection( } Spacer(modifier = Modifier.height(24.dp)) if (userName != null) { - Text(text = userName, style = ElementTheme.typography.fontHeadingLgBold) + Text( + modifier = Modifier.clipToBounds(), + text = userName, + style = ElementTheme.typography.fontHeadingLgBold, + ) Spacer(modifier = Modifier.height(6.dp)) } Text( diff --git a/features/roomdetails/impl/src/main/res/values-in/values-id/translations.xml b/features/roomdetails/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/roomdetails/impl/src/main/res/values-in/values-id/translations.xml rename to features/roomdetails/impl/src/main/res/values-in/translations.xml diff --git a/features/roomlist/impl/src/main/res/values-in/values-id/translations.xml b/features/roomlist/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/roomlist/impl/src/main/res/values-in/values-id/translations.xml rename to features/roomlist/impl/src/main/res/values-in/translations.xml diff --git a/features/securebackup/impl/src/main/res/values-in/values-id/translations.xml b/features/securebackup/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/securebackup/impl/src/main/res/values-in/values-id/translations.xml rename to features/securebackup/impl/src/main/res/values-in/translations.xml diff --git a/features/signedout/impl/src/main/res/values-in/values-id/translations.xml b/features/signedout/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/signedout/impl/src/main/res/values-in/values-id/translations.xml rename to features/signedout/impl/src/main/res/values-in/translations.xml diff --git a/features/verifysession/impl/src/main/res/values-in/values-id/translations.xml b/features/verifysession/impl/src/main/res/values-in/translations.xml similarity index 100% rename from features/verifysession/impl/src/main/res/values-in/values-id/translations.xml rename to features/verifysession/impl/src/main/res/values-in/translations.xml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9187a61133..36ca39fab1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,8 @@ [versions] # Project +# Warning: version 8.2.0 is leading https://github.com/vector-im/element-x-android/issues/1971 +# which will only occurs in release mode, and so will not be detected by Maestro android_gradle_plugin = "8.1.4" kotlin = "1.9.20" ksp = "1.9.20-1.0.14" @@ -37,7 +39,7 @@ serialization_json = "1.6.1" showkase = "1.0.2" appyx = "1.4.0" sqldelight = "2.0.1" -wysiwyg = "2.20.0" +wysiwyg = "2.21.0" # DI dagger = "2.49" @@ -59,7 +61,7 @@ android_desugar = "com.android.tools:desugar_jdk_libs:2.0.4" kotlin_gradle_plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } gms_google_services = "com.google.gms:google-services:4.4.0" # https://firebase.google.com/docs/android/setup#available-libraries -google_firebase_bom = "com.google.firebase:firebase-bom:32.6.0" +google_firebase_bom = "com.google.firebase:firebase-bom:32.7.0" firebase_appdistribution_gradle = { module = "com.google.firebase:firebase-appdistribution-gradle", version.ref = "firebaseAppDistribution" } # AndroidX @@ -209,7 +211,7 @@ anvil = { id = "com.squareup.anvil", version.ref = "anvil" } detekt = "io.gitlab.arturbosch.detekt:1.23.4" ktlint = "org.jlleitschuh.gradle.ktlint:12.0.2" dependencygraph = "com.savvasdalkitsis.module-dependency-graph:0.12" -dependencycheck = "org.owasp.dependencycheck:9.0.2" +dependencycheck = "org.owasp.dependencycheck:9.0.4" dependencyanalysis = "com.autonomousapps.dependency-analysis:1.27.0" paparazzi = "app.cash.paparazzi:1.3.1" kover = "org.jetbrains.kotlinx.kover:0.6.1" diff --git a/libraries/androidutils/src/main/res/values-in/values-id/translations.xml b/libraries/androidutils/src/main/res/values-in/translations.xml similarity index 100% rename from libraries/androidutils/src/main/res/values-in/values-id/translations.xml rename to libraries/androidutils/src/main/res/values-in/translations.xml diff --git a/libraries/eventformatter/impl/src/main/res/values-in/values-id/translations.xml b/libraries/eventformatter/impl/src/main/res/values-in/translations.xml similarity index 100% rename from libraries/eventformatter/impl/src/main/res/values-in/values-id/translations.xml rename to libraries/eventformatter/impl/src/main/res/values-in/translations.xml diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt index 9ff9f7d128..8a00be4663 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt @@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp @@ -80,6 +81,7 @@ private fun MatrixUserHeaderContent( ) { // Name Text( + modifier = Modifier.clipToBounds(), text = matrixUser.getBestName(), maxLines = 1, style = ElementTheme.typography.fontHeadingSmMedium, diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt index 650d4d521b..a3199369e2 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt @@ -31,6 +31,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp @@ -62,6 +63,7 @@ fun SelectedUser( ) { Avatar(matrixUser.getAvatarData(size = AvatarSize.SelectedUser)) Text( + modifier = Modifier.clipToBounds(), text = matrixUser.getBestName(), overflow = TextOverflow.Ellipsis, maxLines = 1, diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UserRow.kt index 8cd9b63735..f9eef6b990 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UserRow.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UserRow.kt @@ -25,12 +25,13 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import io.element.android.compound.theme.ElementTheme import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.theme.components.Text -import io.element.android.compound.theme.ElementTheme @Composable internal fun UserRow( @@ -55,6 +56,7 @@ internal fun UserRow( ) { // Name Text( + modifier = Modifier.clipToBounds(), text = name, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/libraries/permissions/api/src/main/res/values-in/values-id/translations.xml b/libraries/permissions/api/src/main/res/values-in/translations.xml similarity index 100% rename from libraries/permissions/api/src/main/res/values-in/values-id/translations.xml rename to libraries/permissions/api/src/main/res/values-in/translations.xml diff --git a/libraries/push/impl/src/main/res/values-in/values-id/translations.xml b/libraries/push/impl/src/main/res/values-in/translations.xml similarity index 100% rename from libraries/push/impl/src/main/res/values-in/values-id/translations.xml rename to libraries/push/impl/src/main/res/values-in/translations.xml diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt index d9b284de6a..b3c87bc602 100644 --- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt +++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt @@ -44,6 +44,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow @@ -551,7 +552,7 @@ private fun ReplyToModeView( ) { Text( text = senderName, - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth().clipToBounds(), style = ElementTheme.typography.fontBodySmMedium, textAlign = TextAlign.Start, color = ElementTheme.materialColors.primary, diff --git a/libraries/textcomposer/impl/src/main/res/values-in/values-id/translations.xml b/libraries/textcomposer/impl/src/main/res/values-in/translations.xml similarity index 100% rename from libraries/textcomposer/impl/src/main/res/values-in/values-id/translations.xml rename to libraries/textcomposer/impl/src/main/res/values-in/translations.xml diff --git a/libraries/ui-strings/src/main/res/values-fr/translations.xml b/libraries/ui-strings/src/main/res/values-fr/translations.xml index 41262611e0..60e4e78c2e 100644 --- a/libraries/ui-strings/src/main/res/values-fr/translations.xml +++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml @@ -95,6 +95,7 @@ "Essayer à nouveau" "Afficher la source" "Oui" + "Voir plus" "À propos" "Politique d’utilisation acceptable" "Paramètres avancés" diff --git a/libraries/ui-strings/src/main/res/values-in/values-id/translations.xml b/libraries/ui-strings/src/main/res/values-in/translations.xml similarity index 99% rename from libraries/ui-strings/src/main/res/values-in/values-id/translations.xml rename to libraries/ui-strings/src/main/res/values-in/translations.xml index 93eb4351a8..f7f05f71f2 100644 --- a/libraries/ui-strings/src/main/res/values-in/values-id/translations.xml +++ b/libraries/ui-strings/src/main/res/values-in/translations.xml @@ -95,6 +95,7 @@ "Coba lagi" "Tampilkan sumber" "Ya" + "Muat lainnya" "Tentang" "Kebijakan penggunaan wajar" "Pengaturan tingkat lanjut" diff --git a/libraries/ui-strings/src/main/res/values-ru/translations.xml b/libraries/ui-strings/src/main/res/values-ru/translations.xml index af4f0f0487..b6576d988c 100644 --- a/libraries/ui-strings/src/main/res/values-ru/translations.xml +++ b/libraries/ui-strings/src/main/res/values-ru/translations.xml @@ -95,6 +95,7 @@ "Повторить попытку" "Показать источник" "Да" + "Загрузить еще" "О приложении" "Политика допустимого использования" "Дополнительные параметры" diff --git a/libraries/ui-strings/src/main/res/values-sk/translations.xml b/libraries/ui-strings/src/main/res/values-sk/translations.xml index cbbadc9c58..9b7db8c032 100644 --- a/libraries/ui-strings/src/main/res/values-sk/translations.xml +++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml @@ -95,6 +95,7 @@ "Skúste to znova" "Zobraziť zdroj" "Áno" + "Načítať viac" "O aplikácii" "Zásady prijateľného používania" "Pokročilé nastavenia" diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml index 638f4634e3..10d3bbd12e 100644 --- a/libraries/ui-strings/src/main/res/values/localazy.xml +++ b/libraries/ui-strings/src/main/res/values/localazy.xml @@ -95,6 +95,7 @@ "Try again" "View source" "Yes" + "Load more" "About" "Acceptable use policy" "Advanced settings" diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerFormatting_null_TextComposerFormatting-Day-1_2_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerFormatting_null_TextComposerFormatting-Day-1_2_null,NEXUS_5,1.0,en].png index 5597d00a90..b1c018b7b2 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerFormatting_null_TextComposerFormatting-Day-1_2_null,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerFormatting_null_TextComposerFormatting-Day-1_2_null,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e84a8f99437d6de1ab8775e449135a27f808ddef5271f9024618ca57a50c44b -size 43184 +oid sha256:afb9bd4fc5d01e408b1b9dfb0b6a2b2d47c3f6605ef9065ae2b50c16d641b26e +size 43147 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerFormatting_null_TextComposerFormatting-Night-1_3_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerFormatting_null_TextComposerFormatting-Night-1_3_null,NEXUS_5,1.0,en].png index 13d75ecb01..523de5a3a2 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerFormatting_null_TextComposerFormatting-Night-1_3_null,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerFormatting_null_TextComposerFormatting-Night-1_3_null,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cf016ba5afe1015ab2ba9359f721f7cde8431aa24af51b55aa35fc13746a3fc -size 40644 +oid sha256:769f171a6891c4414f6571fadc75b00a3c977bd108474750c714f4a53a491bd3 +size 40538 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerSimple_null_TextComposerSimple-Day-0_1_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerSimple_null_TextComposerSimple-Day-0_1_null,NEXUS_5,1.0,en].png index 71296a13fb..487fc50f71 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerSimple_null_TextComposerSimple-Day-0_1_null,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerSimple_null_TextComposerSimple-Day-0_1_null,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f17d7621796f3fdf4e3995ba1d51b30cdf700e7f548140d179edea9e46baa39f -size 48147 +oid sha256:263604e2a52e424fe88fcb28b8c0493405a200bc0f1738d394dce3a63b182a83 +size 47996 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerSimple_null_TextComposerSimple-Night-0_2_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerSimple_null_TextComposerSimple-Night-0_2_null,NEXUS_5,1.0,en].png index 50fe021505..f4a962cb5c 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerSimple_null_TextComposerSimple-Night-0_2_null,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_TextComposerSimple_null_TextComposerSimple-Night-0_2_null,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:978d26cf93122ac0c903d04222ae12caf320038f78aa084639ef8d90f8e4845e -size 45189 +oid sha256:3c304d9a5b4d3ef45281785a67ff7fd0ffc7c8b8cb5975dd50a557a004cb993f +size 45109 diff --git a/tools/localazy/downloadStrings.sh b/tools/localazy/downloadStrings.sh index 95ec7c5c13..c4a97868af 100755 --- a/tools/localazy/downloadStrings.sh +++ b/tools/localazy/downloadStrings.sh @@ -46,9 +46,12 @@ if [[ $allFiles == 1 ]]; then find . -name 'translations.xml' -print0 -exec bash -c "echo \"\" >> \"{}\"" \; >> /dev/null fi -echo "Renaming all the folders values-id to values-in..." set +e -find . -type d -name 'values-id' -execdir mv {} values-in 2> /dev/null \; +echo "Moving files from values-id to values-in..." +find . -type d -name 'values-id' -execdir mv {}/translations.xml {}/../values-in/translations.xml 2> /dev/null \; + +echo "Deleting all the folders values-id..." +find . -type d -name 'values-id' -exec rm -rf {} 2> /dev/null \; set -e echo "Removing the generated config"