diff --git a/lib/containers/chat_list.dart b/lib/containers/chat_list.dart index 90d3f65..f8020a8 100644 --- a/lib/containers/chat_list.dart +++ b/lib/containers/chat_list.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:dynamic_theme/helpers/colors.dart'; -import 'package:dynamic_theme/helpers/textThemeStyle.dart'; +import 'package:dynamic_theme/helpers/text_theme_style.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; diff --git a/lib/containers/entrance.dart b/lib/containers/entrance.dart index 5c18821..f4f05cc 100644 --- a/lib/containers/entrance.dart +++ b/lib/containers/entrance.dart @@ -102,7 +102,7 @@ class _EntranceState extends State { children: [ const Home(), const Discovery(), - Order(), + const Order(), Mine( options: widget.options ?? Options(), handleOptionsChanged: widget.handleOptionsChanged, diff --git a/lib/containers/home.dart b/lib/containers/home.dart index d029dd4..46b1fdd 100644 --- a/lib/containers/home.dart +++ b/lib/containers/home.dart @@ -132,7 +132,7 @@ class _HomeState extends State { SliverList( delegate: SliverChildBuilderDelegate( (context, index) { - if (index == 0) return SizedBox(height: 15.0); + if (index == 0) return const SizedBox(height: 15.0); return AvatarWrapBox( key: Key('item_$index'), onTap: () => Navigator.of(context).pushNamed(ChatList.routeName), diff --git a/lib/containers/mine.dart b/lib/containers/mine.dart index b535423..6849938 100644 --- a/lib/containers/mine.dart +++ b/lib/containers/mine.dart @@ -8,9 +8,10 @@ class Mine extends StatefulWidget { final Options? options; final Function? handleOptionsChanged; const Mine({ + Key? key, this.handleOptionsChanged, this.options, - }); + }) : super(key: key); static Map languageMap = {'zh': '汉语', 'en': 'English'}; @@ -24,7 +25,7 @@ class _MineState extends State { Navigator.pushNamed( context, '/newView5', - arguments: NewView( + arguments: const NewView( content: '网络搜索结果汉语- 维基百科,自由的百科全书', ), ); @@ -51,7 +52,7 @@ class _MineState extends State { 'Flutter: Dynamic Theming | Change Theme At Runtime', style: Theme.of(context).textTheme.bodyText2, ), - ButtonColor(), + const ButtonColor(), TextButton( onPressed: () => _launchRouter(context), child: Text( @@ -83,12 +84,12 @@ class _MineState extends State { onPressed: () { if (language == 'zh') { widget.handleOptionsChanged!( - widget.options!.copyWith(locale: Locale('en')), + widget.options!.copyWith(locale: const Locale('en')), ); return; } widget.handleOptionsChanged!( - widget.options!.copyWith(locale: Locale('zh')), + widget.options!.copyWith(locale: const Locale('zh')), ); }, child: Text( @@ -110,6 +111,7 @@ class _MineState extends State { } class ButtonColor extends StatefulWidget { + const ButtonColor({Key? key}) : super(key: key); @override _ButtonColorState createState() => _ButtonColorState(); } diff --git a/lib/containers/new_view.dart b/lib/containers/new_view.dart index 865bbfd..627a160 100644 --- a/lib/containers/new_view.dart +++ b/lib/containers/new_view.dart @@ -27,13 +27,13 @@ class _NewViewState extends State with RouteAware { @override void didPopNext() { // Covering route was popped off the navigator. - print('返回NewView'); + debugPrint('返回NewView'); } @override void didPush() { // Route was pushed onto navigator and is now topmost route. - print('进入NewView'); + debugPrint('进入NewView'); } @override @@ -48,7 +48,7 @@ class _NewViewState extends State with RouteAware { return CupertinoPageScaffold( navigationBar: CupertinoNavigationBar( - padding: EdgeInsetsDirectional.only(), + padding: const EdgeInsetsDirectional.only(), transitionBetweenRoutes: Platform.isIOS, middle: Text( 'NewList-${param.content}', @@ -81,7 +81,7 @@ class _NewViewState extends State with RouteAware { splashColor: Colors.transparent, onTap: () => Navigator.of(context).pushNamed( Detail.routeName, - arguments: Detail(value: 'NewView参数'), + arguments: const Detail(value: 'NewView参数'), ), child: SizedBox( height: 44.0, diff --git a/lib/containers/order.dart b/lib/containers/order.dart index 7a7baf3..9c67681 100644 --- a/lib/containers/order.dart +++ b/lib/containers/order.dart @@ -53,7 +53,7 @@ class _OrderState extends State { } class OrderCard extends StatelessWidget { - const OrderCard(); + const OrderCard({Key? key}):super(key: key); @override Widget build(BuildContext context) { return Container( diff --git a/lib/helpers/textThemeStyle.dart b/lib/helpers/text_theme_style.dart similarity index 100% rename from lib/helpers/textThemeStyle.dart rename to lib/helpers/text_theme_style.dart diff --git a/lib/widgets/common/dialog_box.dart b/lib/widgets/common/dialog_box.dart index ea14703..92c0365 100644 --- a/lib/widgets/common/dialog_box.dart +++ b/lib/widgets/common/dialog_box.dart @@ -1,5 +1,5 @@ import 'package:dynamic_theme/helpers/colors.dart'; -import 'package:dynamic_theme/helpers/textThemeStyle.dart'; +import 'package:dynamic_theme/helpers/text_theme_style.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -48,7 +48,7 @@ class DialogBox extends StatelessWidget { class BottomButton extends StatelessWidget { final bool cancelButton; - const BottomButton({this.cancelButton = false}); + const BottomButton({Key? key, this.cancelButton = false}) : super(key: key); Widget _buttonWidget(BuildContext context) { if (cancelButton) { diff --git a/lib/widgets/common/refresh_footer.dart b/lib/widgets/common/refresh_footer.dart index 859a4b3..17cd93e 100644 --- a/lib/widgets/common/refresh_footer.dart +++ b/lib/widgets/common/refresh_footer.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:dynamic_theme/helpers/colors.dart'; -import 'package:dynamic_theme/helpers/textThemeStyle.dart'; +import 'package:dynamic_theme/helpers/text_theme_style.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; @@ -97,7 +97,7 @@ class RefreshFooter extends Footer { loadIndicatorExtent: loadIndicatorExtent, axisDirection: axisDirection, float: float, - completeDuration: completeDuration ?? Duration(milliseconds: 300), + completeDuration: completeDuration ?? const Duration(milliseconds: 300), enableInfiniteLoad: enableInfiniteLoad, success: success, noMore: noMore, diff --git a/lib/widgets/common/refresh_header.dart b/lib/widgets/common/refresh_header.dart index 71b375a..24f47f9 100644 --- a/lib/widgets/common/refresh_header.dart +++ b/lib/widgets/common/refresh_header.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:math'; import 'package:dynamic_theme/helpers/colors.dart'; -import 'package:dynamic_theme/helpers/textThemeStyle.dart'; +import 'package:dynamic_theme/helpers/text_theme_style.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; diff --git a/lib/widgets/entrance/navigation_bar.dart b/lib/widgets/entrance/navigation_bar.dart index 8bac73c..c61b195 100644 --- a/lib/widgets/entrance/navigation_bar.dart +++ b/lib/widgets/entrance/navigation_bar.dart @@ -7,8 +7,9 @@ class NavigationBar extends StatelessWidget { final Function onChange; const NavigationBar({ required this.onChange, + Key? key, this.activeKey = 'HOME', - }); + }) : super(key: key); @override Widget build(BuildContext context) => Container( @@ -58,9 +59,7 @@ class NavigationBar extends StatelessWidget { : ColorTheme.of(context).cubeColor, ), ), - SizedBox( - height: 4.0, - ) + const SizedBox(height: 4.0) ], ), ), diff --git a/test/widget_test.dart b/test/widget_test.dart index a00fcd6..0e25da8 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -12,7 +12,7 @@ import 'package:flutter_test/flutter_test.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(App()); + await tester.pumpWidget(const App()); // Tap the '+' icon and trigger a frame. await tester.tap(find.byType(TextButton));