From 7623b454fe508bc1d844911fe52d9c47781e840d Mon Sep 17 00:00:00 2001 From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com> Date: Mon, 2 Jun 2025 11:29:04 +0200 Subject: [PATCH] DROID-3446 Vault | New space or chat creation flow, part 2 (#2484) --- .../anytype/ui/spaces/CreateSpaceFragment.kt | 2 +- .../anytypeio/anytype/ui/spaces/CreateSpaceScreen.kt | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/anytypeio/anytype/ui/spaces/CreateSpaceFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/spaces/CreateSpaceFragment.kt index ae273c9ed5..3ae6704889 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/spaces/CreateSpaceFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/spaces/CreateSpaceFragment.kt @@ -57,7 +57,7 @@ class CreateSpaceFragment : BaseBottomSheetComposeFragment() { CreateSpaceScreen( spaceIconView = vm.spaceIconView.collectAsState().value, - onCreate = { name, isSpaceLevelChatSwitchChecked -> + onCreate = { name -> vm.onCreateSpace( name = name, withChat = spaceType == TYPE_CHAT diff --git a/app/src/main/java/com/anytypeio/anytype/ui/spaces/CreateSpaceScreen.kt b/app/src/main/java/com/anytypeio/anytype/ui/spaces/CreateSpaceScreen.kt index 1e0c00a72b..b1cd5c5673 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/spaces/CreateSpaceScreen.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/spaces/CreateSpaceScreen.kt @@ -69,14 +69,12 @@ import com.anytypeio.anytype.presentation.spaces.SpaceIconView @Composable fun CreateSpaceScreen( spaceIconView: SpaceIconView, - onCreate: (Name, IsSpaceLevelChatSwitchChecked) -> Unit, + onCreate: (Name) -> Unit, onSpaceIconUploadClicked: () -> Unit, onSpaceIconRemoveClicked: () -> Unit, isLoading: State, isChatSpace: Boolean = false ) { - var isSpaceLevelChatSwitchChecked = remember { mutableStateOf(false) } - var innerValue by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) } @@ -159,7 +157,6 @@ fun CreateSpaceScreen( keyboardActions = KeyboardActions( onDone = { focusManager.clearFocus() - onCreate(innerValue.text, isSpaceLevelChatSwitchChecked.value) } ), textStyle = BodySemiBold.copy( @@ -172,7 +169,8 @@ fun CreateSpaceScreen( unfocusedContainerColor = colorResource(id = R.color.transparent), focusedIndicatorColor = colorResource(id = R.color.shape_primary), unfocusedIndicatorColor = colorResource(id = R.color.shape_tertiary), - ) + ), + singleLine = true ) } } @@ -180,7 +178,7 @@ fun CreateSpaceScreen( onClick = { focusManager.clearFocus() keyboardController?.hide() - onCreate(innerValue.text, isSpaceLevelChatSwitchChecked.value) + onCreate(innerValue.text) }, text = stringResource(id = R.string.create), size = ButtonSize.Large, @@ -364,7 +362,7 @@ fun CreateSpaceScreenPreview() { color = SystemColor.RED, name = "My Space" ), - onCreate = { _, _ -> }, + onCreate = { }, onSpaceIconUploadClicked = {}, onSpaceIconRemoveClicked = {}, isChatSpace = true,