Merge branch 'develop' into feature/fga/some_room_related_fixes

libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ErrorFlow.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.core.coroutine
+
+import kotlinx.coroutines.flow.flow
+
+/** Create a Flow emitting a single error event. It should be useful for tests. */
+fun <T> errorFlow(throwable: Throwable) = flow<T> { throw throwable }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt

@@ -41,7 +41,11 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import timber.log.Timber
 
 @Composable
-fun Avatar(avatarData: AvatarData, modifier: Modifier = Modifier) {
+fun Avatar(
+    avatarData: AvatarData,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
     val commonModifier = modifier
         .size(avatarData.size.dp)
         .clip(CircleShape)
@@ -54,6 +58,7 @@ fun Avatar(avatarData: AvatarData, modifier: Modifier = Modifier) {
         ImageAvatar(
             avatarData = avatarData,
             modifier = commonModifier,
+            contentDescription = contentDescription,
         )
     }
 }
@@ -62,13 +67,14 @@ fun Avatar(avatarData: AvatarData, modifier: Modifier = Modifier) {
 private fun ImageAvatar(
     avatarData: AvatarData,
     modifier: Modifier = Modifier,
+    contentDescription: String? = null,
 ) {
     AsyncImage(
         model = avatarData,
         onError = {
             Timber.e("TAG", "Error $it\n${it.result}", it.result.throwable)
         },
-        contentDescription = null,
+        contentDescription = contentDescription,
         contentScale = ContentScale.Crop,
         placeholder = debugPlaceholderAvatar(),
         modifier = modifier
@@ -89,7 +95,7 @@ private fun InitialsAvatar(
         end = Offset(100f, 0f)
     )
     Box(
-        modifier.background(brush = initialsGradient)
+        modifier.background(brush = initialsGradient),
     ) {
         Text(
             modifier = Modifier.align(Alignment.Center),

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.designsystem.modifiers
+
+import android.annotation.SuppressLint
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.platform.debugInspectorInfo
+
+/**
+ * Applies the [ifTrue] modifier when the [condition] is true, [ifFalse] otherwise.
+ */
+@SuppressLint("UnnecessaryComposedModifier") // It's actually necessary due to the `@Composable` lambdas
+fun Modifier.applyIf(
+    condition: Boolean,
+    ifTrue: @Composable Modifier.() -> Modifier,
+    ifFalse: @Composable (Modifier.() -> Modifier)? = null
+): Modifier =
+    composed(
+        inspectorInfo = debugInspectorInfo {
+            name = "applyIf"
+            value = condition
+        }
+    ) {
+        when {
+            condition -> then(ifTrue(Modifier))
+            ifFalse != null -> then(ifFalse(Modifier))
+            else -> this
+        }
+    }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/CircularReveal.kt

@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.designsystem.modifiers
+
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.runtime.State
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.draw.drawWithCache
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.clipPath
+import androidx.compose.ui.platform.debugInspectorInfo
+import kotlin.math.sqrt
+
+// Note: these modifiers come from https://gist.github.com/darvld/eb3844474baf2f3fc6d3ab44a4b4b5f8
+
+/**
+ *  A modifier that clips the composable content using an animated circle. The circle will
+ *  expand/shrink with an animation whenever [visible] changes.
+ *
+ *  For more fine-grained control over the transition, see this method's overload, which allows passing
+ *  a [State] object to control the progress of the reveal animation.
+ *
+ *  By default, the circle is centered in the content, but custom positions may be specified using
+ *  [revealFrom]. Specified offsets should be between 0 (left/top) and 1 (right/bottom).*/
+fun Modifier.circularReveal(
+    visible: Boolean,
+    showScrim: Boolean = false,
+    revealFrom: Offset = Offset(0.5f, 0.5f),
+): Modifier = composed(
+    factory = {
+        val factor = updateTransition(visible, label = "Visibility")
+            .animateFloat(label = "revealFactor") { if (it) 1f else 0f }
+
+        circularReveal(factor, showScrim, revealFrom)
+    },
+    inspectorInfo = debugInspectorInfo {
+        name = "circularReveal"
+        properties["visible"] = visible
+        properties["revealFrom"] = revealFrom
+    }
+)
+
+/**
+ * A modifier that clips the composable content using a circular shape. The radius of the circle
+ * will be determined by the [transitionProgress].
+ *
+ * The values of the progress should be between 0 and 1.
+ *
+ * By default, the circle is centered in the content, but custom positions may be specified using
+ *  [revealFrom]. Specified offsets should be between 0 (left/top) and 1 (right/bottom).
+ *  */
+fun Modifier.circularReveal(
+    transitionProgress: State<Float>,
+    showScrim: Boolean = false,
+    revealFrom: Offset = Offset(0.5f, 0.5f)
+): Modifier {
+    return drawWithCache {
+        val path = Path()
+        val center = revealFrom.mapTo(size)
+        val radius = calculateRadius(revealFrom, size)
+        val scrimColor = if (showScrim)
+            Color.Gray
+        else
+            Color.Transparent
+
+        path.addOval(Rect(center, radius * transitionProgress.value))
+
+        onDrawWithContent {
+            if (showScrim) {
+                drawRect(scrimColor, alpha = transitionProgress.value * 0.75f)
+            }
+            clipPath(path) { this@onDrawWithContent.drawContent() }
+        }
+    }
+}
+
+private fun Offset.mapTo(size: Size): Offset {
+    return Offset(x * size.width, y * size.height)
+}
+
+private fun calculateRadius(normalizedOrigin: Offset, size: Size) = with(normalizedOrigin) {
+    val x = (if (x > 0.5f) x else 1 - x) * size.width
+    val y = (if (y > 0.5f) y else 1 - y) * size.height
+
+    sqrt(x * x + y * y)
+}

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/WindowInsetsExtension.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.designsystem.utils
+
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalLayoutDirection
+
+@Composable
+fun WindowInsets.copy(
+    top: Int? = null,
+    right: Int? = null,
+    bottom: Int? = null,
+    left: Int? = null
+): WindowInsets {
+    val density = LocalDensity.current
+    val direction = LocalLayoutDirection.current
+    return WindowInsets(
+        top = top ?: this.getTop(density),
+        right = right ?: this.getRight(density, direction),
+        bottom = bottom ?: this.getBottom(density),
+        left = left ?: this.getLeft(density, direction)
+    )
+}

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt

@@ -68,6 +68,10 @@ interface MatrixRoom : Closeable {
 
     suspend fun redactEvent(eventId: EventId, reason: String? = null): Result<Unit>
 
+    suspend fun ignoreUser(userId: UserId): Result<Unit>
+
+    suspend fun unignoreUser(userId: UserId): Result<Unit>
+
     suspend fun leave(): Result<Unit>
 
     suspend fun acceptInvitation(): Result<Unit>

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt

@@ -38,6 +38,7 @@ import org.matrix.rustcomponents.sdk.SlidingSyncRoom
 import org.matrix.rustcomponents.sdk.UpdateSummary
 import org.matrix.rustcomponents.sdk.genTransactionId
 import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdown
+import org.matrix.rustcomponents.sdk.RoomMember as RustRoomMember
 
 class RustMatrixRoom(
     override val sessionId: SessionId,
@@ -53,6 +54,16 @@ class RustMatrixRoom(
 
     private var _membersStateFlow = MutableStateFlow<MatrixRoomMembersState>(MatrixRoomMembersState.Unknown)
 
+    private val timeline by lazy {
+        RustMatrixTimeline(
+            matrixRoom = this,
+            innerRoom = innerRoom,
+            slidingSyncRoom = slidingSyncRoom,
+            coroutineScope = coroutineScope,
+            coroutineDispatchers = coroutineDispatchers
+        )
+    }
+
     override fun syncUpdateFlow(): Flow<Long> {
         return slidingSyncUpdateFlow
             .filter {
@@ -65,13 +76,7 @@ class RustMatrixRoom(
     }
 
     override fun timeline(): MatrixTimeline {
-        return RustMatrixTimeline(
-            matrixRoom = this,
-            innerRoom = innerRoom,
-            slidingSyncRoom = slidingSyncRoom,
-            coroutineScope = coroutineScope,
-            coroutineDispatchers = coroutineDispatchers
-        )
+        return timeline
     }
 
     override fun close() {
@@ -125,11 +130,11 @@ class RustMatrixRoom(
         _membersStateFlow.value = MatrixRoomMembersState.Pending
         runCatching {
             innerRoom.members().map(RoomMemberMapper::map)
-        }.onSuccess {
+        }.map {
             _membersStateFlow.value = MatrixRoomMembersState.Ready(it)
         }.onFailure {
             _membersStateFlow.value = MatrixRoomMembersState.Error(it)
-        }.map { }
+        }
     }
 
     override suspend fun userDisplayName(userId: UserId): Result<String?> =
@@ -195,4 +200,19 @@ class RustMatrixRoom(
         }
     }
 
+    override suspend fun ignoreUser(userId: UserId): Result<Unit> {
+        return runCatching {
+            getRustMember(userId)?.ignore() ?: error("No member with userId $userId exists in room $roomId")
+        }
+    }
+
+    override suspend fun unignoreUser(userId: UserId): Result<Unit> {
+        return runCatching {
+            getRustMember(userId)?.unignore() ?: error("No member with userId $userId exists in room $roomId")
+        }
+    }
+
+    private fun getRustMember(userId: UserId): RustRoomMember? {
+        return innerRoom.members().find { it.userId() == userId.value }
+    }
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustMatrixTimeline.kt

@@ -151,9 +151,9 @@ class RustMatrixTimeline(
                 requiredState = listOf(
                     RequiredState(key = "m.room.canonical_alias", value = ""),
                     RequiredState(key = "m.room.topic", value = ""),
-                    RequiredState(key = "m.room.name", value = ""),
-                    RequiredState(key = "m.room.join_rule", value = ""),
+                    RequiredState(key = "m.room.join_rules", value = ""),
                 ),
+                //TODO allow configuration
                 timelineLimit = 20.toUInt()
             )
             val result = slidingSyncRoom.subscribeAndAddTimelineListener(timelineListener, settings)

libraries/matrix/test/build.gradle.kts

@@ -23,6 +23,7 @@ android {
 }
 
 dependencies {
+    api(projects.libraries.core)
     api(projects.libraries.matrix.api)
     api(libs.coroutines.core)
 }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt

@@ -22,7 +22,6 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
-import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
@@ -48,6 +47,8 @@ class FakeMatrixRoom(
     private val matrixTimeline: MatrixTimeline = FakeMatrixTimeline(),
 ) : MatrixRoom {
 
+    private var ignoreResult: Result<Unit> = Result.success(Unit)
+    private var unignoreResult: Result<Unit> = Result.success(Unit)
     private var userDisplayNameResult = Result.success<String?>(null)
     private var userAvatarUrlResult = Result.success<String?>(null)
     private var updateMembersResult: Result<Unit> = Result.success(Unit)
@@ -116,6 +117,10 @@ class FakeMatrixRoom(
         return Result.success(Unit)
     }
 
+    override suspend fun ignoreUser(userId: UserId): Result<Unit> = ignoreResult
+
+    override suspend fun unignoreUser(userId: UserId): Result<Unit> = unignoreResult
+
     override suspend fun leave(): Result<Unit> = leaveRoomError?.let { Result.failure(it) } ?: Result.success(Unit)
     override suspend fun acceptInvitation(): Result<Unit> {
         isInviteAccepted = true
@@ -157,4 +162,11 @@ class FakeMatrixRoom(
         rejectInviteResult = result
     }
 
+    fun givenIgnoreResult(result: Result<Unit>) {
+        ignoreResult = result
+    }
+
+    fun givenUnIgnoreResult(result: Result<Unit>) {
+        unignoreResult = result
+    }
 }

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt

@@ -119,7 +119,7 @@ private fun NotificationData?.orDefault(roomId: RoomId, eventId: EventId): Notif
                 isRemote = false,
                 localSendState = null,
                 reactions = emptyList(),
-                sender = UserId(""),
+                sender = UserId("@user:domain"),
                 senderProfile = ProfileTimelineDetails.Unavailable,
                 timestamp = System.currentTimeMillis(),
                 content = MessageContent(

libraries/push/impl/src/main/res/values-de/translations.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="notification_channel_noisy">"Laute Benachrichtigungen"</string>
+  <string name="notification_invitation_action_join">"Beitreten"</string>
+  <string name="notification_invitation_action_reject">"Ablehnen"</string>
+  <string name="notification_new_messages">"Neue Nachrichten"</string>
+  <string name="notification_room_action_mark_as_read">"Als gelesen markieren"</string>
+  <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
+  <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
+  <string name="notification_unread_notified_messages_in_room_and_invitation">"%1$s in %2$s und %3$s"</string>
+  <plurals name="notification_compat_summary_line_for_room">
+    <item quantity="one">"%1$s: %2$d Nachricht"</item>
+    <item quantity="other">"%1$s: %2$d Nachrichten"</item>
+  </plurals>
+  <plurals name="notification_invitations">
+    <item quantity="one">"%d Einladung"</item>
+    <item quantity="other">"%d Einladungen"</item>
+  </plurals>
+  <plurals name="notification_new_messages_for_room">
+    <item quantity="one">"%d neue Nachricht"</item>
+    <item quantity="other">"%d neue Nachrichten"</item>
+  </plurals>
+  <plurals name="notification_unread_notified_messages_in_room_rooms">
+    <item quantity="one">"%d Raum"</item>
+    <item quantity="other">"%d Räume"</item>
+  </plurals>
+  <string name="push_distributor_firebase_android">"Google-Dienste"</string>
+  <string name="push_no_valid_google_play_services_apk_android">"Keine gültigen Google Play-Dienste gefunden. Benachrichtigungen funktionieren möglicherweise nicht richtig."</string>
+  <string name="notification_room_action_quick_reply">"Schnellantwort"</string>
+</resources>

libraries/push/impl/src/main/res/values-es/translations.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="notification_room_action_quick_reply">"Respuesta rápida"</string>
+</resources>

libraries/push/impl/src/main/res/values-it/translations.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="notification_room_action_quick_reply">"Risposta rapida"</string>
+</resources>

libraries/push/impl/src/main/res/values-ro/translations.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="notification_channel_call">"Apel"</string>
+  <string name="notification_channel_listening_for_events">"Ascultare evenimente"</string>
+  <string name="notification_channel_noisy">"Notificări zgomotoase"</string>
+  <string name="notification_channel_silent">"Notificări silențioase"</string>
+  <string name="notification_inline_reply_failed">"** Trimiterea eșuată - vă rugăm să deschideți camera"</string>
+  <string name="notification_invitation_action_join">"Alăturați-vă"</string>
+  <string name="notification_invitation_action_reject">"Respingeți"</string>
+  <string name="notification_new_messages">"Mesaje noi"</string>
+  <string name="notification_room_action_mark_as_read">"Marcați ca citit"</string>
+  <string name="notification_sender_me">"Eu"</string>
+  <string name="notification_test_push_notification_content">"Vizualizați o notificare! Faceți clic pe mine!"</string>
+  <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
+  <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
+  <string name="notification_unread_notified_messages_and_invitation">"%1$s și %2$s"</string>
+  <string name="notification_unread_notified_messages_in_room">"%1$s în %2$s"</string>
+  <string name="notification_unread_notified_messages_in_room_and_invitation">"%1$s în %2$s și %3$s"</string>
+  <plurals name="notification_compat_summary_line_for_room">
+    <item quantity="one">"%1$s: %2$d mesaj"</item>
+    <item quantity="few"></item>
+    <item quantity="other">"%1$s: %2$d mesaje"</item>
+  </plurals>
+  <plurals name="notification_compat_summary_title">
+    <item quantity="one">"%d notificare"</item>
+    <item quantity="few"></item>
+    <item quantity="other">"%d notificări"</item>
+  </plurals>
+  <plurals name="notification_invitations">
+    <item quantity="one">"%d invitație"</item>
+    <item quantity="few"></item>
+    <item quantity="other">"%d invitații"</item>
+  </plurals>
+  <plurals name="notification_new_messages_for_room">
+    <item quantity="one">"%d mesaj nou"</item>
+    <item quantity="few"></item>
+    <item quantity="other">"%d mesaje noi"</item>
+  </plurals>
+  <plurals name="notification_unread_notified_messages">
+    <item quantity="one">"%d mesaj notificat necitit"</item>
+    <item quantity="few"></item>
+    <item quantity="other">"%d mesaje notificate necitite"</item>
+  </plurals>
+  <plurals name="notification_unread_notified_messages_in_room_rooms">
+    <item quantity="one">"%d cameră"</item>
+    <item quantity="few"></item>
+    <item quantity="other">"%d camere"</item>
+  </plurals>
+  <string name="push_choose_distributor_dialog_title_android">"Alegeți modul de primire a notificărilor"</string>
+  <string name="push_distributor_background_sync_android">"Sincronizare în fundal"</string>
+  <string name="push_distributor_firebase_android">"Servicii Google"</string>
+  <string name="push_no_valid_google_play_services_apk_android">"Nu au fost găsite servicii Google Play valide. Este posibil ca notificările să nu funcționeze corect."</string>
+  <string name="notification_room_action_quick_reply">"Raspuns rapid"</string>
+</resources>

libraries/push/impl/src/main/res/values/localazy.xml

@@ -9,7 +9,6 @@
   <string name="notification_invitation_action_reject">"Reject"</string>
   <string name="notification_new_messages">"New Messages"</string>
   <string name="notification_room_action_mark_as_read">"Mark as read"</string>
-  <string name="notification_room_action_quick_reply">"Quick reply"</string>
   <string name="notification_sender_me">"Me"</string>
   <string name="notification_test_push_notification_content">"You are viewing the notification! Click me!"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
@@ -45,4 +44,5 @@
   <string name="push_distributor_background_sync_android">"Background synchronization"</string>
   <string name="push_distributor_firebase_android">"Google Services"</string>
   <string name="push_no_valid_google_play_services_apk_android">"No valid Google Play Services found. Notifications may not work properly."</string>
+  <string name="notification_room_action_quick_reply">"Quick reply"</string>
 </resources>

libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt

@@ -38,6 +38,11 @@ object TestTags {
      */
     val changeServerServer = TestTag("change_server-server")
     val changeServerContinue = TestTag("change_server-continue")
+
+    /**
+     * Room list / Home screen.
+     */
+    val homeScreenSettings = TestTag("home_screen-settings")
 }
 
 

libraries/textcomposer/src/main/res/values-de/translations.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rich_text_editor_composer_placeholder">"Nachricht…"</string>
+  <string name="rich_text_editor_link">"Link setzen"</string>
+</resources>

libraries/ui-strings/src/main/res/values-de/translations.xml

@@ -1,5 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_hide_password">"Passwort ausblenden"</string>
+  <string name="a11y_send_files">"Dateien senden"</string>
+  <string name="a11y_show_password">"Passwort anzeigen"</string>
+  <string name="a11y_user_menu">"Benutzermenü"</string>
+  <string name="action_back">"Zurück"</string>
+  <string name="action_cancel">"Abbrechen"</string>
+  <string name="action_choose_photo">"Foto auswählen"</string>
+  <string name="action_close">"Schließen"</string>
+  <string name="action_complete_verification">"Verifizierung abschließen"</string>
   <string name="action_confirm">"Bestätigen"</string>
+  <string name="action_copy">"Kopieren"</string>
+  <string name="action_copy_link">"Link kopieren"</string>
+  <string name="action_create">"Erstellen"</string>
+  <string name="action_decline">"Ablehnen"</string>
+  <string name="action_disable">"Deaktivieren"</string>
+  <string name="action_done">"Fertig"</string>
+  <string name="action_edit">"Bearbeiten"</string>
+  <string name="action_enable">"Aktivieren"</string>
+  <string name="action_invite">"Einladen"</string>
+  <string name="action_invite_friends_to_app">"Freunde zu %1$s einladen"</string>
+  <string name="action_invites_list">"Einladungen"</string>
+  <string name="action_learn_more">"Mehr erfahren"</string>
+  <string name="action_leave">"Verlassen"</string>
+  <string name="action_leave_room">"Raum verlassen"</string>
+  <string name="action_next">"Weiter"</string>
+  <string name="action_no">"Nein"</string>
+  <string name="action_ok">"OK"</string>
+  <string name="action_quick_reply">"Schnellantwort"</string>
+  <string name="action_quote">"Zitieren"</string>
+  <string name="action_remove">"Entfernen"</string>
+  <string name="action_report_bug">"Fehler melden"</string>
+  <string name="action_report_content">"Inhalt melden"</string>
+  <string name="action_retry">"Erneut versuchen"</string>
+  <string name="action_retry_decryption">"Entschlüsselung erneut versuchen"</string>
+  <string name="action_save">"Speichern"</string>
+  <string name="action_search">"Suchen"</string>
+  <string name="action_send">"Senden"</string>
+  <string name="action_send_message">"Nachricht senden"</string>
+  <string name="action_share">"Teilen"</string>
+  <string name="action_share_link">"Link teilen"</string>
+  <string name="action_skip">"Überspringen"</string>
+  <string name="action_take_photo">"Foto aufnehmen"</string>
+  <string name="action_yes">"Ja"</string>
+  <string name="common_about">"Über"</string>
+  <string name="common_analytics">"Analytik"</string>
+  <string name="common_audio">"Audio"</string>
+  <string name="common_bubbles">"Blasen"</string>
+  <string name="common_decryption_error">"Entschlüsselungsfehler"</string>
+  <string name="common_developer_options">"Entwickleroptionen"</string>
+  <string name="common_edited_suffix">"(bearbeitet)"</string>
+  <string name="common_encryption_enabled">"Verschlüsselung aktiviert"</string>
+  <string name="common_error">"Fehler"</string>
+  <string name="common_file">"Datei"</string>
+  <string name="common_gif">"GIF"</string>
+  <string name="common_image">"Bild"</string>
+  <string name="common_link_copied_to_clipboard">"Link in Zwischenablage kopiert"</string>
+  <string name="common_message">"Nachricht"</string>
+  <string name="common_modern">"Modern"</string>
+  <string name="common_offline">"Offline"</string>
+  <string name="common_password">"Passwort"</string>
+  <string name="common_reactions">"Reaktionen"</string>
+  <string name="common_security">"Sicherheit"</string>
+  <string name="common_settings">"Einstellungen"</string>
+  <string name="common_sticker">"Sticker"</string>
+  <string name="common_success">"Erfolg"</string>
+  <string name="common_suggestions">"Vorschläge"</string>
+  <string name="common_topic">"Thema"</string>
+  <string name="common_unable_to_decrypt">"Entschlüsselung nicht möglich"</string>
+  <string name="common_unsupported_event">"Nicht unterstütztes Ereignis"</string>
+  <string name="common_username">"Benutzername"</string>
+  <string name="common_verification_cancelled">"Verifizierung abgebrochen"</string>
+  <string name="common_verification_complete">"Verifizierung abgeschlossen"</string>
+  <string name="common_video">"Video"</string>
+  <string name="common_waiting">"Warten…"</string>
+  <string name="dialog_title_warning">"Warnung"</string>
+  <string name="emoji_picker_category_activity">"Aktivitäten"</string>
+  <string name="emoji_picker_category_flags">"Flaggen"</string>
+  <string name="emoji_picker_category_foods">"Essen &amp; Trinken"</string>
+  <string name="emoji_picker_category_nature">"Tiere &amp; Natur"</string>
+  <string name="emoji_picker_category_objects">"Objekte"</string>
+  <string name="emoji_picker_category_people">"Smileys &amp; Personen"</string>
+  <string name="emoji_picker_category_places">"Reisen &amp; Orte"</string>
+  <string name="emoji_picker_category_symbols">"Symbole"</string>
+  <string name="error_failed_loading_messages">"Fehler beim Laden der Nachrichten"</string>
+  <string name="error_unknown">"Entschuldigung, ein Fehler ist aufgetreten."</string>
+  <string name="login_initial_device_name_android">"%1$s Android"</string>
+  <plurals name="common_member_count">
+    <item quantity="one">"%1$d Mitglied"</item>
+    <item quantity="other">"%1$d Mitglieder"</item>
+  </plurals>
+  <string name="report_content_hint">"Grund für die Meldung dieses Inhalts"</string>
+  <string name="room_timeline_beginning_of_room">"Dies ist der Anfang von %1$s."</string>
+  <string name="room_timeline_read_marker_title">"Neu"</string>
+  <string name="screen_room_member_details_block_alert_action">"Blockieren"</string>
+  <string name="screen_room_member_details_block_user">"Nutzer blockieren"</string>
+  <string name="screen_room_member_details_unblock_alert_action">"Blockierung aufheben"</string>
+  <string name="screen_room_member_details_unblock_user">"Nutzer entblockieren"</string>
+  <string name="settings_rageshake_detection_threshold">"Erkennungsschwelle"</string>
+  <string name="settings_version_number">"Version: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"de"</string>
+  <string name="dialog_title_error">"Fehler"</string>
+  <string name="dialog_title_success">"Erfolg"</string>
+  <string name="screen_report_content_block_user">"Nutzer blockieren"</string>
 </resources>

libraries/ui-strings/src/main/res/values-es/translations.xml

@@ -94,8 +94,6 @@
   <string name="common_video">"Vídeo"</string>
   <string name="common_waiting">"Esperando…"</string>
   <string name="dialog_title_confirmation">"Confirmar"</string>
-  <string name="dialog_title_error">"Error"</string>
-  <string name="dialog_title_success">"Terminado"</string>
   <string name="dialog_title_warning">"Atención"</string>
   <string name="emoji_picker_category_activity">"Actividades"</string>
   <string name="emoji_picker_category_flags">"Banderas"</string>
@@ -129,7 +127,6 @@
   <string name="room_timeline_beginning_of_room">"Este es el principio de %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Este es el principio de esta conversación."</string>
   <string name="room_timeline_read_marker_title">"Nuevos"</string>
-  <string name="screen_report_content_block_user">"Bloquear usuario"</string>
   <string name="screen_report_content_block_user_hint">"Marque si quieres ocultar todos los mensajes actuales y futuros de este usuario"</string>
   <string name="screen_room_member_details_block_alert_action">"Bloquear"</string>
   <string name="screen_room_member_details_block_alert_description">"Los usuarios bloqueados no podrán enviarte mensajes y se ocultarán todos sus mensajes. Puede revertir esta acción en cualquier momento."</string>
@@ -142,4 +139,7 @@
   <string name="settings_title_general">"General"</string>
   <string name="settings_version_number">"Versión: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"es"</string>
+  <string name="dialog_title_error">"Error"</string>
+  <string name="dialog_title_success">"Terminado"</string>
+  <string name="screen_report_content_block_user">"Bloquear usuario"</string>
 </resources>

libraries/ui-strings/src/main/res/values-it/translations.xml

@@ -94,8 +94,6 @@
   <string name="common_video">"Video"</string>
   <string name="common_waiting">"In attesa…"</string>
   <string name="dialog_title_confirmation">"Conferma"</string>
-  <string name="dialog_title_error">"Errore"</string>
-  <string name="dialog_title_success">"Operazione riuscita"</string>
   <string name="dialog_title_warning">"Attenzione"</string>
   <string name="emoji_picker_category_activity">"Attività"</string>
   <string name="emoji_picker_category_flags">"Bandiere"</string>
@@ -129,7 +127,6 @@
   <string name="room_timeline_beginning_of_room">"Questo è l\'inizio di %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Questo è l\'inizio della conversazione."</string>
   <string name="room_timeline_read_marker_title">"Nuovo"</string>
-  <string name="screen_report_content_block_user">"Blocca utente"</string>
   <string name="screen_report_content_block_user_hint">"Seleziona se vuoi nascondere tutti i messaggi attuali e futuri di questo utente"</string>
   <string name="screen_room_member_details_block_alert_action">"Blocca"</string>
   <string name="screen_room_member_details_block_alert_description">"Gli utenti bloccati non saranno in grado di inviarti nuovi messaggi e tutti quelli già esistenti saranno nascosti. Potrai annullare questa azione in qualsiasi momento."</string>
@@ -142,4 +139,7 @@
   <string name="settings_title_general">"Generali"</string>
   <string name="settings_version_number">"Versione: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"it"</string>
+  <string name="dialog_title_error">"Errore"</string>
+  <string name="dialog_title_success">"Operazione riuscita"</string>
+  <string name="screen_report_content_block_user">"Blocca utente"</string>
 </resources>

libraries/ui-strings/src/main/res/values-ro/translations.xml

@@ -4,8 +4,10 @@
   <string name="a11y_send_files">"Trimiteți fișiere"</string>
   <string name="a11y_show_password">"Afișați parola"</string>
   <string name="a11y_user_menu">"Meniu utilizator"</string>
+  <string name="action_accept">"Acceptați"</string>
   <string name="action_back">"Înapoi"</string>
   <string name="action_cancel">"Anulați"</string>
+  <string name="action_choose_photo">"Alegeți o fotografie"</string>
   <string name="action_clear">"Ștergeți"</string>
   <string name="action_close">"Închideți"</string>
   <string name="action_complete_verification">"Verificare completă"</string>
@@ -13,13 +15,16 @@
   <string name="action_continue">"Continuați"</string>
   <string name="action_copy">"Copiați"</string>
   <string name="action_copy_link">"Copiați linkul"</string>
+  <string name="action_create">"Creați"</string>
   <string name="action_create_a_room">"Creați o cameră"</string>
+  <string name="action_decline">"Refuzați"</string>
   <string name="action_disable">"Dezactivați"</string>
   <string name="action_done">"Efectuat"</string>
   <string name="action_edit">"Editați"</string>
   <string name="action_enable">"Activați"</string>
   <string name="action_invite">"Invitați"</string>
   <string name="action_invite_friends_to_app">"Invitați prieteni în %1$s"</string>
+  <string name="action_invites_list">"Invitații"</string>
   <string name="action_learn_more">"Aflați mai multe"</string>
   <string name="action_leave">"Părăsiți"</string>
   <string name="action_leave_room">"Părăsiți camera"</string>
@@ -38,15 +43,18 @@
   <string name="action_save">"Salvați"</string>
   <string name="action_search">"Căutați"</string>
   <string name="action_send">"Trimiteți"</string>
+  <string name="action_send_message">"Trimiteți mesajul"</string>
   <string name="action_share">"Partajați"</string>
   <string name="action_share_link">"Partajați linkul"</string>
   <string name="action_skip">"Omiteți"</string>
   <string name="action_start">"Începeți"</string>
   <string name="action_start_chat">"Începeți discuția"</string>
   <string name="action_start_verification">"Începeți verificarea"</string>
+  <string name="action_take_photo">"Faceți o fotografie"</string>
   <string name="action_view_source">"Vedeți sursă"</string>
   <string name="action_yes">"Da"</string>
   <string name="common_about">"Despre"</string>
+  <string name="common_analytics">"Analitice"</string>
   <string name="common_audio">"Audio"</string>
   <string name="common_bubbles">"Baloane"</string>
   <string name="common_creating_room">"Se creează camera…"</string>
@@ -94,8 +102,6 @@
   <string name="common_video">"Video"</string>
   <string name="common_waiting">"Se aşteaptă…"</string>
   <string name="dialog_title_confirmation">"Confirmare"</string>
-  <string name="dialog_title_error">"Eroare"</string>
-  <string name="dialog_title_success">"Succes"</string>
   <string name="dialog_title_warning">"Avertisment"</string>
   <string name="emoji_picker_category_activity">"Activități"</string>
   <string name="emoji_picker_category_flags">"Steaguri"</string>
@@ -131,7 +137,17 @@
   <string name="room_timeline_beginning_of_room">"Acesta este începutul conversației %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Acesta este începutul acestei conversații."</string>
   <string name="room_timeline_read_marker_title">"Nou"</string>
-  <string name="screen_report_content_block_user">"Blocați utilizatorul"</string>
+  <string name="screen_analytics_help_us_improve">"Ajutați-ne să identificăm problemele și să îmbunătățim %1$s prin partajarea datelor de utilizare anonime."</string>
+  <string name="screen_analytics_prompt_data_usage"><b>"Nu"</b>" înregistrăm sau profilăm datele contului"</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Ajutați-ne să identificăm problemele și să îmbunătățim %1$s prin partajarea datelor de utilizare anonime."</string>
+  <string name="screen_analytics_prompt_read_terms">"Puteți citi toate condițiile noastre %1$s."</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"aici"</string>
+  <string name="screen_analytics_prompt_settings">"Puteți dezactiva această opțiune oricând din setări"</string>
+  <string name="screen_analytics_prompt_third_party_sharing"><b>"Nu"</b>" împărtășim informații cu terți"</string>
+  <string name="screen_analytics_prompt_title">"Ajutați la îmbunătățirea %1$s"</string>
+  <string name="screen_analytics_read_terms">"Puteți citi toate condițiile noastre %1$s."</string>
+  <string name="screen_analytics_read_terms_content_link">"aici"</string>
+  <string name="screen_analytics_share_data">"Partajați datele analitice"</string>
   <string name="screen_report_content_block_user_hint">"Confirmați că doriți să ascundeți toate mesajele curente și viitoare de la acest utilizator"</string>
   <string name="screen_room_member_details_block_alert_action">"Blocați"</string>
   <string name="screen_room_member_details_block_alert_description">"Utilizatorii blocați nu vă vor putea trimite mesaje și toate mesajele lor vor fi ascunse. Puteți anula această acțiune oricând."</string>
@@ -144,4 +160,7 @@
   <string name="settings_title_general">"General"</string>
   <string name="settings_version_number">"Versiunea: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"ro"</string>
+  <string name="dialog_title_error">"Eroare"</string>
+  <string name="dialog_title_success">"Succes"</string>
+  <string name="screen_report_content_block_user">"Blocați utilizatorul"</string>
 </resources>

libraries/ui-strings/src/main/res/values/localazy.xml

@@ -102,8 +102,6 @@
   <string name="common_video">"Video"</string>
   <string name="common_waiting">"Waiting…"</string>
   <string name="dialog_title_confirmation">"Confirmation"</string>
-  <string name="dialog_title_error">"Error"</string>
-  <string name="dialog_title_success">"Success"</string>
   <string name="dialog_title_warning">"Warning"</string>
   <string name="emoji_picker_category_activity">"Activities"</string>
   <string name="emoji_picker_category_flags">"Flags"</string>
@@ -122,60 +120,15 @@
   <string name="leave_room_alert_private_subtitle">"Are you sure that you want to leave this room? This room is not public and you will not be able to rejoin without an invite."</string>
   <string name="leave_room_alert_subtitle">"Are you sure that you want to leave the room?"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
-  <string name="notification_channel_call">"Call"</string>
-  <string name="notification_channel_listening_for_events">"Listening for events"</string>
-  <string name="notification_channel_noisy">"Noisy notifications"</string>
-  <string name="notification_channel_silent">"Silent notifications"</string>
-  <string name="notification_inline_reply_failed">"** Failed to send - please open room"</string>
-  <string name="notification_invitation_action_join">"Join"</string>
-  <string name="notification_invitation_action_reject">"Reject"</string>
-  <string name="notification_new_messages">"New Messages"</string>
-  <string name="notification_room_action_mark_as_read">"Mark as read"</string>
-  <string name="notification_room_action_quick_reply">"Quick reply"</string>
-  <string name="notification_sender_me">"Me"</string>
-  <string name="notification_test_push_notification_content">"You are viewing the notification! Click me!"</string>
-  <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
-  <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
-  <string name="notification_unread_notified_messages_and_invitation">"%1$s and %2$s"</string>
-  <string name="notification_unread_notified_messages_in_room">"%1$s in %2$s"</string>
-  <string name="notification_unread_notified_messages_in_room_and_invitation">"%1$s in %2$s and %3$s"</string>
   <plurals name="common_member_count">
     <item quantity="one">"%1$d member"</item>
     <item quantity="other">"%1$d members"</item>
   </plurals>
-  <plurals name="notification_compat_summary_line_for_room">
-    <item quantity="one">"%1$s: %2$d message"</item>
-    <item quantity="other">"%1$s: %2$d messages"</item>
-  </plurals>
-  <plurals name="notification_compat_summary_title">
-    <item quantity="one">"%d notification"</item>
-    <item quantity="other">"%d notifications"</item>
-  </plurals>
-  <plurals name="notification_invitations">
-    <item quantity="one">"%d invitation"</item>
-    <item quantity="other">"%d invitations"</item>
-  </plurals>
-  <plurals name="notification_new_messages_for_room">
-    <item quantity="one">"%d new message"</item>
-    <item quantity="other">"%d new messages"</item>
-  </plurals>
-  <plurals name="notification_unread_notified_messages">
-    <item quantity="one">"%d unread notified message"</item>
-    <item quantity="other">"%d unread notified messages"</item>
-  </plurals>
-  <plurals name="notification_unread_notified_messages_in_room_rooms">
-    <item quantity="one">"%d room"</item>
-    <item quantity="other">"%d rooms"</item>
-  </plurals>
   <plurals name="room_timeline_state_changes">
     <item quantity="one">"%1$d room change"</item>
     <item quantity="other">"%1$d room changes"</item>
   </plurals>
   <string name="preference_rageshake">"Rageshake to report bug"</string>
-  <string name="push_choose_distributor_dialog_title_android">"Choose how to receive notifications"</string>
-  <string name="push_distributor_background_sync_android">"Background synchronization"</string>
-  <string name="push_distributor_firebase_android">"Google Services"</string>
-  <string name="push_no_valid_google_play_services_apk_android">"No valid Google Play Services found. Notifications may not work properly."</string>
   <string name="rageshake_dialog_content">"You seem to be shaking the phone in frustration. Would you like to open the bug report screen?"</string>
   <string name="report_content_explanation">"This message will be reported to your homeserver’s administrator. They will not be able to read any encrypted messages."</string>
   <string name="report_content_hint">"Reason for reporting this content"</string>
@@ -193,7 +146,6 @@
   <string name="screen_analytics_read_terms">"You can read all our terms %1$s."</string>
   <string name="screen_analytics_read_terms_content_link">"here"</string>
   <string name="screen_analytics_share_data">"Share analytics data"</string>
-  <string name="screen_report_content_block_user">"Block user"</string>
   <string name="screen_report_content_block_user_hint">"Check if you want to hide all current and future messages from this user"</string>
   <string name="screen_room_member_details_block_alert_action">"Block"</string>
   <string name="screen_room_member_details_block_alert_description">"Blocked users will not be able to send you messages and all message by them will be hidden. You can reverse this action anytime."</string>
@@ -207,4 +159,7 @@
   <string name="settings_version_number">"Version: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"en"</string>
   <string name="test_untranslated_default_language_identifier">"en"</string>
+  <string name="dialog_title_error">"Error"</string>
+  <string name="dialog_title_success">"Success"</string>
+  <string name="screen_report_content_block_user">"Block user"</string>
 </resources>