浏览代码

refactor: remove unuse code

appflowy 3 年之前
父节点
当前提交
2c3aade0f9
共有 38 个文件被更改,包括 95 次插入433 次删除
  1. 0 0
      frontend/app_flowy/assets/fonts/FlowyIconData.ttf
  2. 0 40
      frontend/app_flowy/lib/startup/launcher.dart
  3. 37 3
      frontend/app_flowy/lib/startup/startup.dart
  4. 1 2
      frontend/app_flowy/lib/startup/tasks/application_widget.dart
  5. 0 2
      frontend/app_flowy/lib/startup/tasks/init_platform_service.dart
  6. 0 1
      frontend/app_flowy/lib/startup/tasks/init_sdk.dart
  7. 1 0
      frontend/app_flowy/lib/startup/tasks/prelude.dart
  8. 1 1
      frontend/app_flowy/lib/user/infrastructure/network_monitor.dart
  9. 1 1
      frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart
  10. 1 1
      frontend/app_flowy/lib/user/presentation/splash_screen.dart
  11. 1 1
      frontend/app_flowy/lib/workspace/application/app/app_bloc.dart
  12. 1 1
      frontend/app_flowy/lib/workspace/application/appearance.dart
  13. 1 1
      frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart
  14. 1 1
      frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart
  15. 1 1
      frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart
  16. 1 1
      frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart
  17. 1 1
      frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart
  18. 1 1
      frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart
  19. 1 1
      frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart
  20. 1 1
      frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart
  21. 1 1
      frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart
  22. 1 1
      frontend/app_flowy/lib/workspace/presentation/stack_page/home_stack.dart
  23. 14 18
      frontend/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart
  24. 0 75
      frontend/app_flowy/packages/flowy_log/.gitignore
  25. 0 10
      frontend/app_flowy/packages/flowy_log/.metadata
  26. 0 1
      frontend/app_flowy/packages/flowy_log/LICENSE
  27. 0 4
      frontend/app_flowy/packages/flowy_log/analysis_options.yaml
  28. 0 168
      frontend/app_flowy/packages/flowy_log/pubspec.lock
  29. 0 55
      frontend/app_flowy/packages/flowy_log/pubspec.yaml
  30. 0 1
      frontend/app_flowy/packages/flowy_log/test/flowy_log_test.dart
  31. 10 10
      frontend/app_flowy/packages/flowy_sdk/example/pubspec.lock
  32. 1 1
      frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart
  33. 0 0
      frontend/app_flowy/packages/flowy_sdk/lib/log.dart
  34. 1 1
      frontend/app_flowy/packages/flowy_sdk/lib/rust_stream.dart
  35. 9 9
      frontend/app_flowy/packages/flowy_sdk/pubspec.lock
  36. 5 7
      frontend/app_flowy/packages/flowy_sdk/pubspec.yaml
  37. 0 7
      frontend/app_flowy/pubspec.lock
  38. 1 3
      frontend/app_flowy/pubspec.yaml

+ 0 - 0
frontend/app_flowy/fonts/FlowyIconData.ttf → frontend/app_flowy/assets/fonts/FlowyIconData.ttf


+ 0 - 40
frontend/app_flowy/lib/startup/launcher.dart

@@ -1,40 +0,0 @@
-import 'package:app_flowy/startup/startup.dart';
-import 'package:get_it/get_it.dart';
-
-class LaunchContext {
-  GetIt getIt;
-  IntegrationEnv env;
-  LaunchContext(this.getIt, this.env);
-}
-
-enum LaunchTaskType {
-  dataProcessing,
-  appLauncher,
-}
-
-/// The interface of an app launch task, which will trigger
-/// some nonresident indispensable task in app launching task.
-abstract class LaunchTask {
-  LaunchTaskType get type => LaunchTaskType.dataProcessing;
-  Future<void> initialize(LaunchContext context);
-}
-
-class AppLauncher {
-  List<LaunchTask> tasks;
-  IntegrationEnv env;
-  GetIt getIt;
-
-  AppLauncher(this.env, this.getIt) : tasks = List.from([]);
-
-  void addTask(LaunchTask task) {
-    tasks.add(task);
-  }
-
-  void launch() async {
-    final context = LaunchContext(getIt, env);
-    for (var task in tasks) {
-      await task.initialize(context);
-    }
-  }
-}
-//test git hooks

+ 37 - 3
frontend/app_flowy/lib/startup/startup.dart

@@ -1,4 +1,3 @@
-import 'package:app_flowy/startup/launcher.dart';
 import 'package:app_flowy/startup/tasks/prelude.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
@@ -6,8 +5,6 @@ import 'package:app_flowy/workspace/infrastructure/deps_resolver.dart';
 import 'package:app_flowy/user/infrastructure/deps_resolver.dart';
 import 'package:flowy_sdk/flowy_sdk.dart';
 
-import 'tasks/init_platform_service.dart';
-
 // [[diagram: flowy startup flow]]
 //                   ┌──────────┐
 //                   │ FlowyApp │
@@ -67,3 +64,40 @@ Future<void> initGetIt(
   await UserDepsResolver.resolve(getIt);
   await HomeDepsResolver.resolve(getIt);
 }
+
+class LaunchContext {
+  GetIt getIt;
+  IntegrationEnv env;
+  LaunchContext(this.getIt, this.env);
+}
+
+enum LaunchTaskType {
+  dataProcessing,
+  appLauncher,
+}
+
+/// The interface of an app launch task, which will trigger
+/// some nonresident indispensable task in app launching task.
+abstract class LaunchTask {
+  LaunchTaskType get type => LaunchTaskType.dataProcessing;
+  Future<void> initialize(LaunchContext context);
+}
+
+class AppLauncher {
+  List<LaunchTask> tasks;
+  IntegrationEnv env;
+  GetIt getIt;
+
+  AppLauncher(this.env, this.getIt) : tasks = List.from([]);
+
+  void addTask(LaunchTask task) {
+    tasks.add(task);
+  }
+
+  void launch() async {
+    final context = LaunchContext(getIt, env);
+    for (var task in tasks) {
+      await task.initialize(context);
+    }
+  }
+}

+ 1 - 2
frontend/app_flowy/lib/startup/tasks/application_widget.dart

@@ -7,9 +7,8 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:window_size/window_size.dart';
-import 'package:app_flowy/startup/launcher.dart';
 import 'package:bloc/bloc.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 
 class AppWidgetTask extends LaunchTask {
   @override

+ 0 - 2
frontend/app_flowy/lib/startup/tasks/init_platform_service.dart

@@ -1,6 +1,4 @@
-import 'package:app_flowy/startup/launcher.dart';
 import 'package:app_flowy/user/infrastructure/network_monitor.dart';
-
 import '../startup.dart';
 
 class InitPlatformService extends LaunchTask {

+ 0 - 1
frontend/app_flowy/lib/startup/tasks/init_sdk.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'package:app_flowy/startup/launcher.dart';
 import 'package:app_flowy/startup/startup.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:flowy_sdk/flowy_sdk.dart';

+ 1 - 0
frontend/app_flowy/lib/startup/tasks/prelude.dart

@@ -1,2 +1,3 @@
 export 'application_widget.dart';
 export 'init_sdk.dart';
+export 'init_platform_service.dart';

+ 1 - 1
frontend/app_flowy/lib/user/infrastructure/network_monitor.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-net/network_state.pb.dart';
 import 'package:flutter/services.dart';

+ 1 - 1
frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart

@@ -8,7 +8,7 @@ import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra/uuid.dart';
 import 'package:flowy_infra_ui/widget/rounded_button.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';

+ 1 - 1
frontend/app_flowy/lib/user/presentation/splash_screen.dart

@@ -2,7 +2,7 @@ import 'package:app_flowy/startup/startup.dart';
 import 'package:app_flowy/user/application/splash_bloc.dart';
 import 'package:app_flowy/user/domain/auth_state.dart';
 import 'package:app_flowy/user/infrastructure/router.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/errors.pb.dart';
 import 'package:flutter/material.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/application/app/app_bloc.dart

@@ -1,5 +1,5 @@
 import 'package:app_flowy/workspace/infrastructure/repos/app_repo.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/application/appearance.dart

@@ -1,7 +1,7 @@
 import 'package:app_flowy/user/infrastructure/repos/user_setting_repo.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flowy_infra/theme.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_setting.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart

@@ -6,7 +6,7 @@ import 'package:flowy_sdk/protobuf/flowy-folder-data-model/trash.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 import 'package:flutter_quill/flutter_quill.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:dartz/dartz.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart

@@ -3,7 +3,7 @@ import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/workspace_repo.dart';
 import 'package:app_flowy/workspace/presentation/stack_page/blank/blank_page.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart

@@ -1,5 +1,5 @@
 import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_profile.pb.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart

@@ -1,6 +1,6 @@
 import 'package:app_flowy/workspace/infrastructure/repos/trash_repo.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/trash.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart

@@ -1,5 +1,5 @@
 import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/workspace.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:typed_data';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/app.pb.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart

@@ -3,7 +3,7 @@ import 'dart:typed_data';
 
 import 'package:dartz/dartz.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;

+ 1 - 1
frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart

@@ -5,7 +5,7 @@ import 'package:app_flowy/workspace/presentation/stack_page/home_stack.dart';
 import 'package:app_flowy/workspace/presentation/widgets/float_bubble/question_bubble.dart';
 import 'package:app_flowy/workspace/presentation/widgets/prelude.dart';
 import 'package:app_flowy/startup/startup.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_infra_ui/style_widget/container.dart';
 import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile;
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/protobuf.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart

@@ -11,7 +11,7 @@ import 'package:flowy_infra/size.dart';
 import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flowy_infra_ui/widget/rounded_button.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/share.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart';

+ 1 - 1
frontend/app_flowy/lib/workspace/presentation/stack_page/home_stack.dart

@@ -2,7 +2,7 @@ import 'package:app_flowy/startup/startup.dart';
 import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/presentation/home/home_screen.dart';
 import 'package:flowy_infra/theme.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:time/time.dart';

+ 14 - 18
frontend/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart

@@ -5,7 +5,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flowy_infra_ui/style_widget/button.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
@@ -48,14 +48,14 @@ class QuestionBubble extends StatelessWidget {
                 case BubbleAction.debug:
                   final deviceInfoPlugin = DeviceInfoPlugin();
                   final deviceInfo = deviceInfoPlugin.deviceInfo;
-                  
+
                   deviceInfo.then((info) {
                     var debugText = "";
                     info.toMap().forEach((key, value) {
                       debugText = debugText + "$key: $value\n";
                     });
 
-                    Clipboard.setData(ClipboardData( text: debugText ));
+                    Clipboard.setData(ClipboardData(text: debugText));
 
                     Widget toast = Container(
                       padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0),
@@ -64,8 +64,8 @@ class QuestionBubble extends StatelessWidget {
                         color: theme.main1,
                       ),
                       child: Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
                           const Icon(Icons.check),
                           const SizedBox(
                             width: 12.0,
@@ -76,9 +76,9 @@ class QuestionBubble extends StatelessWidget {
                     );
 
                     fToast.showToast(
-                        child: toast,
-                        gravity: ToastGravity.BOTTOM,
-                        toastDuration: const Duration(seconds: 3),
+                      child: toast,
+                      gravity: ToastGravity.BOTTOM,
+                      toastDuration: const Duration(seconds: 3),
                     );
                   }).catchError((error) {
                     Log.info("Debug info has not yet been implemented on this platform");
@@ -90,8 +90,8 @@ class QuestionBubble extends StatelessWidget {
                         color: Colors.red,
                       ),
                       child: Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
                           const Icon(Icons.close),
                           const SizedBox(
                             width: 12.0,
@@ -102,9 +102,9 @@ class QuestionBubble extends StatelessWidget {
                     );
 
                     fToast.showToast(
-                        child: toast,
-                        gravity: ToastGravity.BOTTOM,
-                        toastDuration: const Duration(seconds: 3),
+                      child: toast,
+                      gravity: ToastGravity.BOTTOM,
+                      toastDuration: const Duration(seconds: 3),
                     );
                   }, test: (e) => e is UnimplementedError);
                   break;
@@ -213,11 +213,7 @@ class FlowyVersionDescription extends StatelessWidget {
   }
 }
 
-enum BubbleAction {
-  whatsNews,
-  help,
-  debug
-}
+enum BubbleAction { whatsNews, help, debug }
 
 class BubbleActionWrapper extends ActionItem {
   final BubbleAction inner;

+ 0 - 75
frontend/app_flowy/packages/flowy_log/.gitignore

@@ -1,75 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-build/
-
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
-
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Flutter.podspec
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/ephemeral
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3

+ 0 - 10
frontend/app_flowy/packages/flowy_log/.metadata

@@ -1,10 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: cc00e7e6bc281f6af9a257e7e33868ef782b1cf7
-  channel: dev
-
-project_type: package

+ 0 - 1
frontend/app_flowy/packages/flowy_log/LICENSE

@@ -1 +0,0 @@
-TODO: Add your license here.

+ 0 - 4
frontend/app_flowy/packages/flowy_log/analysis_options.yaml

@@ -1,4 +0,0 @@
-include: package:flutter_lints/flutter.yaml
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options

+ 0 - 168
frontend/app_flowy/packages/flowy_log/pubspec.lock

@@ -1,168 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.8.2"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.15.0"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.4"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.1"
-  logger:
-    dependency: "direct main"
-    description:
-      name: logger
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.12.11"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.7.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.10.0"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.4.3"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.17.0"

+ 0 - 55
frontend/app_flowy/packages/flowy_log/pubspec.yaml

@@ -1,55 +0,0 @@
-name: flowy_log
-description: A new Flutter package project.
-version: 0.0.1
-homepage:
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=1.17.0"
-
-dependencies:
-  flutter:
-    sdk: flutter
-  logger: ^1.0.0
-
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-  flutter_lints: ^1.0.0
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter.
-flutter:
-
-  # To add assets to your package, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-  #
-  # For details regarding assets in packages, see
-  # https://flutter.dev/assets-and-images/#from-packages
-  #
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-
-  # To add custom fonts to your package, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts in packages, see
-  # https://flutter.dev/custom-fonts/#from-packages

+ 0 - 1
frontend/app_flowy/packages/flowy_log/test/flowy_log_test.dart

@@ -1 +0,0 @@
-

+ 10 - 10
frontend/app_flowy/packages/flowy_sdk/example/pubspec.lock

@@ -99,13 +99,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
-  flowy_log:
-    dependency: transitive
-    description:
-      path: "../../flowy_log"
-      relative: true
-    source: path
-    version: "0.0.1"
   flowy_sdk:
     dependency: "direct main"
     description:
@@ -187,6 +180,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -207,7 +207,7 @@ packages:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.0"
   process:
     dependency: transitive
     description:
@@ -275,7 +275,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
@@ -296,7 +296,7 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.3.0"
+    version: "7.5.0"
   webdriver:
     dependency: transitive
     description:

+ 1 - 1
frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart

@@ -1,6 +1,6 @@
 import 'dart:ffi';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 // ignore: unnecessary_import
 import 'package:flowy_sdk/protobuf/dart-ffi/ffi_response.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-collaboration/document_info.pb.dart';

+ 0 - 0
frontend/app_flowy/packages/flowy_log/lib/flowy_log.dart → frontend/app_flowy/packages/flowy_sdk/lib/log.dart


+ 1 - 1
frontend/app_flowy/packages/flowy_sdk/lib/rust_stream.dart

@@ -2,7 +2,7 @@ import 'dart:isolate';
 import 'dart:async';
 import 'dart:typed_data';
 import 'dart:ffi';
-import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/log.dart';
 import 'protobuf/dart-notify/subject.pb.dart';
 
 typedef ObserverCallback = void Function(SubscribeObject observable);

+ 9 - 9
frontend/app_flowy/packages/flowy_sdk/pubspec.lock

@@ -197,13 +197,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
-  flowy_log:
-    dependency: "direct main"
-    description:
-      path: "../flowy_log"
-      relative: true
-    source: path
-    version: "0.0.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -292,7 +285,7 @@ packages:
     source: hosted
     version: "1.0.1"
   logger:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: logger
       url: "https://pub.dartlang.org"
@@ -312,6 +305,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -442,7 +442,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   timing:
     dependency: transitive
     description:

+ 5 - 7
frontend/app_flowy/packages/flowy_sdk/pubspec.yaml

@@ -2,7 +2,7 @@ name: flowy_sdk
 description: A new flutter plugin project.
 version: 0.0.1
 homepage:
-publish_to: 'none'
+publish_to: "none"
 
 environment:
   sdk: ">=2.12.0-0 <3.0.0"
@@ -14,16 +14,14 @@ dependencies:
   ffi: ^1.0.0
   isolates: ^3.0.3+8
   protobuf: "2.0.0"
-  dartz: '0.10.0-nullsafety.2'
+  dartz: "0.10.0-nullsafety.2"
   freezed_annotation: ^0.14.1
-  flowy_log:
-    path: ../flowy_log
-  
-    
+  logger: ^1.0.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: '1.12.2'
+  build_runner: "1.12.2"
   flutter_lints: ^1.0.0
 
 # For information on the generic Dart part of this file, see the

+ 0 - 7
frontend/app_flowy/pubspec.lock

@@ -393,13 +393,6 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
-  flowy_log:
-    dependency: "direct main"
-    description:
-      path: "packages/flowy_log"
-      relative: true
-    source: path
-    version: "0.0.1"
   flowy_sdk:
     dependency: "direct main"
     description:

+ 1 - 3
frontend/app_flowy/pubspec.yaml

@@ -37,8 +37,6 @@ dependencies:
     path: packages/flowy_infra_ui
   flowy_infra:
     path: packages/flowy_infra
-  flowy_log:
-    path: packages/flowy_log
   flutter_quill:
     git:
       url: https://github.com/appflowy/flutter-quill.git
@@ -105,7 +103,7 @@ flutter:
   fonts:
     - family: FlowyIconData
       fonts:
-        - asset: fonts/FlowyIconData.ttf
+        - asset: assets/fonts/FlowyIconData.ttf
 
   # To add assets to your application, add an assets section, like this:
   assets: