From ada220d017f178571076e325134b8d52cdb7dbe8 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 8 Nov 2024 16:21:47 +0100 Subject: [PATCH] design : adjust some designs after textfield changes --- .../impl/configureroom/ConfigureRoomView.kt | 26 +++++++++++++------ .../rageshake/impl/bugreport/BugReportView.kt | 2 +- .../impl/setup/views/RecoveryKeyView.kt | 3 --- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt index 053294a93e..c832fab464 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt @@ -35,6 +35,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.compound.theme.ElementTheme import io.element.android.features.createroom.impl.R +import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage import io.element.android.libraries.designsystem.atomic.atoms.RoundedIconAtom import io.element.android.libraries.designsystem.atomic.atoms.RoundedIconAtomSize import io.element.android.libraries.designsystem.components.async.AsyncActionView @@ -42,9 +43,9 @@ import io.element.android.libraries.designsystem.components.async.AsyncActionVie import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.list.ListItemContent import io.element.android.libraries.designsystem.modifiers.clearFocusOnTap -import io.element.android.libraries.designsystem.preview.ElementPreview +import io.element.android.libraries.designsystem.preview.ElementPreviewDark +import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight -import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.theme.aliasScreenTitle import io.element.android.libraries.designsystem.theme.components.ListItem import io.element.android.libraries.designsystem.theme.components.Scaffold @@ -89,10 +90,10 @@ fun ConfigureRoomView( ) { padding -> Column( modifier = Modifier - .padding(padding) - .imePadding() - .verticalScroll(rememberScrollState()) - .consumeWindowInsets(padding), + .padding(padding) + .imePadding() + .verticalScroll(rememberScrollState()) + .consumeWindowInsets(padding), verticalArrangement = Arrangement.spacedBy(24.dp), ) { RoomNameWithAvatar( @@ -345,10 +346,19 @@ private fun RoomAddressField( ) } -@PreviewsDayNight @PreviewWithLargeHeight @Composable -internal fun ConfigureRoomViewPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) = ElementPreview { +internal fun ConfigureRoomViewLightPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) = + ElementPreviewLight { ContentToPreview(state) } + +@PreviewWithLargeHeight +@Composable +internal fun ConfigureRoomViewDarkPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) = + ElementPreviewDark { ContentToPreview(state) } + +@ExcludeFromCoverage +@Composable +private fun ContentToPreview(state: ConfigureRoomState) { ConfigureRoomView( state = state, onBackClick = {}, diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt index 65fd57c88c..1fb22ebfb0 100644 --- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt +++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt @@ -75,7 +75,7 @@ fun BugReportView( .fillMaxWidth() .onTabOrEnterKeyFocusNext(LocalFocusManager.current), enabled = isFormEnabled, - label = stringResource(id = R.string.screen_bug_report_editor_placeholder), + placeholder = stringResource(id = R.string.screen_bug_report_editor_placeholder), supportingText = stringResource(id = R.string.screen_bug_report_editor_description), onValueChange = { descriptionFieldState = it diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt index bbbea8e6c5..7d03eb7fba 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt @@ -197,14 +197,12 @@ private fun RecoveryKeyFooter(state: RecoveryKeyViewState) { } ), color = ElementTheme.colors.textSecondary, - modifier = Modifier.padding(start = 16.dp), style = ElementTheme.typography.fontBodySmRegular, ) } else { Text( text = stringResource(id = R.string.screen_recovery_key_save_key_description), color = ElementTheme.colors.textSecondary, - modifier = Modifier.padding(start = 16.dp), style = ElementTheme.typography.fontBodySmRegular, ) } @@ -213,7 +211,6 @@ private fun RecoveryKeyFooter(state: RecoveryKeyViewState) { Text( text = stringResource(id = R.string.screen_recovery_key_confirm_key_description), color = ElementTheme.colors.textSecondary, - modifier = Modifier.padding(start = 16.dp), style = ElementTheme.typography.fontBodySmRegular, ) }