Skip to content

Commit 930990c

Browse files
committed
chore: update dialog style
1 parent 71b8a36 commit 930990c

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/continue_with/continue_with_magic_link_or_passcode_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class _ContinueWithMagicLinkOrPasscodePageState
130130
isSubmitting
131131
? const VerifyingButton()
132132
: ContinueWithButton(
133-
text: LocaleKeys.signIn_continueToSignIn.tr(),
133+
text: LocaleKeys.signIn_continueWithLoginCode.tr(),
134134
onTap: () {
135135
final passcode = passcodeController.text;
136136
if (passcode.isEmpty) {

frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_sign_in_out.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,11 @@ class AccountSignInOutButton extends StatelessWidget {
7676
}
7777

7878
void _showLogoutDialog(BuildContext context) {
79-
showConfirmDialog(
79+
showCancelAndConfirmDialog(
8080
context: context,
8181
title: LocaleKeys.settings_accountPage_login_logoutLabel.tr(),
8282
description: LocaleKeys.settings_menu_logoutPrompt.tr(),
83+
confirmLabel: LocaleKeys.button_yes.tr(),
8384
onConfirm: () async {
8485
await getIt<AuthService>().signOut();
8586
onAction();

frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/workspace_member_page.dart

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,8 @@ class _MemberItem extends StatelessWidget {
434434
style: theme.textStyle.body.enhanced(
435435
color: theme.textColorScheme.primary,
436436
),
437+
maxLines: 1,
438+
overflow: TextOverflow.ellipsis,
437439
),
438440
Text(
439441
_formatJoinedDate(member.joinedAt.toInt()),
@@ -524,20 +526,18 @@ class _MemberMoreActionList extends StatelessWidget {
524526
onSelected: (action, controller) {
525527
switch (action.inner) {
526528
case _MemberMoreAction.delete:
527-
showDialog(
529+
showCancelAndConfirmDialog(
528530
context: context,
529-
builder: (_) => NavigatorOkCancelDialog(
530-
title: LocaleKeys.settings_appearance_members_removeMember.tr(),
531-
message: LocaleKeys
532-
.settings_appearance_members_areYouSureToRemoveMember
533-
.tr(),
534-
onOkPressed: () => context.read<WorkspaceMemberBloc>().add(
535-
WorkspaceMemberEvent.removeWorkspaceMemberByEmail(
536-
action.member.email,
537-
),
531+
title: LocaleKeys.settings_appearance_members_removeMember.tr(),
532+
description: LocaleKeys
533+
.settings_appearance_members_areYouSureToRemoveMember
534+
.tr(),
535+
confirmLabel: LocaleKeys.button_yes.tr(),
536+
onConfirm: () => context.read<WorkspaceMemberBloc>().add(
537+
WorkspaceMemberEvent.removeWorkspaceMemberByEmail(
538+
action.member.email,
538539
),
539-
okTitle: LocaleKeys.button_yes.tr(),
540-
),
540+
),
541541
);
542542
break;
543543
}

frontend/resources/translations/en.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
"temporaryVerificationLinkSent": "A temporary verification link has been sent.\nPlease check your inbox at",
7878
"temporaryVerificationCodeSent": "A temporary verification code has been sent.\nPlease check your inbox at",
7979
"continueToSignIn": "Continue to sign in",
80+
"continueWithLoginCode": "Continue with login code",
8081
"backToLogin": "Back to login",
8182
"enterCode": "Enter code",
8283
"enterCodeManually": "Enter code manually",
@@ -1156,8 +1157,8 @@
11561157
"files": "Files",
11571158
"notifications": "Notifications",
11581159
"open": "Open Settings",
1159-
"logout": "Logout",
1160-
"logoutPrompt": "Are you sure you want to logout?",
1160+
"logout": "Log out",
1161+
"logoutPrompt": "Are you sure you want to log out?",
11611162
"selfEncryptionLogoutPrompt": "Are you sure you want to log out? Please ensure you have copied the encryption secret",
11621163
"syncSetting": "Sync Setting",
11631164
"cloudSettings": "Cloud Settings",
@@ -1437,7 +1438,7 @@
14371438
"tooltipSelectIcon": "Select icon",
14381439
"selectAnIcon": "Select an icon",
14391440
"pleaseInputYourOpenAIKey": "please input your AI key",
1440-
"clickToLogout": "Click to logout the current user"
1441+
"clickToLogout": "Click to log out the current user"
14411442
},
14421443
"mobile": {
14431444
"personalInfo": "Personal Information",

0 commit comments

Comments
 (0)