Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
Merge branch 'main' into add_workspace_settings
Ian Su89644e88daad
diff --cc frontend/app_flowy/lib/startup/deps_resolver.dartindex bafbb46919,1864a2aa62..e0ab40eea7--- a/frontend/app_flowy/lib/startup/deps_resolver.dart+++ b/frontend/app_flowy/lib/startup/deps_resolver.dart@@@ -103,18 -101,8 +103,18 @@@ void _resolveFolderDeps(GetIt getIt)(user, _) => MenuUserBloc(user),);+ //Settings- getIt.registerFactoryParam<SettingsDialogBloc, UserProfile, void>(++ getIt.registerFactoryParam<SettingsDialogBloc, UserProfilePB, void>(+ (user, _) => SettingsDialogBloc(user),+ );++ //User- getIt.registerFactoryParam<SettingsUserViewBloc, UserProfile, void>(++ getIt.registerFactoryParam<SettingsUserViewBloc, UserProfilePB, void>(+ (user, _) => SettingsUserViewBloc(user),+ );+- // App- getIt.registerFactoryParam<AppBloc, App, void>(+ // AppPB+ getIt.registerFactoryParam<AppBloc, AppPB, void>((app, _) => AppBloc(app: app,appService: AppService(appId: app.id),diff --cc frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dartindex d590621e2d,0f30bb9d45..e6cadcfe3a--- a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart+++ b/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart@@@ -31,9 -31,17 +31,9 @@@ class MenuUserBloc extends Bloc<MenuUsefetchWorkspaces: () async {//},- didReceiveUserProfile: (UserProfile newUserProfile) {+ didReceiveUserProfile: (UserProfilePB newUserProfile) {emit(state.copyWith(userProfile: newUserProfile));},- updateUserName: (String name) {- _userService.updateUserProfile(name: name).then((result) {- result.fold(- (l) => null,- (err) => Log.error(err),- );- });- },);});}