From 7dc4b03483e1a4cd030acce230711891845a80cf Mon Sep 17 00:00:00 2001 From: Rannie <18622218653@163.com> Date: Fri, 27 Dec 2019 17:30:20 +0800 Subject: [PATCH] refactor: move to lib/src for dartdevc --- example/lib/main.dart | 6 +- example/lib/pages/count_stepper_page.dart | 2 +- example/lib/pages/toast_page.dart | 3 +- example/pubspec.lock | 64 +++++++++---------- lib/flui.dart | 50 +++++++-------- lib/{ => src}/common/defines.dart | 0 lib/{ => src}/widgets/action_sheet.dart | 0 lib/{ => src}/widgets/appbar_title.dart | 0 lib/{ => src}/widgets/auto_complete.dart | 0 lib/{ => src}/widgets/avatar.dart | 0 lib/{ => src}/widgets/badge.dart | 0 lib/{ => src}/widgets/bubble.dart | 0 lib/{ => src}/widgets/bubble_menu.dart | 0 lib/{ => src}/widgets/copyable_label.dart | 0 lib/{ => src}/widgets/count_stepper.dart | 0 lib/{ => src}/widgets/empty.dart | 0 lib/{ => src}/widgets/flat_button.dart | 2 +- lib/{ => src}/widgets/gradient_button.dart | 0 lib/{ => src}/widgets/image.dart | 0 lib/{ => src}/widgets/list_tile.dart | 0 lib/{ => src}/widgets/loading_button.dart | 0 lib/{ => src}/widgets/marquee_label.dart | 0 lib/{ => src}/widgets/notice_bar.dart | 2 +- lib/{ => src}/widgets/operation_sheet.dart | 4 +- lib/{ => src}/widgets/pin_input.dart | 0 .../widgets/primary_color_override.dart | 0 lib/{ => src}/widgets/raised_button.dart | 2 +- lib/{ => src}/widgets/skeleton.dart | 0 lib/{ => src}/widgets/static_list.dart | 4 +- lib/{ => src}/widgets/toast.dart | 3 +- pubspec.lock | 50 +++++++-------- test/appbar_test.dart | 4 +- test/avatar_test.dart | 4 +- test/badge_test.dart | 48 ++++++-------- test/bubble_test.dart | 17 ++--- test/button_test.dart | 6 +- test/empty_test.dart | 4 +- test/input_test.dart | 35 +++++----- test/label_test.dart | 2 +- test/list_test.dart | 4 +- test/noticebar_test.dart | 25 ++++---- test/test_common.dart | 2 +- test/toast_test.dart | 10 ++- 43 files changed, 171 insertions(+), 182 deletions(-) rename lib/{ => src}/common/defines.dart (100%) rename lib/{ => src}/widgets/action_sheet.dart (100%) rename lib/{ => src}/widgets/appbar_title.dart (100%) rename lib/{ => src}/widgets/auto_complete.dart (100%) rename lib/{ => src}/widgets/avatar.dart (100%) rename lib/{ => src}/widgets/badge.dart (100%) rename lib/{ => src}/widgets/bubble.dart (100%) rename lib/{ => src}/widgets/bubble_menu.dart (100%) rename lib/{ => src}/widgets/copyable_label.dart (100%) rename lib/{ => src}/widgets/count_stepper.dart (100%) rename lib/{ => src}/widgets/empty.dart (100%) rename lib/{ => src}/widgets/flat_button.dart (99%) rename lib/{ => src}/widgets/gradient_button.dart (100%) rename lib/{ => src}/widgets/image.dart (100%) rename lib/{ => src}/widgets/list_tile.dart (100%) rename lib/{ => src}/widgets/loading_button.dart (100%) rename lib/{ => src}/widgets/marquee_label.dart (100%) rename lib/{ => src}/widgets/notice_bar.dart (98%) rename lib/{ => src}/widgets/operation_sheet.dart (97%) rename lib/{ => src}/widgets/pin_input.dart (100%) rename lib/{ => src}/widgets/primary_color_override.dart (100%) rename lib/{ => src}/widgets/raised_button.dart (99%) rename lib/{ => src}/widgets/skeleton.dart (100%) rename lib/{ => src}/widgets/static_list.dart (98%) rename lib/{ => src}/widgets/toast.dart (99%) diff --git a/example/lib/main.dart b/example/lib/main.dart index 26148ac..1baad77 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -112,8 +112,10 @@ class _MyAppState extends State with WidgetsBindingObserver { final ThemeMode themeMode = Util.themeMode; final FLToastStyle style = isDarkMode ? FLToastStyle.light : FLToastStyle.dark; - final FLToastDefaults toastDefaults = - FLToastDefaults(style: style, position: _defaults.position, textDirection: Util.textDirection); + final FLToastDefaults toastDefaults = FLToastDefaults( + style: style, + position: _defaults.position, + textDirection: Util.textDirection); return FLToastProvider( defaults: toastDefaults, diff --git a/example/lib/pages/count_stepper_page.dart b/example/lib/pages/count_stepper_page.dart index 73fdf19..bb023f7 100644 --- a/example/lib/pages/count_stepper_page.dart +++ b/example/lib/pages/count_stepper_page.dart @@ -1,6 +1,6 @@ import 'package:example/pages/page_util.dart'; import 'package:flutter/material.dart'; -import 'package:flui/widgets/count_stepper.dart'; +import 'package:flui/flui.dart'; class CountStepperPage extends StatefulWidget { static const String routeName = '/count-stepper'; diff --git a/example/lib/pages/toast_page.dart b/example/lib/pages/toast_page.dart index 1f5109d..bc94a69 100644 --- a/example/lib/pages/toast_page.dart +++ b/example/lib/pages/toast_page.dart @@ -101,7 +101,8 @@ class _ToastPageState extends State { child: Image.asset('assets/record.gif', scale: 2)); _hideCustomToast = FLToast.show( - text: 'Swipe up to cancel sending', contentBuilder: (context) => mic); + text: 'Swipe up to cancel sending', + contentBuilder: (context) => mic); }, onLongPressEnd: (LongPressEndDetails details) { if (_hideCustomToast != null) { diff --git a/example/pubspec.lock b/example/pubspec.lock index 3d81628..2ac3c55 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,70 +5,70 @@ packages: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.11" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.5.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.14.11" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.3" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.3" event_bus: dependency: "direct main" description: name: event_bus - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" flui: @@ -97,84 +97,84 @@ packages: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" logger: dependency: "direct main" description: name: logger - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.6" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.8" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.6.4" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.0+1" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.0" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.5" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.5.6" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.0.1+3" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.2+2" sky_engine: @@ -186,70 +186,70 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.5.5" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.3" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.11" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.6" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.3" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.8" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.5.0" sdks: diff --git a/lib/flui.dart b/lib/flui.dart index d7a05e9..2808481 100644 --- a/lib/flui.dart +++ b/lib/flui.dart @@ -1,27 +1,27 @@ library flui; -export 'package:flui/common/defines.dart'; -export 'package:flui/widgets/flat_button.dart'; -export 'package:flui/widgets/raised_button.dart'; -export 'package:flui/widgets/gradient_button.dart'; -export 'package:flui/widgets/loading_button.dart'; -export 'package:flui/widgets/bubble.dart'; -export 'package:flui/widgets/bubble_menu.dart'; -export 'package:flui/widgets/avatar.dart'; -export 'package:flui/widgets/badge.dart'; -export 'package:flui/widgets/copyable_label.dart'; -export 'package:flui/widgets/toast.dart'; -export 'package:flui/widgets/primary_color_override.dart'; -export 'package:flui/widgets/pin_input.dart'; -export 'package:flui/widgets/auto_complete.dart'; -export 'package:flui/widgets/empty.dart'; -export 'package:flui/widgets/marquee_label.dart'; -export 'package:flui/widgets/notice_bar.dart'; -export 'package:flui/widgets/skeleton.dart'; -export 'package:flui/widgets/image.dart'; -export 'package:flui/widgets/action_sheet.dart'; -export 'package:flui/widgets/operation_sheet.dart'; -export 'package:flui/widgets/appbar_title.dart'; -export 'package:flui/widgets/static_list.dart'; -export 'package:flui/widgets/list_tile.dart'; -export 'package:flui/widgets/count_stepper.dart'; +export 'package:flui/src/common/defines.dart'; +export 'package:flui/src/widgets/flat_button.dart'; +export 'package:flui/src/widgets/raised_button.dart'; +export 'package:flui/src/widgets/gradient_button.dart'; +export 'package:flui/src/widgets/loading_button.dart'; +export 'package:flui/src/widgets/bubble.dart'; +export 'package:flui/src/widgets/bubble_menu.dart'; +export 'package:flui/src/widgets/avatar.dart'; +export 'package:flui/src/widgets/badge.dart'; +export 'package:flui/src/widgets/copyable_label.dart'; +export 'package:flui/src/widgets/toast.dart'; +export 'package:flui/src/widgets/primary_color_override.dart'; +export 'package:flui/src/widgets/pin_input.dart'; +export 'package:flui/src/widgets/auto_complete.dart'; +export 'package:flui/src/widgets/empty.dart'; +export 'package:flui/src/widgets/marquee_label.dart'; +export 'package:flui/src/widgets/notice_bar.dart'; +export 'package:flui/src/widgets/skeleton.dart'; +export 'package:flui/src/widgets/image.dart'; +export 'package:flui/src/widgets/action_sheet.dart'; +export 'package:flui/src/widgets/operation_sheet.dart'; +export 'package:flui/src/widgets/appbar_title.dart'; +export 'package:flui/src/widgets/static_list.dart'; +export 'package:flui/src/widgets/list_tile.dart'; +export 'package:flui/src/widgets/count_stepper.dart'; diff --git a/lib/common/defines.dart b/lib/src/common/defines.dart similarity index 100% rename from lib/common/defines.dart rename to lib/src/common/defines.dart diff --git a/lib/widgets/action_sheet.dart b/lib/src/widgets/action_sheet.dart similarity index 100% rename from lib/widgets/action_sheet.dart rename to lib/src/widgets/action_sheet.dart diff --git a/lib/widgets/appbar_title.dart b/lib/src/widgets/appbar_title.dart similarity index 100% rename from lib/widgets/appbar_title.dart rename to lib/src/widgets/appbar_title.dart diff --git a/lib/widgets/auto_complete.dart b/lib/src/widgets/auto_complete.dart similarity index 100% rename from lib/widgets/auto_complete.dart rename to lib/src/widgets/auto_complete.dart diff --git a/lib/widgets/avatar.dart b/lib/src/widgets/avatar.dart similarity index 100% rename from lib/widgets/avatar.dart rename to lib/src/widgets/avatar.dart diff --git a/lib/widgets/badge.dart b/lib/src/widgets/badge.dart similarity index 100% rename from lib/widgets/badge.dart rename to lib/src/widgets/badge.dart diff --git a/lib/widgets/bubble.dart b/lib/src/widgets/bubble.dart similarity index 100% rename from lib/widgets/bubble.dart rename to lib/src/widgets/bubble.dart diff --git a/lib/widgets/bubble_menu.dart b/lib/src/widgets/bubble_menu.dart similarity index 100% rename from lib/widgets/bubble_menu.dart rename to lib/src/widgets/bubble_menu.dart diff --git a/lib/widgets/copyable_label.dart b/lib/src/widgets/copyable_label.dart similarity index 100% rename from lib/widgets/copyable_label.dart rename to lib/src/widgets/copyable_label.dart diff --git a/lib/widgets/count_stepper.dart b/lib/src/widgets/count_stepper.dart similarity index 100% rename from lib/widgets/count_stepper.dart rename to lib/src/widgets/count_stepper.dart diff --git a/lib/widgets/empty.dart b/lib/src/widgets/empty.dart similarity index 100% rename from lib/widgets/empty.dart rename to lib/src/widgets/empty.dart diff --git a/lib/widgets/flat_button.dart b/lib/src/widgets/flat_button.dart similarity index 99% rename from lib/widgets/flat_button.dart rename to lib/src/widgets/flat_button.dart index 6e2b4ef..a9c18b4 100644 --- a/lib/widgets/flat_button.dart +++ b/lib/src/widgets/flat_button.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flui/common/defines.dart'; +import 'package:flui/src/common/defines.dart'; class FLFlatButton extends StatelessWidget { const FLFlatButton( diff --git a/lib/widgets/gradient_button.dart b/lib/src/widgets/gradient_button.dart similarity index 100% rename from lib/widgets/gradient_button.dart rename to lib/src/widgets/gradient_button.dart diff --git a/lib/widgets/image.dart b/lib/src/widgets/image.dart similarity index 100% rename from lib/widgets/image.dart rename to lib/src/widgets/image.dart diff --git a/lib/widgets/list_tile.dart b/lib/src/widgets/list_tile.dart similarity index 100% rename from lib/widgets/list_tile.dart rename to lib/src/widgets/list_tile.dart diff --git a/lib/widgets/loading_button.dart b/lib/src/widgets/loading_button.dart similarity index 100% rename from lib/widgets/loading_button.dart rename to lib/src/widgets/loading_button.dart diff --git a/lib/widgets/marquee_label.dart b/lib/src/widgets/marquee_label.dart similarity index 100% rename from lib/widgets/marquee_label.dart rename to lib/src/widgets/marquee_label.dart diff --git a/lib/widgets/notice_bar.dart b/lib/src/widgets/notice_bar.dart similarity index 98% rename from lib/widgets/notice_bar.dart rename to lib/src/widgets/notice_bar.dart index 4e96b35..2e12bb3 100644 --- a/lib/widgets/notice_bar.dart +++ b/lib/src/widgets/notice_bar.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flui/widgets/marquee_label.dart'; +import 'package:flui/src/widgets/marquee_label.dart'; const Color FLNoticeBarTintColor = const Color(0xFFF76A24); const Color FLNoticeBarBackgroundColor = const Color(0xFFFEFCEC); diff --git a/lib/widgets/operation_sheet.dart b/lib/src/widgets/operation_sheet.dart similarity index 97% rename from lib/widgets/operation_sheet.dart rename to lib/src/widgets/operation_sheet.dart index 2b2695b..9497f5c 100644 --- a/lib/widgets/operation_sheet.dart +++ b/lib/src/widgets/operation_sheet.dart @@ -1,5 +1,5 @@ -import 'package:flui/widgets/action_sheet.dart'; -import 'package:flui/widgets/image.dart'; +import 'package:flui/src/widgets/action_sheet.dart'; +import 'package:flui/src/widgets/image.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/pin_input.dart b/lib/src/widgets/pin_input.dart similarity index 100% rename from lib/widgets/pin_input.dart rename to lib/src/widgets/pin_input.dart diff --git a/lib/widgets/primary_color_override.dart b/lib/src/widgets/primary_color_override.dart similarity index 100% rename from lib/widgets/primary_color_override.dart rename to lib/src/widgets/primary_color_override.dart diff --git a/lib/widgets/raised_button.dart b/lib/src/widgets/raised_button.dart similarity index 99% rename from lib/widgets/raised_button.dart rename to lib/src/widgets/raised_button.dart index 147ac54..f4e18e8 100644 --- a/lib/widgets/raised_button.dart +++ b/lib/src/widgets/raised_button.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flui/common/defines.dart'; +import 'package:flui/src/common/defines.dart'; class FLRaisedButton extends StatelessWidget { FLRaisedButton({ diff --git a/lib/widgets/skeleton.dart b/lib/src/widgets/skeleton.dart similarity index 100% rename from lib/widgets/skeleton.dart rename to lib/src/widgets/skeleton.dart diff --git a/lib/widgets/static_list.dart b/lib/src/widgets/static_list.dart similarity index 98% rename from lib/widgets/static_list.dart rename to lib/src/widgets/static_list.dart index 16fbd2c..f086cfe 100644 --- a/lib/widgets/static_list.dart +++ b/lib/src/widgets/static_list.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flui/widgets/flat_button.dart'; -import 'package:flui/widgets/list_tile.dart'; +import 'package:flui/src/widgets/flat_button.dart'; +import 'package:flui/src/widgets/list_tile.dart'; enum FLStaticListCellType { normal, button, customization } diff --git a/lib/widgets/toast.dart b/lib/src/widgets/toast.dart similarity index 99% rename from lib/widgets/toast.dart rename to lib/src/widgets/toast.dart index 0779f33..9e5af1b 100644 --- a/lib/widgets/toast.dart +++ b/lib/src/widgets/toast.dart @@ -473,7 +473,8 @@ class _FLToastViewState extends State<_FLToastView> Widget build(BuildContext context) { final MediaQueryData mediaQueryData = MediaQueryData.fromWindow(ui.window); final double marginTop = widget.topOffset + mediaQueryData.padding.top; - final double marginBottom = widget.bottomOffset + mediaQueryData.padding.bottom; + final double marginBottom = + widget.bottomOffset + mediaQueryData.padding.bottom; MainAxisAlignment alignment = MainAxisAlignment.center; if (widget.position == FLToastPosition.top) alignment = MainAxisAlignment.start; diff --git a/pubspec.lock b/pubspec.lock index fe019d7..d2ac79b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,56 +5,56 @@ packages: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.11" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.5.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.14.11" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.3" flutter: @@ -71,56 +71,56 @@ packages: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.6" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.8" mockito: dependency: "direct dev" description: name: mockito - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "4.1.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.6.4" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.0+1" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.4.0" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.5" sky_engine: @@ -132,63 +132,63 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.5.5" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.3" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.11" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.6" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.8" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.5.0" sdks: diff --git a/test/appbar_test.dart b/test/appbar_test.dart index ba7ed61..e804e43 100644 --- a/test/appbar_test.dart +++ b/test/appbar_test.dart @@ -1,4 +1,4 @@ -import 'package:flui/widgets/appbar_title.dart'; +import 'package:flui/src/widgets/appbar_title.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -48,4 +48,4 @@ void main() { expect(find.byIcon(iconData), findsOneWidget); }); -} \ No newline at end of file +} diff --git a/test/avatar_test.dart b/test/avatar_test.dart index acf9627..a5219c0 100644 --- a/test/avatar_test.dart +++ b/test/avatar_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:flui/widgets/avatar.dart'; +import 'package:flui/src/widgets/avatar.dart'; import 'test_common.dart'; void main() { @@ -20,4 +20,4 @@ void main() { final textFinder = find.text('TE'); expect(textFinder, findsOneWidget); }); -} \ No newline at end of file +} diff --git a/test/badge_test.dart b/test/badge_test.dart index 74412b6..594f382 100644 --- a/test/badge_test.dart +++ b/test/badge_test.dart @@ -1,4 +1,4 @@ -import 'package:flui/widgets/badge.dart'; +import 'package:flui/src/widgets/badge.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter/material.dart'; @@ -8,33 +8,27 @@ void main() { testWidgets('Badge Test', (WidgetTester tester) async { final IconData iconData = Icons.home; await tester.pumpWidget(TestContainer( - child: Container(), - bottomWidget: BottomNavigationBar( - items: [ - BottomNavigationBarItem( - icon: FLBadge( - child: Icon(iconData), - hidden: false, - shape: FLBadgeShape.circle, - text: '2', - ), - title: Text('home') - ), - BottomNavigationBarItem( - icon: FLBadge( - child: Icon(iconData), - hidden: false, - shape: FLBadgeShape.circle, - text: '2', - ), - title: Text('home') - ), - ] - ) - ) - ); + child: Container(), + bottomWidget: BottomNavigationBar(items: [ + BottomNavigationBarItem( + icon: FLBadge( + child: Icon(iconData), + hidden: false, + shape: FLBadgeShape.circle, + text: '2', + ), + title: Text('home')), + BottomNavigationBarItem( + icon: FLBadge( + child: Icon(iconData), + hidden: false, + shape: FLBadgeShape.circle, + text: '2', + ), + title: Text('home')), + ]))); expect(find.byIcon(iconData), findsNWidgets(2)); expect(find.text('2'), findsNWidgets(2)); }); -} \ No newline at end of file +} diff --git a/test/bubble_test.dart b/test/bubble_test.dart index e8a4239..9e7db49 100644 --- a/test/bubble_test.dart +++ b/test/bubble_test.dart @@ -1,5 +1,5 @@ -import 'package:flui/widgets/bubble.dart'; -import 'package:flui/widgets/bubble_menu.dart'; +import 'package:flui/src/widgets/bubble.dart'; +import 'package:flui/src/widgets/bubble_menu.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; @@ -16,7 +16,7 @@ void main() { final textFinder = find.text('hello'); expect(textFinder, findsOneWidget); }); - + testWidgets('Bubble Menu Test', (WidgetTester tester) async { const String title = 'BubbleMenu'; await tester.pumpWidget(TestContainer( @@ -28,17 +28,12 @@ void main() { ), itemBuilder: (BuildContext context) { verify(navigatorObserver.didPush(any, any)); - return [ - FLBubbleMenuItem( - text: 'item', - value: 'item' - ) - ]; + return [FLBubbleMenuItem(text: 'item', value: 'item')]; }, ), )); await tester.longPress(find.text(title)); await tester.pumpAndSettle(); -; }); -} \ No newline at end of file + }); +} diff --git a/test/button_test.dart b/test/button_test.dart index 983526f..b93d7e0 100644 --- a/test/button_test.dart +++ b/test/button_test.dart @@ -1,6 +1,6 @@ -import 'package:flui/widgets/loading_button.dart'; -import 'package:flui/widgets/flat_button.dart'; -import 'package:flui/widgets/raised_button.dart'; +import 'package:flui/src/widgets/loading_button.dart'; +import 'package:flui/src/widgets/flat_button.dart'; +import 'package:flui/src/widgets/raised_button.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter/material.dart'; import 'test_common.dart'; diff --git a/test/empty_test.dart b/test/empty_test.dart index eb2138d..9d02a74 100644 --- a/test/empty_test.dart +++ b/test/empty_test.dart @@ -1,4 +1,4 @@ -import 'package:flui/widgets/empty.dart'; +import 'package:flui/src/widgets/empty.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -26,4 +26,4 @@ void main() { expect(find.text(hint), findsOneWidget); expect(find.text(description), findsOneWidget); }); -} \ No newline at end of file +} diff --git a/test/input_test.dart b/test/input_test.dart index 736d93b..a67ac5f 100644 --- a/test/input_test.dart +++ b/test/input_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:flui/widgets/auto_complete.dart'; +import 'package:flui/src/widgets/auto_complete.dart'; import 'test_common.dart'; void main() { @@ -12,25 +12,24 @@ void main() { width: double.infinity, height: double.infinity, child: FLAutoComplete( - key: autoKey, - itemBuilder: (context, suggest) { - expect(suggest, 'Hi'); - expect(Overlay.of(context) != null, true); - return ListTile(title: Text(suggest)); - }, - child: Container( - width: 100, - height: 40, - child: TextField( - key: textFieldKey, - onChanged: (text) => autoKey.currentState.updateSuggestionList(['Hi']) - ), - ) - ), + key: autoKey, + itemBuilder: (context, suggest) { + expect(suggest, 'Hi'); + expect(Overlay.of(context) != null, true); + return ListTile(title: Text(suggest)); + }, + child: Container( + width: 100, + height: 40, + child: TextField( + key: textFieldKey, + onChanged: (text) => + autoKey.currentState.updateSuggestionList(['Hi'])), + )), ), )); - + await tester.enterText(find.byKey(textFieldKey), 'auto complete'); await tester.pumpAndSettle(); }); -} \ No newline at end of file +} diff --git a/test/label_test.dart b/test/label_test.dart index 2fdcd22..b7ed92f 100644 --- a/test/label_test.dart +++ b/test/label_test.dart @@ -1,5 +1,5 @@ import 'package:flui/flui.dart'; -import 'package:flui/widgets/copyable_label.dart'; +import 'package:flui/src/widgets/copyable_label.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/list_test.dart b/test/list_test.dart index 9d355cc..813e75f 100644 --- a/test/list_test.dart +++ b/test/list_test.dart @@ -13,7 +13,7 @@ void main() { FLStaticItemData( title: itemTitle, accessoryType: FLStaticListCellAccessoryType.accDetail, - onTap: (){}), + onTap: () {}), FLStaticItemData( title: '护眼模式', accessoryType: FLStaticListCellAccessoryType.accSwitch, @@ -54,4 +54,4 @@ void main() { expect(find.byType(Switch), findsOneWidget); expect(find.byIcon(Icons.check), findsOneWidget); }); -} \ No newline at end of file +} diff --git a/test/noticebar_test.dart b/test/noticebar_test.dart index 01b2b56..22dec76 100644 --- a/test/noticebar_test.dart +++ b/test/noticebar_test.dart @@ -1,5 +1,5 @@ import 'package:flui/flui.dart'; -import 'package:flui/widgets/notice_bar.dart'; +import 'package:flui/src/widgets/notice_bar.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -33,7 +33,7 @@ void main() { child: Container( child: FLNoticeBar.closable( text: notice, - onPressed: (){}, + onPressed: () {}, ), ), )); @@ -43,18 +43,17 @@ void main() { final GlobalKey preKey = GlobalKey(); await tester.pumpWidget(TestContainer( child: Container( - child: FLNoticeBar( - text: notice, - prefixBuilder: (BuildContext context) { - return Container( - key: preKey, - width: 20, - height: 20, - ); - }) - ), + child: FLNoticeBar( + text: notice, + prefixBuilder: (BuildContext context) { + return Container( + key: preKey, + width: 20, + height: 20, + ); + })), )); expect(find.byKey(preKey), findsOneWidget); }); -} \ No newline at end of file +} diff --git a/test/test_common.dart b/test/test_common.dart index 18b8563..43b23d3 100644 --- a/test/test_common.dart +++ b/test/test_common.dart @@ -32,6 +32,6 @@ class TestContainer extends StatelessWidget { } } -Future delayed({milliseconds : 600}) async { +Future delayed({milliseconds: 600}) async { return await Future.delayed(Duration(milliseconds: milliseconds)); } diff --git a/test/toast_test.dart b/test/toast_test.dart index 79254f5..7e3a237 100644 --- a/test/toast_test.dart +++ b/test/toast_test.dart @@ -1,16 +1,14 @@ -import 'package:flui/widgets/toast.dart'; +import 'package:flui/src/widgets/toast.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'test_common.dart'; -class ToastApp extends StatelessWidget{ +class ToastApp extends StatelessWidget { @override Widget build(BuildContext context) { return FLToastProvider( defaults: FLToastDefaults(), - child: TestContainer( - child: ToastDes() - ), + child: TestContainer(child: ToastDes()), ); } } @@ -27,4 +25,4 @@ void main() { testWidgets('Toast Test', (WidgetTester tester) async { await tester.pumpWidget(ToastApp()); }); -} \ No newline at end of file +}