diff --git a/app_flowy/assets/images/avatar.jpg b/app_flowy/assets/images/avatar.jpg deleted file mode 100644 index 0f169389c3..0000000000 Binary files a/app_flowy/assets/images/avatar.jpg and /dev/null differ diff --git a/app_flowy/lib/user/presentation/skip_log_in_screen.dart b/app_flowy/lib/user/presentation/skip_log_in_screen.dart index 740d1788e8..1791c1d59a 100644 --- a/app_flowy/lib/user/presentation/skip_log_in_screen.dart +++ b/app_flowy/lib/user/presentation/skip_log_in_screen.dart @@ -96,7 +96,7 @@ class _SkipLogInScreenState extends State { const password = "AppFlowy123@"; final uid = uuid(); final userEmail = "$uid@appflowy.io"; - final result = await widget.authManager.signUp("FlowyUser", password, userEmail); + final result = await widget.authManager.signUp("Me", password, userEmail); result.fold( (user) { WorkspaceEventReadCurWorkspace().send().then((result) { diff --git a/app_flowy/lib/workspace/domain/edit_action/view_edit.dart b/app_flowy/lib/workspace/domain/edit_action/view_edit.dart index ee7ca656e0..05e4672baa 100644 --- a/app_flowy/lib/workspace/domain/edit_action/view_edit.dart +++ b/app_flowy/lib/workspace/domain/edit_action/view_edit.dart @@ -11,11 +11,11 @@ extension ViewDisclosureExtension on ViewDisclosureAction { String get name { switch (this) { case ViewDisclosureAction.rename: - return 'rename'; + return 'Rename'; case ViewDisclosureAction.delete: - return 'delete'; + return 'Delete'; case ViewDisclosureAction.duplicate: - return 'duplicate'; + return 'Duplicate'; } } diff --git a/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart b/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart index 5cf241e882..08bd697812 100644 --- a/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart +++ b/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart @@ -22,7 +22,7 @@ class QuestionBubble extends StatelessWidget { height: 30, child: FlowyTextButton( '?', - tooltip: BubbleAction.values.map((action) => action.name).toList().join(','), + tooltip: 'Help and Support', fontSize: 12, fontWeight: FontWeight.w600, fillColor: theme.selector, @@ -33,7 +33,6 @@ class QuestionBubble extends StatelessWidget { result.fold(() {}, (action) { switch (action) { case BubbleAction.whatsNews: - // TODO: annie replace the URL with real ones _launchURL("https://www.appflowy.io/whatsnew"); break; case BubbleAction.help: diff --git a/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/create_button.dart b/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/create_button.dart index c31c7d46e6..2641839302 100644 --- a/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/create_button.dart +++ b/app_flowy/lib/workspace/presentation/widgets/menu/widget/app/create_button.dart @@ -15,7 +15,7 @@ class NewAppButton extends StatelessWidget { @override Widget build(BuildContext context) { final child = FlowyTextButton( - 'New App', + 'New page', fontSize: 12, onPressed: () async => await _showCreateAppDialog(context), heading: svgWithSize("home/new_app", const Size(16, 16)), @@ -30,7 +30,7 @@ class NewAppButton extends StatelessWidget { Future _showCreateAppDialog(BuildContext context) async { return TextFieldDialog( - title: 'New App', + title: 'New page', value: "", confirm: (newValue) { if (newValue.isNotEmpty && press != null) { diff --git a/app_flowy/lib/workspace/presentation/widgets/menu/widget/menu_user.dart b/app_flowy/lib/workspace/presentation/widgets/menu/widget/menu_user.dart index 29661d65e1..d911c687a5 100644 --- a/app_flowy/lib/workspace/presentation/widgets/menu/widget/menu_user.dart +++ b/app_flowy/lib/workspace/presentation/widgets/menu/widget/menu_user.dart @@ -6,7 +6,8 @@ import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flowy_infra_ui/style_widget/text.dart'; -import 'package:flowy_infra_ui/style_widget/icon_button.dart'; +//import 'package:flowy_infra_ui/style_widget/icon_button.dart'; +import 'package:avatars/avatars.dart'; class MenuUser extends StatelessWidget { final UserProfile user; @@ -23,7 +24,9 @@ class MenuUser extends StatelessWidget { const HSpace(12), _renderUserName(context), const HSpace(4), - _renderDropButton(context), + //ToDo: when the user is allowed to create another workspace, + //we get the below block back + //_renderDropButton(context), ], mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, @@ -33,12 +36,16 @@ class MenuUser extends StatelessWidget { } Widget _renderAvatar(BuildContext context) { - return const SizedBox( - width: 20, - height: 20, + return SizedBox( + width: 30, + height: 30, child: ClipRRect( borderRadius: Corners.s5Border, - child: Image(image: AssetImage('assets/images/avatar.jpg')), + child: Avatar( + value: 'M', + shape: AvatarShape.circle(20), + placeholderColors: const [Color.fromRGBO(132, 39, 224, 1.0)], + ), ), ); } @@ -52,12 +59,13 @@ class MenuUser extends StatelessWidget { child: FlowyText(name, fontSize: 12), ); } - - Widget _renderDropButton(BuildContext context) { - return FlowyDropdownButton( - onPressed: () { - debugPrint('show user profile'); - }, - ); - } + //ToDo: when the user is allowed to create another workspace, + //we get the below block back + // Widget _renderDropButton(BuildContext context) { + // return FlowyDropdownButton( + // onPressed: () { + // debugPrint('show user profile'); + // }, + // ); + // } } diff --git a/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift b/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift index dd0f848487..ae1c854b99 100644 --- a/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift @@ -10,6 +10,7 @@ import flowy_infra_ui import flowy_sdk import package_info_plus_macos import path_provider_macos +import sqflite import url_launcher_macos import window_size @@ -19,6 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FlowySdkPlugin.register(with: registry.registrar(forPlugin: "FlowySdkPlugin")) FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) WindowSizePlugin.register(with: registry.registrar(forPlugin: "WindowSizePlugin")) } diff --git a/app_flowy/macos/Podfile.lock b/app_flowy/macos/Podfile.lock index ce4f1af669..7ccd266d3f 100644 --- a/app_flowy/macos/Podfile.lock +++ b/app_flowy/macos/Podfile.lock @@ -6,10 +6,16 @@ PODS: - flowy_sdk (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) + - FMDB (2.7.5): + - FMDB/standard (= 2.7.5) + - FMDB/standard (2.7.5) - package_info_plus_macos (0.0.1): - FlutterMacOS - path_provider_macos (0.0.1): - FlutterMacOS + - sqflite (0.0.2): + - FlutterMacOS + - FMDB (>= 2.7.5) - url_launcher_macos (0.0.1): - FlutterMacOS - window_size (0.0.2): @@ -22,9 +28,14 @@ DEPENDENCIES: - FlutterMacOS (from `Flutter/ephemeral`) - package_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos`) - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) + - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - window_size (from `Flutter/ephemeral/.symlinks/plugins/window_size/macos`) +SPEC REPOS: + trunk: + - FMDB + EXTERNAL SOURCES: flowy_editor: :path: Flutter/ephemeral/.symlinks/plugins/flowy_editor/macos @@ -38,6 +49,8 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus_macos/macos path_provider_macos: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos + sqflite: + :path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos window_size: @@ -48,11 +61,13 @@ SPEC CHECKSUMS: flowy_infra_ui: 9d5021b1610fe0476eb1191bf7cd41c4a4138d8f flowy_sdk: c302ac0a22dea596db0df8073b9637b2bf2ff6fd FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 + FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f + sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea url_launcher_macos: 45af3d61de06997666568a7149c1be98b41c95d4 window_size: 339dafa0b27a95a62a843042038fa6c3c48de195 PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c -COCOAPODS: 1.10.1 +COCOAPODS: 1.11.2 diff --git a/app_flowy/packages/flowy_infra/pubspec.lock b/app_flowy/packages/flowy_infra/pubspec.lock index dc5c3c8458..0b9eaad115 100644 --- a/app_flowy/packages/flowy_infra/pubspec.lock +++ b/app_flowy/packages/flowy_infra/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.7.0" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -21,7 +21,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -176,7 +176,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.1" + version: "0.4.3" textstyle_extensions: dependency: "direct main" description: diff --git a/app_flowy/packages/flowy_log/pubspec.lock b/app_flowy/packages/flowy_log/pubspec.lock index ec73dbf462..7f75ad81b7 100644 --- a/app_flowy/packages/flowy_log/pubspec.lock +++ b/app_flowy/packages/flowy_log/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.7.0" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -21,7 +21,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -87,7 +87,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -148,7 +148,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.1" + version: "0.4.3" typed_data: dependency: transitive description: diff --git a/app_flowy/packages/flowy_sdk/example/pubspec.lock b/app_flowy/packages/flowy_sdk/example/pubspec.lock index bb1418811d..f297a73753 100644 --- a/app_flowy/packages/flowy_sdk/example/pubspec.lock +++ b/app_flowy/packages/flowy_sdk/example/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.7.0" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -186,7 +186,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -207,14 +207,14 @@ packages: name: platform url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.2" process: dependency: transitive description: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.1" + version: "4.2.3" protobuf: dependency: transitive description: @@ -275,7 +275,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.1" + version: "0.4.3" typed_data: dependency: transitive description: @@ -296,7 +296,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "7.1.0" + version: "7.3.0" webdriver: dependency: transitive description: diff --git a/app_flowy/packages/flowy_sdk/pubspec.lock b/app_flowy/packages/flowy_sdk/pubspec.lock index 210d0ca825..43137b2f58 100644 --- a/app_flowy/packages/flowy_sdk/pubspec.lock +++ b/app_flowy/packages/flowy_sdk/pubspec.lock @@ -28,7 +28,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.7.0" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -98,7 +98,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -311,7 +311,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -442,7 +442,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.1" + version: "0.4.3" timing: dependency: transitive description: diff --git a/app_flowy/pubspec.lock b/app_flowy/pubspec.lock index b7ed799258..9223049c22 100644 --- a/app_flowy/pubspec.lock +++ b/app_flowy/pubspec.lock @@ -36,6 +36,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.8.2" + avatars: + dependency: "direct main" + description: + name: avatars + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.0" bloc: dependency: transitive description: @@ -314,6 +321,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "7.3.1" + flutter_cache_manager: + dependency: transitive + description: + name: flutter_cache_manager + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.3" flutter_colorpicker: dependency: "direct main" description: @@ -788,6 +802,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.0" + rxdart: + dependency: transitive + description: + name: rxdart + url: "https://pub.dartlang.org" + source: hosted + version: "0.27.2" shelf: dependency: transitive description: @@ -835,6 +856,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "6.0.0" + sqflite: + dependency: transitive + description: + name: sqflite + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0+4" + sqflite_common: + dependency: transitive + description: + name: sqflite_common + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1+1" stack_trace: dependency: transitive description: @@ -877,6 +912,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.3.1+2" + synchronized: + dependency: transitive + description: + name: synchronized + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.0" term_glyph: dependency: transitive description: diff --git a/app_flowy/pubspec.yaml b/app_flowy/pubspec.yaml index ed436c54f3..8fab40e4a9 100644 --- a/app_flowy/pubspec.yaml +++ b/app_flowy/pubspec.yaml @@ -64,6 +64,7 @@ dependencies: flutter_colorpicker: ^0.6.0 package_info_plus: ^1.3.0 url_launcher: ^6.0.2 + avatars: ^2.0.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons.