diff options
5 files changed, 1 insertions, 161 deletions
diff --git a/packages/CredentialManager/wear/res/values/strings.xml b/packages/CredentialManager/wear/res/values/strings.xml index 12bce20ded66..be7e4487efde 100644 --- a/packages/CredentialManager/wear/res/values/strings.xml +++ b/packages/CredentialManager/wear/res/values/strings.xml @@ -33,8 +33,4 @@ <string name="dialog_continue_button">Continue</string> <!-- Content description for the sign in options button of a screen. [CHAR LIMIT=NONE] --> <string name="dialog_sign_in_options_button">Sign-in Options</string> - <!-- Content description for the cancel button of a screen. [CHAR LIMIT=NONE] --> - <string name="dialog_cancel_button_cd">Cancel</string> - <!-- Content description for the OK button of a screen. [CHAR LIMIT=NONE] --> - <string name="dialog_ok_button_cd">OK</string> </resources>
\ No newline at end of file diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/DialogButtonsRow.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/DialogButtonsRow.kt deleted file mode 100644 index 5cb3c1590dfd..000000000000 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/DialogButtonsRow.kt +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.credentialmanager.ui.components - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Check -import androidx.compose.material.icons.filled.Close -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp -import androidx.wear.compose.material.ButtonDefaults -import com.google.android.horologist.compose.material.Button -import com.google.android.horologist.compose.tools.WearPreview -import com.android.credentialmanager.R -import com.google.android.horologist.annotations.ExperimentalHorologistApi - -@OptIn(ExperimentalHorologistApi::class) -@Composable -fun DialogButtonsRow( - onCancelClick: () -> Unit, - onOKClick: () -> Unit, - modifier: Modifier = Modifier, - cancelButtonIcon: ImageVector = Icons.Default.Close, - okButtonIcon: ImageVector = Icons.Default.Check, - cancelButtonContentDescription: String = stringResource(R.string.dialog_cancel_button_cd), - okButtonContentDescription: String = stringResource(R.string.dialog_ok_button_cd), -) { - Row( - modifier = modifier, - horizontalArrangement = Arrangement.Center, - ) { - Button( - imageVector = cancelButtonIcon, - contentDescription = cancelButtonContentDescription, - onClick = onCancelClick, - colors = ButtonDefaults.secondaryButtonColors(), - ) - Button( - imageVector = okButtonIcon, - contentDescription = okButtonContentDescription, - onClick = onOKClick, - modifier = Modifier.padding(start = 20.dp) - ) - } -} - -@WearPreview -@Composable -fun DialogButtonsRowPreview() { - DialogButtonsRow(onCancelClick = {}, onOKClick = {}) -} - diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/SingleAccountScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/SingleAccountScreen.kt index 85327833429d..e94dd6829792 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/SingleAccountScreen.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/SingleAccountScreen.kt @@ -19,21 +19,12 @@ package com.android.credentialmanager.ui.screens.single import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp import androidx.wear.compose.foundation.lazy.ScalingLazyListScope -import com.android.credentialmanager.R -import com.android.credentialmanager.ui.components.AccountRow -import com.android.credentialmanager.ui.components.DialogButtonsRow -import com.android.credentialmanager.ui.components.SignInHeader import com.google.android.horologist.annotations.ExperimentalHorologistApi import com.google.android.horologist.compose.layout.ScalingLazyColumn import com.google.android.horologist.compose.layout.ScalingLazyColumnState -import com.google.android.horologist.compose.layout.belowTimeTextPreview -import com.google.android.horologist.compose.tools.WearPreview @Composable fun SingleAccountScreen( @@ -51,33 +42,4 @@ fun SingleAccountScreen( item { accountContent() } content() } -} - -@WearPreview -@Composable -fun SingleAccountScreenPreview() { - SingleAccountScreen( - headerContent = { - SignInHeader( - icon = R.drawable.passkey_icon, - title = stringResource(R.string.use_passkey_title), - ) - }, - accountContent = { - AccountRow( - name = "Elisa Beckett", - email = "beckett_bakery@gmail.com", - modifier = Modifier.padding(top = 10.dp) - ) - }, - columnState = belowTimeTextPreview(), - ) { - item { - DialogButtonsRow( - onCancelClick = {}, - onOKClick = {}, - modifier = Modifier.padding(top = 10.dp) - ) - } - } -} +}
\ No newline at end of file diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt index c9b0230e74b9..9558bb0c3ff9 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/passkey/SinglePasskeyScreen.kt @@ -25,20 +25,15 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.android.credentialmanager.R import com.android.credentialmanager.ui.components.AccountRow -import com.android.credentialmanager.ui.components.DialogButtonsRow import com.android.credentialmanager.ui.components.SignInHeader import com.android.credentialmanager.ui.screens.single.SingleAccountScreen import com.google.android.horologist.annotations.ExperimentalHorologistApi import com.google.android.horologist.compose.layout.ScalingLazyColumnState -import com.google.android.horologist.compose.layout.belowTimeTextPreview -import com.google.android.horologist.compose.tools.WearPreview @Composable fun SinglePasskeyScreen( name: String, email: String, - onCancelClick: () -> Unit, - onOKClick: () -> Unit, columnState: ScalingLazyColumnState, modifier: Modifier = Modifier, ) { @@ -60,24 +55,6 @@ fun SinglePasskeyScreen( modifier = modifier.padding(horizontal = 10.dp) ) { item { - DialogButtonsRow( - onCancelClick = onCancelClick, - onOKClick = onOKClick, - modifier = Modifier.padding(top = 10.dp) - ) } } } - -@WearPreview -@Composable -fun SinglePasskeyScreenPreview() { - SinglePasskeyScreen( - name = "Elisa Beckett", - email = "beckett_bakery@gmail.com", - onCancelClick = {}, - onOKClick = {}, - columnState = belowTimeTextPreview(), - ) -} - diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreen.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreen.kt index 9f971ae1e327..54636122397f 100644 --- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreen.kt +++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/screens/single/password/SinglePasswordScreen.kt @@ -33,15 +33,12 @@ import com.android.credentialmanager.CredentialSelectorUiState.Get.SingleEntry import com.android.credentialmanager.R import com.android.credentialmanager.TAG import com.android.credentialmanager.activity.StartBalIntentSenderForResultContract -import com.android.credentialmanager.ui.components.DialogButtonsRow import com.android.credentialmanager.ui.components.PasswordRow import com.android.credentialmanager.ui.components.SignInHeader import com.android.credentialmanager.ui.model.PasswordUiModel import com.android.credentialmanager.ui.screens.single.SingleAccountScreen import com.google.android.horologist.annotations.ExperimentalHorologistApi import com.google.android.horologist.compose.layout.ScalingLazyColumnState -import com.google.android.horologist.compose.layout.belowTimeTextPreview -import com.google.android.horologist.compose.tools.WearPreview @Composable fun SinglePasswordScreen( @@ -63,8 +60,6 @@ fun SinglePasswordScreen( is SinglePasswordScreenUiState.Loaded -> { SinglePasswordScreen( passwordUiModel = state.passwordUiModel, - onCancelClick = viewModel::onCancelClick, - onOKClick = viewModel::onOKClick, columnState = columnState, modifier = modifier ) @@ -102,8 +97,6 @@ fun SinglePasswordScreen( @Composable fun SinglePasswordScreen( passwordUiModel: PasswordUiModel, - onCancelClick: () -> Unit, - onOKClick: () -> Unit, columnState: ScalingLazyColumnState, modifier: Modifier = Modifier, ) { @@ -124,23 +117,6 @@ fun SinglePasswordScreen( modifier = modifier.padding(horizontal = 10.dp) ) { item { - DialogButtonsRow( - onCancelClick = onCancelClick, - onOKClick = onOKClick, - modifier = Modifier.padding(top = 10.dp) - ) } } } - -@WearPreview -@Composable -fun SinglePasswordScreenPreview() { - SinglePasswordScreen( - passwordUiModel = PasswordUiModel(email = "beckett_bakery@gmail.com"), - onCancelClick = {}, - onOKClick = {}, - columnState = belowTimeTextPreview(), - ) -} - |