diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomCreationScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomCreationScreen.kt index 8486c033..283595bb 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomCreationScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/ChatRoomCreationScreen.kt @@ -22,7 +22,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.KeyboardType -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel @@ -105,9 +104,9 @@ fun ChatRoomCreationScreen( ) Text( + modifier = Modifier.fillMaxWidth(), text = stringResource(Res.string.this_will_be_the_display_name_for_this_chat), - style = MaterialTheme.typography.labelMedium, - textAlign = TextAlign.Center + style = MaterialTheme.typography.labelMedium ) TextField( @@ -150,9 +149,9 @@ fun ChatRoomCreationScreen( ) Text( + modifier = Modifier.fillMaxWidth(), text = stringResource(Res.string.this_will_be_shown_when_people_open_the_chat), - style = MaterialTheme.typography.labelMedium, - textAlign = TextAlign.Center + style = MaterialTheme.typography.labelMedium ) diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/CreateProfileScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/CreateProfileScreen.kt index 1db826bb..f6dfb233 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/CreateProfileScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/CreateProfileScreen.kt @@ -181,9 +181,9 @@ fun CreateProfileScreen( ) Text( + modifier = Modifier.fillMaxWidth(), text = stringResource(Res.string.this_will_be_the_display_name_for_your), - style = MaterialTheme.typography.labelMedium, - textAlign = TextAlign.Center + style = MaterialTheme.typography.labelMedium ) TextField( @@ -226,9 +226,9 @@ fun CreateProfileScreen( ) Text( + modifier = Modifier.fillMaxWidth(), text = stringResource(Res.string.this_will_be_shown_when_people_open_your), - style = MaterialTheme.typography.labelMedium, - textAlign = TextAlign.Center + style = MaterialTheme.typography.labelMedium ) Button( @@ -255,31 +255,35 @@ fun CreateProfileScreen( } is CreateProfileUIState.ConfirmInput -> { + // A label/value list, so every one of the five is full width and + // starts at the same edge. Centred, each floated at its own width + // and "Name" began somewhere other than the name under it. Text( + modifier = Modifier.fillMaxWidth(), text = stringResource(Res.string.name), style = MaterialTheme.typography.labelLarge ) Text( + modifier = Modifier.fillMaxWidth(), text = createAccountUIState.name, - style = MaterialTheme.typography.bodyLarge, - textAlign = TextAlign.Center + style = MaterialTheme.typography.bodyLarge ) Text( + modifier = Modifier.fillMaxWidth(), text = stringResource(Res.string.bio), style = MaterialTheme.typography.labelLarge ) Text( + modifier = Modifier.fillMaxWidth(), text = createAccountUIState.bio, - style = MaterialTheme.typography.bodyLarge, - textAlign = TextAlign.Center + style = MaterialTheme.typography.bodyLarge ) - - Text( + modifier = Modifier.fillMaxWidth(), text = stringResource(Res.string.the_above_will_be_your_profile), style = MaterialTheme.typography.bodySmall ) diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomTypeScreen.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomTypeScreen.kt index ed937b78..eb847160 100644 --- a/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomTypeScreen.kt +++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/ui/composable/SelectChatRoomTypeScreen.kt @@ -231,7 +231,6 @@ fun SelectChatRoomTypeScreen( Text( text = stringResource(Res.string.this_decides_who_can_change_the_group_later), style = MaterialTheme.typography.labelMedium, - textAlign = TextAlign.Center, modifier = Modifier.fillMaxWidth().padding(horizontal = MaterialTheme.spacing.space125) )