diff --git a/frontend/app_flowy/fonts/FlowyIconData.ttf b/frontend/app_flowy/assets/fonts/FlowyIconData.ttf similarity index 100% rename from frontend/app_flowy/fonts/FlowyIconData.ttf rename to frontend/app_flowy/assets/fonts/FlowyIconData.ttf diff --git a/frontend/app_flowy/lib/startup/launcher.dart b/frontend/app_flowy/lib/startup/launcher.dart deleted file mode 100644 index 78c251c7cb..0000000000 --- a/frontend/app_flowy/lib/startup/launcher.dart +++ /dev/null @@ -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 initialize(LaunchContext context); -} - -class AppLauncher { - List 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 diff --git a/frontend/app_flowy/lib/startup/startup.dart b/frontend/app_flowy/lib/startup/startup.dart index 79717dbf52..d22e57816a 100644 --- a/frontend/app_flowy/lib/startup/startup.dart +++ b/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 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 initialize(LaunchContext context); +} + +class AppLauncher { + List 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); + } + } +} diff --git a/frontend/app_flowy/lib/startup/tasks/application_widget.dart b/frontend/app_flowy/lib/startup/tasks/application_widget.dart index 5b41a7a761..b69e02ce34 100644 --- a/frontend/app_flowy/lib/startup/tasks/application_widget.dart +++ b/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 diff --git a/frontend/app_flowy/lib/startup/tasks/init_platform_service.dart b/frontend/app_flowy/lib/startup/tasks/init_platform_service.dart index 70653a365f..a2e8d1e98d 100644 --- a/frontend/app_flowy/lib/startup/tasks/init_platform_service.dart +++ b/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 { diff --git a/frontend/app_flowy/lib/startup/tasks/init_sdk.dart b/frontend/app_flowy/lib/startup/tasks/init_sdk.dart index 7a2a1e4ba9..e94289c576 100644 --- a/frontend/app_flowy/lib/startup/tasks/init_sdk.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/startup/tasks/prelude.dart b/frontend/app_flowy/lib/startup/tasks/prelude.dart index 288dc6c9dc..16e2108713 100644 --- a/frontend/app_flowy/lib/startup/tasks/prelude.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/user/infrastructure/network_monitor.dart b/frontend/app_flowy/lib/user/infrastructure/network_monitor.dart index 779755a009..a21dc56005 100644 --- a/frontend/app_flowy/lib/user/infrastructure/network_monitor.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart b/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart index ffc88bc101..f86feb8226 100644 --- a/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/user/presentation/splash_screen.dart b/frontend/app_flowy/lib/user/presentation/splash_screen.dart index aa66a58ffe..bbe04e4b18 100644 --- a/frontend/app_flowy/lib/user/presentation/splash_screen.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart b/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart index 932308efdb..ce5415d407 100644 --- a/frontend/app_flowy/lib/workspace/application/app/app_bloc.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/application/appearance.dart b/frontend/app_flowy/lib/workspace/application/appearance.dart index 266ab1a5c5..80a6cab581 100644 --- a/frontend/app_flowy/lib/workspace/application/appearance.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart b/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart index af8d366342..2801fc049f 100644 --- a/frontend/app_flowy/lib/workspace/application/doc/doc_bloc.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart index fb1e9dc7c9..a601e99721 100644 --- a/frontend/app_flowy/lib/workspace/application/menu/menu_bloc.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart index c2f73c62d8..e8c5dfb0b7 100644 --- a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart b/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart index 49d86f71a9..0829484de0 100644 --- a/frontend/app_flowy/lib/workspace/application/trash/trash_bloc.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart b/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart index 3f6a770724..b613109f11 100644 --- a/frontend/app_flowy/lib/workspace/application/workspace/welcome_bloc.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart index fd36057678..81d1980215 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/app_repo.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart b/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart index 8bba568fc3..7987e07c37 100644 --- a/frontend/app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart +++ b/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; diff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart index bc81ac53f3..f46f6b8d80 100644 --- a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart index 3e0475c307..32ff4e6501 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/home_stack.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/home_stack.dart index af20dcb88c..77f8a8c2b7 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/home_stack.dart +++ b/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'; diff --git a/frontend/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart b/frontend/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart index 62e10be3b6..acedb7c1d6 100644 --- a/frontend/app_flowy/lib/workspace/presentation/widgets/float_bubble/question_bubble.dart +++ b/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; diff --git a/frontend/app_flowy/packages/flowy_log/.gitignore b/frontend/app_flowy/packages/flowy_log/.gitignore deleted file mode 100644 index a247422ef7..0000000000 --- a/frontend/app_flowy/packages/flowy_log/.gitignore +++ /dev/null @@ -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 diff --git a/frontend/app_flowy/packages/flowy_log/.metadata b/frontend/app_flowy/packages/flowy_log/.metadata deleted file mode 100644 index 84b25f93ab..0000000000 --- a/frontend/app_flowy/packages/flowy_log/.metadata +++ /dev/null @@ -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 diff --git a/frontend/app_flowy/packages/flowy_log/LICENSE b/frontend/app_flowy/packages/flowy_log/LICENSE deleted file mode 100644 index ba75c69f7f..0000000000 --- a/frontend/app_flowy/packages/flowy_log/LICENSE +++ /dev/null @@ -1 +0,0 @@ -TODO: Add your license here. diff --git a/frontend/app_flowy/packages/flowy_log/analysis_options.yaml b/frontend/app_flowy/packages/flowy_log/analysis_options.yaml deleted file mode 100644 index a5744c1cfb..0000000000 --- a/frontend/app_flowy/packages/flowy_log/analysis_options.yaml +++ /dev/null @@ -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 diff --git a/frontend/app_flowy/packages/flowy_log/pubspec.lock b/frontend/app_flowy/packages/flowy_log/pubspec.lock deleted file mode 100644 index 7f75ad81b7..0000000000 --- a/frontend/app_flowy/packages/flowy_log/pubspec.lock +++ /dev/null @@ -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" diff --git a/frontend/app_flowy/packages/flowy_log/pubspec.yaml b/frontend/app_flowy/packages/flowy_log/pubspec.yaml deleted file mode 100644 index b8b9d51bb3..0000000000 --- a/frontend/app_flowy/packages/flowy_log/pubspec.yaml +++ /dev/null @@ -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 diff --git a/frontend/app_flowy/packages/flowy_log/test/flowy_log_test.dart b/frontend/app_flowy/packages/flowy_log/test/flowy_log_test.dart deleted file mode 100644 index 8b13789179..0000000000 --- a/frontend/app_flowy/packages/flowy_log/test/flowy_log_test.dart +++ /dev/null @@ -1 +0,0 @@ - diff --git a/frontend/app_flowy/packages/flowy_sdk/example/pubspec.lock b/frontend/app_flowy/packages/flowy_sdk/example/pubspec.lock index e3acc4bb72..921bd4fb2b 100644 --- a/frontend/app_flowy/packages/flowy_sdk/example/pubspec.lock +++ b/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: diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart index a376f7d3b0..8c65b29b9b 100644 --- a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart +++ b/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'; diff --git a/frontend/app_flowy/packages/flowy_log/lib/flowy_log.dart b/frontend/app_flowy/packages/flowy_sdk/lib/log.dart similarity index 100% rename from frontend/app_flowy/packages/flowy_log/lib/flowy_log.dart rename to frontend/app_flowy/packages/flowy_sdk/lib/log.dart diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/rust_stream.dart b/frontend/app_flowy/packages/flowy_sdk/lib/rust_stream.dart index 783a25ee8a..0aaa565e43 100644 --- a/frontend/app_flowy/packages/flowy_sdk/lib/rust_stream.dart +++ b/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); diff --git a/frontend/app_flowy/packages/flowy_sdk/pubspec.lock b/frontend/app_flowy/packages/flowy_sdk/pubspec.lock index 895c00a297..5ece223a66 100644 --- a/frontend/app_flowy/packages/flowy_sdk/pubspec.lock +++ b/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: diff --git a/frontend/app_flowy/packages/flowy_sdk/pubspec.yaml b/frontend/app_flowy/packages/flowy_sdk/pubspec.yaml index ac93eb7331..f123a48729 100644 --- a/frontend/app_flowy/packages/flowy_sdk/pubspec.yaml +++ b/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 diff --git a/frontend/app_flowy/pubspec.lock b/frontend/app_flowy/pubspec.lock index efa82e7604..0a8aaf79d7 100644 --- a/frontend/app_flowy/pubspec.lock +++ b/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: diff --git a/frontend/app_flowy/pubspec.yaml b/frontend/app_flowy/pubspec.yaml index 206c60c5ba..54155390a5 100644 --- a/frontend/app_flowy/pubspec.yaml +++ b/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: