From 95aeac201f0443e92248efb1596ae503d2fb01ee Mon Sep 17 00:00:00 2001 From: "Lucas.Xu" Date: Wed, 25 Oct 2023 09:21:20 +0800 Subject: [PATCH] chore: remove the unit tests of Windows and macOS (#3771) * chore: remove the unit tests of Windows and macOS * chore: update pubspec * chore: update languages --- .github/workflows/flutter_ci.yaml | 2 +- .../presentation/more/font_size_switcher.dart | 10 ++---- .../lib/startup/tasks/app_widget.dart | 6 +--- frontend/appflowy_flutter/pubspec.lock | 32 ++++++++++++------- frontend/appflowy_flutter/pubspec.yaml | 5 +-- 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.github/workflows/flutter_ci.yaml b/.github/workflows/flutter_ci.yaml index 4d931a1fbe..f65401aa24 100644 --- a/.github/workflows/flutter_ci.yaml +++ b/.github/workflows/flutter_ci.yaml @@ -136,7 +136,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest] include: - os: ubuntu-latest flutter_profile: development-linux-x86_64 diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/more/font_size_switcher.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/more/font_size_switcher.dart index fd76b579f3..5242db91e0 100644 --- a/frontend/appflowy_flutter/lib/plugins/document/presentation/more/font_size_switcher.dart +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/more/font_size_switcher.dart @@ -27,19 +27,15 @@ class _FontSizeSwitcherState extends State { _FontSizeSelection? _selection; - @override - void initState() { - super.initState(); - - _selection = _fontSizes.firstWhereOrNull((element) => element.$3); - } - @override Widget build(BuildContext context) { final selectedBgColor = AFThemeExtension.of(context).toggleButtonBGColor; final foregroundColor = Theme.of(context).colorScheme.onBackground; return BlocBuilder( builder: (context, state) { + _selection = _fontSizes.firstWhereOrNull( + (element) => element.$2 == state.fontSize, + ); return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart b/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart index 3a0e3a71a3..265f36c3ec 100644 --- a/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart +++ b/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart @@ -6,7 +6,6 @@ import 'package:appflowy/workspace/application/settings/appearance/appearance_cu import 'package:appflowy/workspace/application/settings/notifications/notification_settings_cubit.dart'; import 'package:appflowy_backend/log.dart'; import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart'; -import 'package:appflowy_editor/appflowy_editor.dart' hide Log; import 'package:easy_localization/easy_localization.dart'; import 'package:flowy_infra/theme.dart'; import 'package:flowy_infra_ui/flowy_infra_ui.dart'; @@ -145,10 +144,7 @@ class _ApplicationWidgetState extends State { theme: state.lightTheme, darkTheme: state.darkTheme, themeMode: state.themeMode, - localizationsDelegates: [ - ...context.localizationDelegates, - AppFlowyEditorLocalizations.delegate - ], + localizationsDelegates: context.localizationDelegates, supportedLocales: context.supportedLocales, locale: state.locale, routerConfig: routerConfig, diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lock index 7588317892..278e8d2306 100644 --- a/frontend/appflowy_flutter/pubspec.lock +++ b/frontend/appflowy_flutter/pubspec.lock @@ -54,11 +54,11 @@ packages: dependency: "direct main" description: path: "." - ref: "6d163b8" - resolved-ref: "6d163b88976f6481c4eea5e91c0ed4d68378e56f" + ref: a573847 + resolved-ref: a573847a24ad25441b176f783f1e09bc5a9e08ad url: "https://github.com/AppFlowy-IO/appflowy-editor.git" source: git - version: "1.4.4" + version: "1.5.0" appflowy_popover: dependency: "direct main" description: @@ -749,10 +749,10 @@ packages: dependency: transitive description: name: irondash_engine_context - sha256: "559d4f156ba4d9a33c48185a1d7d5e887083bb601b0b130180d0aae3c1449338" + sha256: f66a1af95756d5fece5034d357853d0127e09b9e4ef58be1f022ca47e11c6f7e url: "https://pub.dev" source: hosted - version: "0.4.0-dev.2" + version: "0.4.0" irondash_message_channel: dependency: transitive description: @@ -1430,6 +1430,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.1" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" stack_trace: dependency: transitive description: @@ -1507,18 +1515,18 @@ packages: dependency: "direct main" description: name: super_clipboard - sha256: "80f7f42e9778101d77e930dcd9206cf72a1d8b696b3cbc1e3f9cbeb71ac4cde7" + sha256: "67496ce89d45e63960541b4907557e7138ee80d1c68a59d87e4d67310eeadbb6" url: "https://pub.dev" source: hosted - version: "0.7.0-dev.5" + version: "0.7.1" super_native_extensions: dependency: transitive description: name: super_native_extensions - sha256: e3903ee807e82a930288811cf1b31a0dee30378bb544f30e3ea58d0ed2f884f2 + sha256: e9ff692aa13c3d489220c9be3c85653fb8b1c7e39ba5fe4c8dcee7f97c0e4337 url: "https://pub.dev" source: hosted - version: "0.7.0-dev.5" + version: "0.7.1" sync_http: dependency: transitive description: @@ -1721,13 +1729,13 @@ packages: source: git version: "1.0.0" uuid: - dependency: transitive + dependency: "direct overridden" description: name: uuid - sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "4.1.0" vector_graphics: dependency: transitive description: diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yaml index 3260ab2032..3ae4295a50 100644 --- a/frontend/appflowy_flutter/pubspec.yaml +++ b/frontend/appflowy_flutter/pubspec.yaml @@ -47,7 +47,7 @@ dependencies: appflowy_editor: git: url: https://github.com/AppFlowy-IO/appflowy-editor.git - ref: "6d163b8" + ref: "a573847" appflowy_popover: path: packages/appflowy_popover @@ -106,7 +106,7 @@ dependencies: url_protocol: hive: ^2.2.3 hive_flutter: ^1.1.0 - super_clipboard: ^0.7.0-dev.4 + super_clipboard: ^0.7.1 go_router: ^10.1.2 string_validator: ^1.0.0 unsplash_client: ^2.1.1 @@ -137,6 +137,7 @@ dev_dependencies: dependency_overrides: http: ^1.0.0 + uuid: ^4.1.0 supabase_flutter: git: