Merge pull request #308 from vector-im/feature/fre/create_room_screen

Create a room screen (UI)
2023-04-13 23:40:25 +02:00 · 2023-04-13 23:40:25 +02:00 · 62866965d9
commit 62866965d9
parent 851c0eeb8f 7c3a3e225e
50 changed files with 1140 additions and 28 deletions
--- a/libraries/androidutils/src/main/res/values-es/translations.xml
+++ b/libraries/androidutils/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="error_no_compatible_app_found">"No se encontró ninguna aplicación compatible con esta acción."</string>
+</resources>
--- a/libraries/androidutils/src/main/res/values-it/translations.xml
+++ b/libraries/androidutils/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="error_no_compatible_app_found">"Non è stata trovata alcuna app compatibile per gestire questa azione."</string>
+</resources>
--- a/libraries/androidutils/src/main/res/values-ro/translations.xml
+++ b/libraries/androidutils/src/main/res/values-ro/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="error_no_compatible_app_found">"Nu a fost găsită nicio aplicație capabilă să gestioneze această acțiune."</string>
+</resources>
--- a/libraries/designsystem/build.gradle.kts
+++ b/libraries/designsystem/build.gradle.kts
@ -19,6 +19,7 @@
 plugins {
    id("io.element.android-compose-library")
    alias(libs.plugins.ksp)
+    id("kotlin-parcelize")
 }

 android {
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt
@ -16,15 +16,20 @@

 package io.element.android.libraries.designsystem.components.avatar

+import android.os.Parcelable
 import androidx.compose.runtime.Immutable
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize

@Immutable
+@Parcelize
 data class AvatarData(
    val id: String,
    val name: String?,
    val url: String? = null,
+    @IgnoredOnParcel
    val size: AvatarSize = AvatarSize.MEDIUM
-) {
+) : Parcelable {
    fun getInitial(): String {
        val firstChar = name?.firstOrNull() ?: id.getOrNull(1) ?: '?'
        return firstChar.uppercase()
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt
@ -0,0 +1,63 @@
+/*
+ * 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.theme.components
+
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material3.RadioButtonColors
+import androidx.compose.material3.RadioButtonDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import io.element.android.libraries.designsystem.preview.ElementPreviewDark
+import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+
+@Composable
+fun RadioButton(
+    selected: Boolean,
+    onClick: (() -> Unit)?,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    colors: RadioButtonColors = RadioButtonDefaults.colors(),
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
+) {
+    androidx.compose.material3.RadioButton(
+        selected = selected,
+        onClick = onClick,
+        modifier = modifier,
+        enabled = enabled,
+        colors = colors,
+        interactionSource = interactionSource,
+    )
+}
+
+@Preview
+@Composable
+internal fun RadioButtonLightPreview() = ElementPreviewLight { ContentToPreview() }
+
+@Preview
+@Composable
+internal fun RadioButtonDarkPreview() = ElementPreviewDark { ContentToPreview() }
+
+@Composable
+private fun ContentToPreview() {
+    Column {
+        RadioButton(selected = false, onClick = {})
+        RadioButton(selected = true, onClick = {})
+    }
+}
--- a/libraries/matrixui/build.gradle.kts
+++ b/libraries/matrixui/build.gradle.kts
@ -20,6 +20,7 @@ plugins {
    id("io.element.android-compose-library")
    alias(libs.plugins.anvil)
    alias(libs.plugins.ksp)
+    id("kotlin-parcelize")
 }

 android {
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserProvider.kt
@ -38,6 +38,19 @@ fun aMatrixUser(id: String = "@id_of_alice:server.org", userName: String = "Alic
    avatarData = anAvatarData()
 )

+fun aMatrixUserList() = listOf(
+    aMatrixUser("@alice:server.org", "Alice"),
+    aMatrixUser("@bob:server.org", "Bob"),
+    aMatrixUser("@carol:server.org", "Carol"),
+    aMatrixUser("@david:server.org", "David"),
+    aMatrixUser("@eve:server.org", "Eve"),
+    aMatrixUser("@justin:server.org", "Justin"),
+    aMatrixUser("@mallory:server.org", "Mallory"),
+    aMatrixUser("@susie:server.org", "Susie"),
+    aMatrixUser("@victor:server.org", "Victor"),
+    aMatrixUser("@walter:server.org", "Walter"),
+)
+
 open class MatrixUserWithNullProvider : PreviewParameterProvider<MatrixUser?> {
    override val values: Sequence<MatrixUser?>
        get() = sequenceOf(
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUser.kt
@ -16,16 +16,19 @@

 package io.element.android.libraries.matrix.ui.model

+import android.os.Parcelable
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.core.UserId
+import kotlinx.parcelize.Parcelize

+@Parcelize
@Immutable
 data class MatrixUser(
    val id: UserId,
    val username: String? = null,
    val avatarData: AvatarData = AvatarData(id.value, username),
-)
+) : Parcelable

 fun MatrixUser.getBestName(): String {
    return username?.takeIf { it.isNotEmpty() } ?: id.value
--- a/libraries/ui-strings/src/main/res/values-es/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-es/translations.xml
@ -137,11 +137,9 @@
  <string name="screen_room_member_details_unblock_alert_action">"Desbloquear"</string>
  <string name="screen_room_member_details_unblock_alert_description">"Al desbloquear al usuario, podrás volver a ver todos sus mensajes."</string>
  <string name="screen_room_member_details_unblock_user">"Desbloquear usuario"</string>
-  <string name="screen_start_chat_error_starting_chat">"Se ha producido un error al intentar iniciar un chat"</string>
-  <string name="screen_start_chat_unknown_profile">"No podemos validar el ID de Matrix de este usuario. Es posible que no reciba la invitación."</string>
  <string name="settings_rageshake">"Agitar con fuerza"</string>
  <string name="settings_rageshake_detection_threshold">"Umbral de detección"</string>
  <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>
-</resources>
+</resources>
--- a/libraries/ui-strings/src/main/res/values-it/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-it/translations.xml
@ -137,11 +137,9 @@
  <string name="screen_room_member_details_unblock_alert_action">"Sblocca"</string>
  <string name="screen_room_member_details_unblock_alert_description">"Dopo aver sbloccato l\'utente, potrai vedere nuovamente tutti i suoi messaggi."</string>
  <string name="screen_room_member_details_unblock_user">"Sblocca utente"</string>
-  <string name="screen_start_chat_error_starting_chat">"Si è verificato un errore durante il tentativo di avviare una chat"</string>
-  <string name="screen_start_chat_unknown_profile">"Non possiamo convalidare l\'ID Matrix di questo utente. L\'invito potrebbe non essere ricevuto."</string>
  <string name="settings_rageshake">"Rageshake"</string>
  <string name="settings_rageshake_detection_threshold">"Soglia di rilevamento"</string>
  <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>
-</resources>
+</resources>
--- a/libraries/ui-strings/src/main/res/values-ro/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ro/translations.xml
@ -139,11 +139,9 @@
  <string name="screen_room_member_details_unblock_alert_action">"Deblocați"</string>
  <string name="screen_room_member_details_unblock_alert_description">"La deblocarea utilizatorului, veți putea vedea din nou toate mesajele de la acesta."</string>
  <string name="screen_room_member_details_unblock_user">"Deblocați utilizatorul"</string>
-  <string name="screen_start_chat_error_starting_chat">"A apărut o eroare la încercarea începerii conversației"</string>
-  <string name="screen_start_chat_unknown_profile">"Nu am putut valida ID-ul Matrix al acestui utilizator. Este posibil ca invitația să nu fi fost primită."</string>
  <string name="settings_rageshake">"Rageshake"</string>
  <string name="settings_rageshake_detection_threshold">"Prag de detecție"</string>
  <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>
-</resources>
+</resources>
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@ -181,6 +181,7 @@
  <string name="room_timeline_beginning_of_room">"This is the beginning of %1$s."</string>
  <string name="room_timeline_beginning_of_room_no_name">"This is the beginning of this conversation."</string>
  <string name="room_timeline_read_marker_title">"New"</string>
+  <string name="screen_invites_empty_list">"No Invites"</string>
  <string name="screen_invites_invited_you">"%1$s invited you"</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>
@ -190,8 +191,6 @@
  <string name="screen_room_member_details_unblock_alert_action">"Unblock"</string>
  <string name="screen_room_member_details_unblock_alert_description">"On unblocking the user, you will be able to see all messages by them again."</string>
  <string name="screen_room_member_details_unblock_user">"Unblock user"</string>
-  <string name="screen_start_chat_error_starting_chat">"An error occurred when trying to start a chat"</string>
-  <string name="screen_start_chat_unknown_profile">"We can’t validate this user’s Matrix ID. The invite might not be received."</string>
  <string name="settings_rageshake">"Rageshake"</string>
  <string name="settings_rageshake_detection_threshold">"Detection threshold"</string>
  <string name="settings_title_general">"General"</string>