From e6c7afd61477bbe1ca30c167cbafe50bd4d8ebf0 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com> Date: Mon, 6 Mar 2023 18:02:30 +0100 Subject: [PATCH] Add buttons to create and invite --- .../createroom/root/CreateRoomRootScreen.kt | 27 +++++++++++++++++++ .../src/main/res/drawable/ic_group.xml | 26 ++++++++++++++++++ .../src/main/res/drawable/ic_share.xml | 26 ++++++++++++++++++ .../src/main/res/values/strings_eax.xml | 1 + 4 files changed, 80 insertions(+) create mode 100644 libraries/designsystem/src/main/res/drawable/ic_group.xml create mode 100644 libraries/designsystem/src/main/res/drawable/ic_share.xml diff --git a/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt b/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt index f2697386ab..d9b021b9ba 100644 --- a/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt +++ b/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt @@ -19,8 +19,10 @@ package io.element.android.features.createroom.root import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.SearchBarDefaults +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -73,6 +75,31 @@ fun CreateRoomRootScreen( placeHolderTitle = stringResource(StringR.string.search_for_someone), active = isSearchActive, ) + + TextButton( + modifier = Modifier.padding(start = 8.dp, top = 16.dp, end = 8.dp), + onClick = { }) { + Icon( + modifier = Modifier + .padding(end = 16.dp), + resourceId = DrawableR.drawable.ic_group, // TODO ask design for squared icon + contentDescription = "" + ) + Text(text = stringResource(id = StringR.string.new_room)) + } + + TextButton( + modifier = Modifier.padding(horizontal = 8.dp), + onClick = { } + ) { + Icon( + modifier = Modifier + .padding(end = 16.dp), + resourceId = DrawableR.drawable.ic_share, + contentDescription = "" + ) + Text(text = stringResource(id = StringR.string.invite_people_menu)) + } } } } diff --git a/libraries/designsystem/src/main/res/drawable/ic_group.xml b/libraries/designsystem/src/main/res/drawable/ic_group.xml new file mode 100644 index 0000000000..296a7764d9 --- /dev/null +++ b/libraries/designsystem/src/main/res/drawable/ic_group.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/libraries/designsystem/src/main/res/drawable/ic_share.xml b/libraries/designsystem/src/main/res/drawable/ic_share.xml new file mode 100644 index 0000000000..0291c72fb6 --- /dev/null +++ b/libraries/designsystem/src/main/res/drawable/ic_share.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/libraries/ui-strings/src/main/res/values/strings_eax.xml b/libraries/ui-strings/src/main/res/values/strings_eax.xml index e7c0a3cb78..68644ef59d 100644 --- a/libraries/ui-strings/src/main/res/values/strings_eax.xml +++ b/libraries/ui-strings/src/main/res/values/strings_eax.xml @@ -16,5 +16,6 @@ This server currently doesn\'t support sliding sync. Search for someone + New room