From 08c06a724c9feda9f0a6bf42150766abf41b050a Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Wed, 6 Sep 2023 23:10:09 +1000 Subject: [PATCH] feat: add basic scaffold for create group view --- .../securesms/groups/CreateGroupFragment.kt | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt index 95b66a9b41..1001663231 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp @@ -41,6 +42,7 @@ import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.dependencies.DatabaseComponent import org.thoughtcrime.securesms.keyboard.emoji.KeyboardPageSearchView import org.thoughtcrime.securesms.mms.GlideApp +import org.thoughtcrime.securesms.ui.NavigationBar import org.thoughtcrime.securesms.ui.PreviewTheme import org.thoughtcrime.securesms.ui.ThemeResPreviewParameterProvider import org.thoughtcrime.securesms.util.fadeIn @@ -139,9 +141,18 @@ class CreateGroupFragment : Fragment() { @Composable fun CreateGroupScreen(createGroupState: CreateGroupState, modifier: Modifier = Modifier) { - CreateGroup(createGroupState, onCreate = { + CreateGroup( + createGroupState, + onCreate = { + + }, + onClose = { + + }, + onBack = { - }) + } + ) } } @@ -155,13 +166,22 @@ data class CreateGroupState ( @Composable fun CreateGroup( createGroupState: CreateGroupState, + onBack: () -> Unit, + onClose: () -> Unit, onCreate: suspend (CreateGroupState) -> Unit, modifier: Modifier = Modifier) { Column( modifier - .fillMaxWidth() - .padding(8.dp)) { - + .fillMaxWidth()) { + NavigationBar( + title = stringResource(id = R.string.activity_create_group_title), + onBack = { + onBack() + }, + onClose = { + onClose() + } + ) } }