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 d911c687a5..957a4d3db0 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 @@ -7,7 +7,6 @@ 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:avatars/avatars.dart'; class MenuUser extends StatelessWidget { final UserProfile user; @@ -36,17 +35,22 @@ class MenuUser extends StatelessWidget { } Widget _renderAvatar(BuildContext context) { - return SizedBox( - width: 30, - height: 30, + return const SizedBox( + width: 25, + height: 25, child: ClipRRect( - borderRadius: Corners.s5Border, - child: Avatar( - value: 'M', - shape: AvatarShape.circle(20), - placeholderColors: const [Color.fromRGBO(132, 39, 224, 1.0)], - ), - ), + borderRadius: Corners.s5Border, + child: CircleAvatar( + backgroundColor: Color.fromRGBO(132, 39, 224, 1.0), + child: Text( + 'M', + style: TextStyle( + fontSize: 18, + fontWeight: FontWeight.w300, + color: Colors.white, + ), + ), + )), ); } diff --git a/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift b/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift index ae1c854b99..dd0f848487 100644 --- a/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/app_flowy/macos/Flutter/GeneratedPluginRegistrant.swift @@ -10,7 +10,6 @@ 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 @@ -20,7 +19,6 @@ 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 880eb85dd6..ce4f1af669 100644 --- a/app_flowy/macos/Podfile.lock +++ b/app_flowy/macos/Podfile.lock @@ -6,16 +6,10 @@ 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): @@ -28,14 +22,9 @@ 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 @@ -49,8 +38,6 @@ 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: @@ -61,10 +48,8 @@ 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 diff --git a/app_flowy/pubspec.lock b/app_flowy/pubspec.lock index 2aee6604f7..efc0a0366b 100644 --- a/app_flowy/pubspec.lock +++ b/app_flowy/pubspec.lock @@ -36,13 +36,6 @@ 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: @@ -328,13 +321,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "7.3.3" - 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: @@ -809,13 +795,6 @@ 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: @@ -863,20 +842,6 @@ 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: @@ -919,13 +884,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.4.0+3" - 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 d46a16d793..bf81a33dfc 100644 --- a/app_flowy/pubspec.yaml +++ b/app_flowy/pubspec.yaml @@ -64,7 +64,6 @@ dependencies: flutter_colorpicker: ^0.6.0 package_info_plus: ^1.3.0 url_launcher: ^6.0.2 - avatars: ^2.0.0 # file_picker: ^4.2.1 clipboard: ^0.1.3