From f148b9e09c1d0dc06f40afed2861abd0fe29a73b Mon Sep 17 00:00:00 2001 From: toly <1981462002@qq.com> Date: Fri, 10 Sep 2021 14:11:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AA=E5=B1=8F=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++---- .../Release-iphonesimulator/FMDB.build/dgph | Bin 0 -> 118 bytes .../Flutter.build/dgph | Bin 0 -> 118 bytes .../Pods-Runner.build/dgph | Bin 0 -> 118 bytes .../Reachability.build/dgph | Bin 0 -> 118 bytes .../connectivity.build/dgph | Bin 0 -> 118 bytes .../path_provider.build/dgph | Bin 0 -> 118 bytes .../Release-iphonesimulator/share.build/dgph | Bin 0 -> 118 bytes .../shared_preferences.build/dgph | Bin 0 -> 118 bytes .../sqflite.build/dgph | Bin 0 -> 118 bytes .../url_launcher.build/dgph | Bin 0 -> 118 bytes .../flutter/no_div_expansion_tile.dart | 2 +- .../ProxyWidget/SliderTheme/node2_diy.dart | 2 +- .../AnimatedSwitcher/node1_base.dart | 2 +- .../StreamBuilder/node1_base.dart | 2 +- .../StatelessWidget/Theme/node1_base.dart | 20 +++++++++--------- pubspec.lock | 8 +++---- 17 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 ios/build/Pods.build/Release-iphonesimulator/FMDB.build/dgph create mode 100644 ios/build/Pods.build/Release-iphonesimulator/Flutter.build/dgph create mode 100644 ios/build/Pods.build/Release-iphonesimulator/Pods-Runner.build/dgph create mode 100644 ios/build/Pods.build/Release-iphonesimulator/Reachability.build/dgph create mode 100644 ios/build/Pods.build/Release-iphonesimulator/connectivity.build/dgph create mode 100644 ios/build/Pods.build/Release-iphonesimulator/path_provider.build/dgph create mode 100644 ios/build/Pods.build/Release-iphonesimulator/share.build/dgph create mode 100644 ios/build/Pods.build/Release-iphonesimulator/shared_preferences.build/dgph create mode 100644 ios/build/Pods.build/Release-iphonesimulator/sqflite.build/dgph create mode 100644 ios/build/Pods.build/Release-iphonesimulator/url_launcher.build/dgph diff --git a/README.md b/README.md index 3fe4ede..9537afb 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,10 @@ > 当前Flutter 版本 ``` -Flutter 2.2.3 • channel stable • https://github.com/flutter/flutter.git -Framework • revision f4abaa0735 (5 weeks ago) • 2021-07-01 12:46:11 -0700 -Engine • revision 241c87ad80 -Tools • Dart 2.13.4 +Flutter 2.5.0 • channel stable • https://github.com/flutter/flutter.git +Framework • revision 4cc385b4b8 (2 days ago) • 2021-09-07 23:01:49 -0700 +Engine • revision f0826da7ef +Tools • Dart 2.14.0 ``` diff --git a/ios/build/Pods.build/Release-iphonesimulator/FMDB.build/dgph b/ios/build/Pods.build/Release-iphonesimulator/FMDB.build/dgph new file mode 100644 index 0000000000000000000000000000000000000000..f0114e61ccc8c50a552c1f19ebde88200b53fe3d GIT binary patch literal 118 zcmZ>95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq95AZP5Gce)yD$P?+uuw2EFf!yYG_f);ure^^Vqjp@XJBLvElw>eW?*8@O-yEB zW_8X_NiAYv;Rq with Sing _borderColorTween ..end = theme.dividerColor; _headerColorTween - ..begin = theme.textTheme.subhead?.color + ..begin = theme.textTheme.subtitle1!.color ..end = theme.accentColor; _iconColorTween ..begin = theme.unselectedWidgetColor diff --git a/lib/views/widgets/ProxyWidget/SliderTheme/node2_diy.dart b/lib/views/widgets/ProxyWidget/SliderTheme/node2_diy.dart index e1e0c8b..f242b6d 100644 --- a/lib/views/widgets/ProxyWidget/SliderTheme/node2_diy.dart +++ b/lib/views/widgets/ProxyWidget/SliderTheme/node2_diy.dart @@ -38,7 +38,7 @@ class _DIYSliderThemeState extends State { valueIndicatorColor: Colors.deepPurpleAccent, thumbShape: _CustomThumbShape(), valueIndicatorShape: _CustomValueIndicatorShape(), - valueIndicatorTextStyle: theme.accentTextTheme.body2! + valueIndicatorTextStyle: theme.accentTextTheme.bodyText2! .copyWith(color: theme.colorScheme.onSurface), ), child: Slider( diff --git a/lib/views/widgets/StatefulWidget/AnimatedSwitcher/node1_base.dart b/lib/views/widgets/StatefulWidget/AnimatedSwitcher/node1_base.dart index f3d87c5..e954841 100644 --- a/lib/views/widgets/StatefulWidget/AnimatedSwitcher/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/AnimatedSwitcher/node1_base.dart @@ -49,7 +49,7 @@ class _CustomAnimatedSwitcherState extends State { child: Text( '$_count', key: ValueKey(_count), - style: Theme.of(context).textTheme.display3, + style: Theme.of(context).textTheme.headline3, ), ); diff --git a/lib/views/widgets/StatefulWidget/StreamBuilder/node1_base.dart b/lib/views/widgets/StatefulWidget/StreamBuilder/node1_base.dart index 61a23f7..dde33ef 100644 --- a/lib/views/widgets/StatefulWidget/StreamBuilder/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/StreamBuilder/node1_base.dart @@ -77,7 +77,7 @@ class _CustomStreamBuilderState extends State { if (snap.connectionState == ConnectionState.active) { return Text( snap.data.toString(), - style: Theme.of(context).textTheme.display1, + style: Theme.of(context).textTheme.bodyText2, ); } if (snap.connectionState == ConnectionState.waiting) { diff --git a/lib/views/widgets/StatelessWidget/Theme/node1_base.dart b/lib/views/widgets/StatelessWidget/Theme/node1_base.dart index 2e9633b..289eb33 100644 --- a/lib/views/widgets/StatelessWidget/Theme/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/Theme/node1_base.dart @@ -15,19 +15,19 @@ class TextThemeDemo extends StatelessWidget { Widget build(BuildContext context) { TextTheme queryData = Theme.of(context).textTheme; Map styles = { - "headline: ": queryData.headline!, - "title: ": queryData.title!, - "subhead: ": queryData.subhead!, - "body1: ": queryData.body1!, - "body2: ": queryData.body2!, + "headline1: ": queryData.headline1!, + "headline2: ": queryData.headline2!, + "headline3: ": queryData.headline3!, + "headline4: ": queryData.headline4!, + "headline5: ": queryData.headline5!, + "headline6: ": queryData.headline6!, "button: ": queryData.button!, "overline: ": queryData.overline!, - "subtitle: ": queryData.subtitle!, + "subtitle1: ": queryData.subtitle1!, + "subtitle2: ": queryData.subtitle2!, "caption: ": queryData.caption!, - "display1: ": queryData.display1!, - "display2: ": queryData.display2!, - "display3: ": queryData.display3!, - "display4: ": queryData.display4!, + "bodyText1: ": queryData.bodyText1!, + "bodyText2: ": queryData.bodyText2!, }; return Container( diff --git a/pubspec.lock b/pubspec.lock index 8e5884a..25888dd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.6.1" + version: "2.8.1" bloc: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: charcode url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -197,7 +197,7 @@ packages: name: meta url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -405,7 +405,7 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.3.0" + version: "0.4.2" toggle_rotate: dependency: "direct main" description: