From b1457bc4998ff0e759c9f0acec9f05266e469efe Mon Sep 17 00:00:00 2001 From: Andrew Haisting <142518658+ahaisting-livefront@users.noreply.github.com> Date: Tue, 31 Oct 2023 07:42:31 -0500 Subject: [PATCH] BIT-989 Show region selector as dialog (#180) --- .../ui/auth/feature/landing/LandingScreen.kt | 36 ++++---- .../components/BitwardenSelectionDialog.kt | 86 +++++++++++++++++++ .../components/BitwardenSelectionRow.kt | 52 +++++++++++ .../auth/feature/landing/LandingScreenTest.kt | 10 ++- 4 files changed, 166 insertions(+), 18 deletions(-) create mode 100644 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenSelectionDialog.kt create mode 100644 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenSelectionRow.kt diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt index 3d5f94e738..2a3638c3cc 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt @@ -17,8 +17,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.DropdownMenu -import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -44,8 +42,11 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect +import com.x8bit.bitwarden.ui.platform.base.util.asText import com.x8bit.bitwarden.ui.platform.components.BitwardenBasicDialog import com.x8bit.bitwarden.ui.platform.components.BitwardenFilledButton +import com.x8bit.bitwarden.ui.platform.components.BitwardenSelectionDialog +import com.x8bit.bitwarden.ui.platform.components.BitwardenSelectionRow import com.x8bit.bitwarden.ui.platform.components.BitwardenSwitch import com.x8bit.bitwarden.ui.platform.components.BitwardenTextButton import com.x8bit.bitwarden.ui.platform.components.BitwardenTextField @@ -226,12 +227,12 @@ private fun EnvironmentSelector( modifier: Modifier, ) { val options = Environment.Type.values() - var expanded by remember { mutableStateOf(false) } + var shouldShowDialog by remember { mutableStateOf(false) } Box(modifier = modifier) { Row( modifier = Modifier - .clickable { expanded = !expanded } + .clickable { shouldShowDialog = !shouldShowDialog } .fillMaxWidth() .padding(start = 16.dp), verticalAlignment = Alignment.CenterVertically, @@ -255,18 +256,21 @@ private fun EnvironmentSelector( ) } - DropdownMenu( - expanded = expanded, - onDismissRequest = { expanded = false }, - ) { - options.forEach { optionString -> - DropdownMenuItem( - text = { Text(text = optionString.label()) }, - onClick = { - expanded = false - onOptionSelected(optionString) - }, - ) + if (shouldShowDialog) { + BitwardenSelectionDialog( + title = R.string.logging_in_on.asText(), + onDismissRequest = { shouldShowDialog = false }, + ) { + options.forEach { + BitwardenSelectionRow( + text = it.label, + onClick = { + onOptionSelected.invoke(it) + shouldShowDialog = false + }, + isSelected = it == selectedOption, + ) + } } } } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenSelectionDialog.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenSelectionDialog.kt new file mode 100644 index 0000000000..780c86cbb3 --- /dev/null +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenSelectionDialog.kt @@ -0,0 +1,86 @@ +package com.x8bit.bitwarden.ui.platform.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import com.x8bit.bitwarden.R +import com.x8bit.bitwarden.ui.platform.base.util.Text + +/** + * Displays a dialog with a title and "Cancel" button. + * + * @param title Title to display. + * @param onDismissRequest Invoked when the user dismisses the dialog. + * @param selectionItems Lambda containing selection items to show to the user. See + * [BitwardenSelectionRow]. + */ +@Composable +fun BitwardenSelectionDialog( + title: Text, + onDismissRequest: () -> Unit, + selectionItems: @Composable ColumnScope.() -> Unit = {}, +) { + Dialog( + onDismissRequest = onDismissRequest, + ) { + val scrollState = rememberScrollState() + Column( + modifier = Modifier.background( + color = MaterialTheme.colorScheme.surfaceContainerHigh, + shape = RoundedCornerShape(28.dp), + ), + horizontalAlignment = Alignment.End, + ) { + Text( + modifier = Modifier + .padding(24.dp) + .fillMaxWidth(), + text = title(), + color = MaterialTheme.colorScheme.onSurface, + style = MaterialTheme.typography.headlineSmall, + ) + if (scrollState.canScrollBackward) { + Box( + modifier = Modifier + .fillMaxWidth() + .height(1.dp) + .background(MaterialTheme.colorScheme.outlineVariant), + ) + } + Column( + modifier = Modifier + .weight(1f, fill = false) + .verticalScroll(scrollState), + content = selectionItems, + ) + if (scrollState.canScrollForward) { + Box( + modifier = Modifier + .fillMaxWidth() + .height(1.dp) + .background(MaterialTheme.colorScheme.outlineVariant), + ) + } + BitwardenTextButton( + modifier = Modifier.padding(24.dp), + label = stringResource(id = R.string.cancel), + onClick = onDismissRequest, + ) + } + } +} diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenSelectionRow.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenSelectionRow.kt new file mode 100644 index 0000000000..458ff574bf --- /dev/null +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenSelectionRow.kt @@ -0,0 +1,52 @@ +package com.x8bit.bitwarden.ui.platform.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.semantics.selected +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.unit.dp +import com.x8bit.bitwarden.ui.platform.base.util.Text + +/** + * A clickable item that displays a radio button and text. + * + * @param text The text to display. + * @param onClick Invoked when either the radio button or text is clicked. + * @param isSelected Whether or not the radio button should be checked. + */ +@Composable +fun BitwardenSelectionRow( + text: Text, + onClick: () -> Unit, + isSelected: Boolean, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier + .fillMaxWidth() + .clickable(onClick = onClick) + .semantics(mergeDescendants = true) { + selected = isSelected + }, + verticalAlignment = Alignment.CenterVertically, + ) { + RadioButton( + modifier = Modifier.padding(16.dp), + selected = isSelected, + onClick = null, + ) + Text( + text = text(), + color = MaterialTheme.colorScheme.onSurface, + style = MaterialTheme.typography.bodyLarge, + ) + } +} diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt index b637cbdf1c..e9e735573b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt @@ -240,19 +240,25 @@ class LandingScreenTest : BaseComposeTest() { ) } - // Clicking to open dropdown + // Clicking to open dialog composeTestRule .onNodeWithText(Environment.Us.label.toString(resources)) .performClick() - // Clicking item from the dropdown menu + // Clicking item on dialog composeTestRule .onNodeWithText(selectedEnvironment.label.toString(resources)) + .assert(hasAnyAncestor(isDialog())) .performClick() verify { viewModel.trySendAction(LandingAction.EnvironmentTypeSelect(selectedEnvironment.type)) } + + // Make sure dialog is hidden: + composeTestRule + .onNode(isDialog()) + .assertDoesNotExist() } @Test