feat: settings my account (#5223)

* feat: my account settings page * test: amend tests * chore: remove unused code * test: remove widget tests * fix: text color on select buttons * test: clean and remove unused test helpers * test: fix test after refactor
AppFlowy-IO · Apr 30, 2024 · 4981baa · 4981baa
1 parent f354437
commit 4981baa
Show file tree

Hide file tree

Showing 124 changed files with 2,309 additions and 4,656 deletions.
diff --git a/frontend/appflowy_flutter/integration_test/cloud/anon_user_continue_test.dart b/frontend/appflowy_flutter/integration_test/cloud/anon_user_continue_test.dart
@@ -3,21 +3,28 @@
 import 'dart:io';
 import 'dart:ui';
 
+import 'package:flutter/material.dart';
+
 import 'package:appflowy/env/cloud_env.dart';
+import 'package:appflowy/generated/flowy_svgs.g.dart';
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/startup/startup.dart';
 import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';
 import 'package:appflowy/user/application/auth/auth_service.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';
+import 'package:appflowy/workspace/presentation/settings/shared/settings_body.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/uuid.dart';
+import 'package:flowy_infra_ui/style_widget/text_field.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
+import 'package:intl/intl.dart';
 import 'package:path/path.dart' as p;
 
+import '../desktop/board/board_hide_groups_test.dart';
 import '../shared/dir.dart';
 import '../shared/mock/mock_file_picker.dart';
 import '../shared/util.dart';
@@ -37,22 +44,35 @@ void main() {
 
       // reanme the name of the anon user
       await tester.openSettings();
-      await tester.openSettingsPage(SettingsPage.user);
-      final userNameFinder = find.descendant(
-        of: find.byType(SettingsUserView),
-        matching: find.byType(UserNameInput),
-      );
-      await tester.enterText(userNameFinder, 'local_user');
-      await tester.openSettingsPage(SettingsPage.user);
+      await tester.openSettingsPage(SettingsPage.account);
       await tester.pumpAndSettle();
 
+      await tester.enterUserName('local_user');
+
+      // Scroll to sign-in
+      await tester.scrollUntilVisible(
+        find.byType(SignInOutButton),
+        100,
+        scrollable: find.findSettingsScrollable(),
+      );
+
+      await tester.tapButton(find.byType(SignInOutButton));
+
       // sign up with Google
       await tester.tapGoogleLoginInButton();
 
       // sign out
       await tester.expectToSeeHomePage();
       await tester.openSettings();
-      await tester.openSettingsPage(SettingsPage.user);
+      await tester.openSettingsPage(SettingsPage.account);
+
+      // Scroll to sign-out
+      await tester.scrollUntilVisible(
+        find.byType(SignInOutButton),
+        100,
+        scrollable: find.findSettingsScrollable(),
+      );
+
       await tester.logout();
       await tester.pumpAndSettle();
 
@@ -63,8 +83,9 @@ void main() {
 
       // New anon user name
       await tester.openSettings();
-      await tester.openSettingsPage(SettingsPage.user);
-      final userNameInput = tester.widget(userNameFinder) as UserNameInput;
+      await tester.openSettingsPage(SettingsPage.account);
+      final userNameInput =
+          tester.widget(find.byType(UserProfileSetting)) as UserProfileSetting;
       expect(userNameInput.name, 'Me');
     });
   });

diff --git a/frontend/appflowy_flutter/integration_test/cloud/appflowy_cloud_auth_test.dart b/frontend/appflowy_flutter/integration_test/cloud/appflowy_cloud_auth_test.dart
@@ -6,8 +6,8 @@ import 'package:appflowy/startup/startup.dart';
 import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';
 import 'package:appflowy/user/application/auth/auth_service.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/uuid.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -37,11 +37,18 @@ void main() {
 
       // Open the setting page and sign out
       await tester.openSettings();
-      await tester.openSettingsPage(SettingsPage.user);
-      await tester.tapButton(find.byType(SettingLogoutButton));
+      await tester.openSettingsPage(SettingsPage.account);
 
-      tester.expectToSeeText(LocaleKeys.button_ok.tr());
-      await tester.tapButtonWithName(LocaleKeys.button_ok.tr());
+      // Scroll to sign-out
+      await tester.scrollUntilVisible(
+        find.byType(SignInOutButton),
+        100,
+        scrollable: find.findSettingsScrollable(),
+      );
+      await tester.tapButton(find.byType(SignInOutButton));
+
+      tester.expectToSeeText(LocaleKeys.button_confirm.tr());
+      await tester.tapButtonWithName(LocaleKeys.button_confirm.tr());
 
       // Go to the sign in page again
       await tester.pumpAndSettle(const Duration(seconds: 1));
@@ -56,7 +63,16 @@ void main() {
 
       // should not see the sync setting page when sign in as anonymous
       await tester.openSettings();
-      await tester.openSettingsPage(SettingsPage.user);
+      await tester.openSettingsPage(SettingsPage.account);
+
+      // Scroll to sign-in
+      await tester.scrollUntilVisible(
+        find.byType(SignInOutButton),
+        100,
+        scrollable: find.findSettingsScrollable(),
+      );
+      await tester.tapButton(find.byType(SignInOutButton));
+
       tester.expectToSeeGoogleLoginButton();
     });
 

diff --git a/frontend/appflowy_flutter/integration_test/cloud/document_sync_test.dart b/frontend/appflowy_flutter/integration_test/cloud/document_sync_test.dart
@@ -8,14 +8,15 @@ import 'package:appflowy/startup/startup.dart';
 import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';
 import 'package:appflowy/user/application/auth/auth_service.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/uuid.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:path/path.dart' as p;
 import 'package:integration_test/integration_test.dart';
+import 'package:path/path.dart' as p;
+
 import '../shared/dir.dart';
 import '../shared/mock/mock_file_picker.dart';
 import '../shared/util.dart';
@@ -50,7 +51,7 @@ void main() {
       await tester.waitForSeconds(6);
 
       await tester.openSettings();
-      await tester.openSettingsPage(SettingsPage.user);
+      await tester.openSettingsPage(SettingsPage.account);
       await tester.logout();
     });
 

diff --git a/frontend/appflowy_flutter/integration_test/cloud/supabase_auth_test.dart b/frontend/appflowy_flutter/integration_test/cloud/supabase_auth_test.dart
@@ -1,9 +1,7 @@
 import 'package:appflowy/env/cloud_env.dart';
-import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_supabase_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
@@ -25,11 +23,8 @@ void main() {
 
       // Open the setting page and sign out
       await tester.openSettings();
-      await tester.openSettingsPage(SettingsPage.user);
-      await tester.tapButton(find.byType(SettingLogoutButton));
-
-      tester.expectToSeeText(LocaleKeys.button_ok.tr());
-      await tester.tapButtonWithName(LocaleKeys.button_ok.tr());
+      await tester.openSettingsPage(SettingsPage.account);
+      await tester.logout();
 
       // Go to the sign in page again
       await tester.pumpAndSettle(const Duration(seconds: 1));
@@ -42,7 +37,16 @@ void main() {
 
       // should not see the sync setting page when sign in as anonymous
       await tester.openSettings();
-      await tester.openSettingsPage(SettingsPage.user);
+      await tester.openSettingsPage(SettingsPage.account);
+
+      // Scroll to sign-out
+      await tester.scrollUntilVisible(
+        find.byType(SignInOutButton),
+        100,
+        scrollable: find.findSettingsScrollable(),
+      );
+      await tester.tapButton(find.byType(SignInOutButton));
+
       tester.expectToSeeGoogleLoginButton();
     });
 

diff --git a/frontend/appflowy_flutter/integration_test/cloud/user_setting_sync_test.dart b/frontend/appflowy_flutter/integration_test/cloud/user_setting_sync_test.dart
@@ -2,22 +2,27 @@
 
 import 'dart:io';
 
+import 'package:flutter/material.dart';
+
 import 'package:appflowy/env/cloud_env.dart';
+import 'package:appflowy/generated/flowy_svgs.g.dart';
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/startup/startup.dart';
 import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';
 import 'package:appflowy/user/application/auth/auth_service.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
 import 'package:appflowy/workspace/presentation/widgets/user_avatar.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/uuid.dart';
-import 'package:flutter/material.dart';
+import 'package:flowy_infra_ui/style_widget/text_field.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:path/path.dart' as p;
 import 'package:integration_test/integration_test.dart';
+import 'package:path/path.dart' as p;
+
+import '../desktop/board/board_hide_groups_test.dart';
 import '../shared/database_test_op.dart';
 import '../shared/dir.dart';
 import '../shared/emoji.dart';
@@ -39,28 +44,9 @@ void main() {
       await tester.expectToSeeHomePageWithGetStartedPage();
 
       await tester.openSettings();
-      await tester.openSettingsPage(SettingsPage.user);
-      // final userAvatarFinder = find.descendant(
-      //   of: find.byType(SettingsUserView),
-      //   matching: find.byType(UserAvatar),
-      // );
-
-      // Open icon picker dialog and select emoji
-      // await tester.tap(userAvatarFinder);
-      // await tester.pumpAndSettle();
-      // await tester.tapEmoji('😁');
-      // await tester.pumpAndSettle();
-      // final UserAvatar userAvatar =
-      //     tester.widget(userAvatarFinder) as UserAvatar;
-      // expect(userAvatar.iconUrl, '😁');
+      await tester.openSettingsPage(SettingsPage.account);
 
-      // enter user name
-      final userNameFinder = find.descendant(
-        of: find.byType(SettingsUserView),
-        matching: find.byType(UserNameInput),
-      );
-      await tester.enterText(userNameFinder, name);
-      await tester.pumpAndSettle();
+      await tester.enterUserName(name);
       await tester.tapEscButton();
 
       // wait 2 seconds for the sync to finish
@@ -78,23 +64,12 @@ void main() {
     await tester.pumpAndSettle();
 
     await tester.openSettings();
-    await tester.openSettingsPage(SettingsPage.user);
+    await tester.openSettingsPage(SettingsPage.account);
 
-    // verify icon
-    // final userAvatarFinder = find.descendant(
-    //   of: find.byType(SettingsUserView),
-    //   matching: find.byType(UserAvatar),
-    // );
-    // final UserAvatar userAvatar = tester.widget(userAvatarFinder) as UserAvatar;
-    // expect(userAvatar.iconUrl, '😁');
+    // Verify name
+    final profileSetting =
+        tester.widget(find.byType(UserProfileSetting)) as UserProfileSetting;
 
-    // verify name
-    final userNameFinder = find.descendant(
-      of: find.byType(SettingsUserView),
-      matching: find.byType(UserNameInput),
-    );
-    final UserNameInput userNameInput =
-        tester.widget(userNameFinder) as UserNameInput;
-    expect(userNameInput.name, name);
+    expect(profileSetting.name, name);
   });
 }
diff --git a/frontend/appflowy_flutter/integration_test/cloud/workspace/change_name_and_icon_test.dart b/frontend/appflowy_flutter/integration_test/cloud/workspace/change_name_and_icon_test.dart
@@ -9,7 +9,6 @@ import 'package:appflowy/user/application/auth/auth_service.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
 import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/uuid.dart';
 import 'package:flutter_test/flutter_test.dart';

diff --git a/frontend/appflowy_flutter/integration_test/cloud/workspace/collaborative_workspace_test.dart b/frontend/appflowy_flutter/integration_test/cloud/workspace/collaborative_workspace_test.dart
@@ -2,6 +2,8 @@
 
 import 'dart:io';
 
+import 'package:flutter/material.dart';
+
 import 'package:appflowy/env/cloud_env.dart';
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart';
@@ -14,12 +16,10 @@ import 'package:appflowy/workspace/presentation/home/menu/sidebar/sidebar_worksp
 import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_actions.dart';
 import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
 import 'package:appflowy/workspace/presentation/widgets/user_avatar.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/uuid.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:path/path.dart' as p;

diff --git a/frontend/appflowy_flutter/integration_test/mobile/home_page/create_new_page_test.dart b/frontend/appflowy_flutter/integration_test/mobile/home_page/create_new_page_test.dart
@@ -14,7 +14,6 @@ import 'package:appflowy/user/application/auth/auth_service.dart';
 import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/uuid.dart';

diff --git a/frontend/appflowy_flutter/integration_test/mobile/sign_in/anonymous_sign_in_test.dart b/frontend/appflowy_flutter/integration_test/mobile/sign_in/anonymous_sign_in_test.dart
@@ -11,7 +11,6 @@ import 'package:appflowy/user/application/auth/auth_service.dart';
 import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/uuid.dart';

diff --git a/frontend/appflowy_flutter/integration_test/shared/auth_operation.dart b/frontend/appflowy_flutter/integration_test/shared/auth_operation.dart
@@ -1,25 +1,33 @@
+import 'package:flutter/material.dart';
+
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/settings_account_view.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/setting_supabase_cloud.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'base.dart';
-import 'expectation.dart';
+import 'util.dart';
 
 extension AppFlowyAuthTest on WidgetTester {
   Future<void> tapGoogleLoginInButton() async {
     await tapButton(find.byKey(const Key('signInWithGoogleButton')));
   }
 
+  /// Requires being on the SettingsPage.account of the SettingsDialog
   Future<void> logout() async {
-    await tapButton(find.byType(SettingLogoutButton));
+    final scrollable = find.findSettingsScrollable();
+    await scrollUntilVisible(
+      find.byType(SignInOutButton),
+      100,
+      scrollable: scrollable,
+    );
+
+    await tapButton(find.byType(SignInOutButton));
 
-    expectToSeeText(LocaleKeys.button_ok.tr());
-    await tapButtonWithName(LocaleKeys.button_ok.tr());
+    expectToSeeText(LocaleKeys.button_confirm.tr());
+    await tapButtonWithName(LocaleKeys.button_confirm.tr());
   }
 
   Future<void> tapSignInAsGuest() async {