From 33d82a51041abca0cbfce6ef47e28cd46b1ba2f2 Mon Sep 17 00:00:00 2001 From: appflowy Date: Wed, 5 Jan 2022 10:46:17 +0800 Subject: [PATCH] fix migrate to flutter_bloc 8.0 CI errors --- .../presentation/stack_page/doc/styles.dart | 7 +++---- .../widget/style_widgets/style_widgets.dart | 4 ++-- frontend/app_flowy/pubspec.lock | 19 ++++++------------- frontend/app_flowy/pubspec.yaml | 4 ++-- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/styles.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/styles.dart index 531d984768..923b175a1c 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/styles.dart +++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/styles.dart @@ -59,10 +59,9 @@ DefaultStyles customStyles(BuildContext context) { small: const TextStyle(fontSize: 12, color: Colors.black45), underline: const TextStyle(decoration: TextDecoration.underline), strikeThrough: const TextStyle(decoration: TextDecoration.lineThrough), - inlineCode: TextStyle( - color: Colors.blue.shade900.withOpacity(0.9), - fontFamily: fontFamily, - fontSize: 13, + inlineCode: InlineCodeStyle( + style: baseStyle, + backgroundColor: Colors.blue.shade900.withOpacity(0.9), ), link: TextStyle( color: themeData.colorScheme.secondary, diff --git a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/widget/style_widgets/style_widgets.dart b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/widget/style_widgets/style_widgets.dart index a85a160d84..9d307b3ace 100644 --- a/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/widget/style_widgets/style_widgets.dart +++ b/frontend/app_flowy/lib/workspace/presentation/stack_page/doc/widget/style_widgets/style_widgets.dart @@ -16,7 +16,7 @@ class EditorCheckboxBuilder extends QuillCheckboxBuilder { EditorCheckboxBuilder(this.theme); @override - Widget build({required BuildContext context, required bool isChecked, required void Function(bool? p1) onChanged}) { + Widget build({required BuildContext context, required bool isChecked, required ValueChanged onChanged}) { return FlowyEditorCheckbox( theme: theme, isChecked: isChecked, @@ -27,7 +27,7 @@ class EditorCheckboxBuilder extends QuillCheckboxBuilder { class FlowyEditorCheckbox extends StatefulWidget { final bool isChecked; - final void Function(bool? value) onChanged; + final ValueChanged onChanged; final AppTheme theme; const FlowyEditorCheckbox({ required this.theme, diff --git a/frontend/app_flowy/pubspec.lock b/frontend/app_flowy/pubspec.lock index 5af1195de6..67d750066c 100644 --- a/frontend/app_flowy/pubspec.lock +++ b/frontend/app_flowy/pubspec.lock @@ -425,7 +425,7 @@ packages: name: flutter_colorpicker url: "https://pub.dartlang.org" source: hosted - version: "0.6.1" + version: "1.0.3" flutter_inappwebview: dependency: transitive description: @@ -477,11 +477,11 @@ packages: dependency: "direct main" description: path: "." - ref: develop - resolved-ref: "8a4c23dcdbb8c38d49b7dea42575231877b1e56d" + ref: HEAD + resolved-ref: "0cb120d08d92c7091bfc0c9466a41c2b21965ca7" url: "https://github.com/appflowy/flutter-quill.git" source: git - version: "2.0.13" + version: "3.0.4" flutter_svg: dependency: "direct main" description: @@ -688,13 +688,6 @@ 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.2" meta: dependency: transitive description: @@ -1084,7 +1077,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.3" textstyle_extensions: dependency: transitive description: @@ -1264,4 +1257,4 @@ packages: version: "8.0.0" sdks: dart: ">=2.15.0-116.0.dev <3.0.0" - flutter: ">=2.5.0" + flutter: ">=2.5.3" diff --git a/frontend/app_flowy/pubspec.yaml b/frontend/app_flowy/pubspec.yaml index 28be44c932..104d6f7c22 100644 --- a/frontend/app_flowy/pubspec.yaml +++ b/frontend/app_flowy/pubspec.yaml @@ -42,7 +42,7 @@ dependencies: flutter_quill: git: url: https://github.com/appflowy/flutter-quill.git - ref: develop + tag: 3.0.4 # third party packages intl: ^0.17.0 @@ -62,7 +62,7 @@ dependencies: styled_widget: '^0.3.1' expandable: ^5.0.1 flutter_svg: ^0.22.0 - flutter_colorpicker: ^0.6.0 + flutter_colorpicker: ^1.0.3 package_info_plus: ^1.3.0 url_launcher: ^6.0.2 # file_picker: ^4.2.1