diff --git a/.github/ISSUE_TEMPLATE/deer-issue-template.md b/.github/ISSUE_TEMPLATE/deer-issue-template.md index 2d9c7e11f..fb8ac6204 100644 --- a/.github/ISSUE_TEMPLATE/deer-issue-template.md +++ b/.github/ISSUE_TEMPLATE/deer-issue-template.md @@ -12,7 +12,7 @@ assignees: '' - [x] 电脑系统：如：`Windows 10` - [x] 设备型号：如：`小米MIX 2s` - [x] 设备系统版本：如 `Android 10` -- [x] Flutter 版本：如 `1.22.6` +- [x] Flutter 版本：如 `2.0.0` ### 具体问题描述 ### diff --git a/README-EN.md b/README-EN.md index 2bfac9dd6..f15bf95ca 100644 --- a/README-EN.md +++ b/README-EN.md @@ -57,9 +57,9 @@ iOS and Web needs to download the code to run. [![Build Status](https://github.com/simplezhli/flutter_deer/workflows/flutter_deer%20driver/badge.svg?branch=master)](https://github.com/simplezhli/flutter_deer/actions?query=workflow%3A%22flutter_deer+driver%22+branch%3Amaster) - 1. Flutter version 1.22.6 + 1. Flutter version 2.0.0 - 2. Dart version 2.10.6 + 2. Dart version 2.12.0 ## Precautions diff --git a/README.md b/README.md index df680a70e..8d227b96e 100644 --- a/README.md +++ b/README.md @@ -61,9 +61,9 @@ iOS、Web需要自行下载代码运行。 [![Build Status](https://github.com/simplezhli/flutter_deer/workflows/flutter_deer%20driver/badge.svg?branch=master)](https://github.com/simplezhli/flutter_deer/actions?query=workflow%3A%22flutter_deer+driver%22+branch%3Amaster) - 1. Flutter version 1.22.6 + 1. Flutter version 2.0.0 - 2. Dart version 2.10.5 + 2. Dart version 2.12.0 ## 注意事项 diff --git a/integration_test/login_test.dart b/integration_test/login_test.dart index a911174fa..a5ae19d94 100644 --- a/integration_test/login_test.dart +++ b/integration_test/login_test.dart @@ -55,7 +55,9 @@ void main() { // 清除输入框文字 await tester.pumpAndSettle(); + expect(find.text('111111'), findsOneWidget); await tester.tap(find.byKey(const Key('password_delete'))); + expect(find.text('111111'), findsNothing); await tester.pumpAndSettle(); await tester.tap(find.byTooltip('Back')); diff --git a/ios/Flutter/Flutter.podspec b/ios/Flutter/Flutter.podspec index 5ca30416b..2c4421cfe 100644 --- a/ios/Flutter/Flutter.podspec +++ b/ios/Flutter/Flutter.podspec @@ -1,18 +1,18 @@ # # NOTE: This podspec is NOT to be published. It is only used as a local source! +# This is a generated file; do not edit or check into version control. # Pod::Spec.new do |s| s.name = 'Flutter' s.version = '1.0.0' s.summary = 'High-performance, high-fidelity mobile apps.' - s.description = <<-DESC -Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS. - DESC s.homepage = 'https://flutter.io' s.license = { :type => 'MIT' } s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } s.ios.deployment_target = '8.0' - s.vendored_frameworks = 'Flutter.framework' + # Framework linking is handled by Flutter tooling, not CocoaPods. + # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs. + s.vendored_frameworks = 'path/to/nothing' end diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 0f25f1a66..f3cdebfab 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -138,7 +138,6 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 57BAE4E2B439200DFEEBD55E /* [CP] Embed Pods Frameworks */, 1FC9CD116D60A071D396D7EB /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -252,24 +251,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 57BAE4E2B439200DFEEBD55E /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../Flutter/Flutter.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a16e..919434a62 100644 --- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/lib/goods/widgets/goods_item.dart b/lib/goods/widgets/goods_item.dart index 6d9ce4e1c..628a6624b 100644 --- a/lib/goods/widgets/goods_item.dart +++ b/lib/goods/widgets/goods_item.dart @@ -230,6 +230,7 @@ class _GoodsItemTag extends StatelessWidget { style: const TextStyle( color: Colors.white, fontSize: Dimens.font_sp10, + height: 1.1, ), ), ); diff --git a/lib/order/page/order_info_page.dart b/lib/order/page/order_info_page.dart index f4efef173..401398e47 100644 --- a/lib/order/page/order_info_page.dart +++ b/lib/order/page/order_info_page.dart @@ -217,7 +217,7 @@ class _OrderInfoPageState extends State { alignment: Alignment.center, child: const Text( '立减2.50元', - style: TextStyle(color: Colors.white, fontSize: Dimens.font_sp10,), + style: TextStyle(color: Colors.white, fontSize: Dimens.font_sp10, height: 1.1,), ), ), Gaps.hGap4, @@ -233,7 +233,7 @@ class _OrderInfoPageState extends State { alignment: Alignment.center, child: const Text( '抵扣2.50元', - style: TextStyle(color: Colors.white, fontSize: Dimens.font_sp10), + style: TextStyle(color: Colors.white, fontSize: Dimens.font_sp10, height: 1.1,), ), ), ) diff --git a/lib/provider/theme_provider.dart b/lib/provider/theme_provider.dart index 8d264ff84..710a0fe1b 100644 --- a/lib/provider/theme_provider.dart +++ b/lib/provider/theme_provider.dart @@ -50,8 +50,8 @@ class ThemeProvider extends ChangeNotifier { // 主要用于Material背景色 canvasColor: isDarkMode ? Colours.dark_material_bg : Colors.white, // 文字选择色（输入框复制粘贴菜单） - textSelectionColor: Colours.app_main.withAlpha(70), - textSelectionHandleColor: Colours.app_main, + // textSelectionColor: Colours.app_main.withAlpha(70), + // textSelectionHandleColor: Colours.app_main, // 稳定发行版：1.23 变更(https://flutter.dev/docs/release/breaking-changes/text-selection-theme) textSelectionTheme: TextSelectionThemeData( selectionColor: Colours.app_main.withAlpha(70), diff --git a/lib/shop/widgets/range_price_input_dialog.dart b/lib/shop/widgets/range_price_input_dialog.dart index 92d3fa83d..766b4e6dd 100644 --- a/lib/shop/widgets/range_price_input_dialog.dart +++ b/lib/shop/widgets/range_price_input_dialog.dart @@ -59,7 +59,8 @@ class _RangePriceInputDialog extends State { // 金额限制数字格式 inputFormatters: [UsNumberTextInputFormatter()], decoration: const InputDecoration( - contentPadding: EdgeInsets.only(top: 0.0, left: 16.0, right: 16.0, bottom: 14.0), + isDense: true, + contentPadding: EdgeInsets.symmetric(horizontal: 16.0), border: InputBorder.none, //hintStyle: TextStyles.textGray14, ), @@ -82,7 +83,8 @@ class _RangePriceInputDialog extends State { // 金额限制数字格式 inputFormatters: [UsNumberTextInputFormatter()], decoration: const InputDecoration( - contentPadding: EdgeInsets.only(top: 0.0, left: 16.0, right: 16.0, bottom: 14.0), + isDense: true, + contentPadding: EdgeInsets.symmetric(horizontal: 16.0), border: InputBorder.none, //hintStyle: TextStyles.textGray14, ), diff --git a/pubspec.yaml b/pubspec.yaml index 397365f55..a4fc3e2af 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,9 +17,9 @@ dependencies: flutter_localizations: sdk: flutter # Localization https://github.com/dart-lang/intl - intl: ^0.16.1 + intl: ^0.17.0 # Toast插件 https://github.com/OpenFlutter/flutter_oktoast - oktoast: ^2.3.2 + oktoast: ^3.0.0 # 网络库 https://github.com/flutterchina/dio dio: ^3.0.10 # https://github.com/ReactiveX/rxdart @@ -33,14 +33,14 @@ dependencies: # Flutter 轮播图 https://github.com/best-flutter/flutter_swiper flutter_swiper: ^1.1.6 # 启动URL的插件 https://github.com/flutter/plugins/tree/master/packages/url_launcher - url_launcher: 5.7.8 + url_launcher: 6.0.2 # 图片选择插件 https://github.com/flutter/plugins/tree/master/packages/image_picker image_picker: 0.6.7+21 image_picker_for_web: 0.1.0+2 # 侧滑删除 https://github.com/letsar/flutter_slidable flutter_slidable: ^0.5.7 # WebView插件 https://github.com/flutter/plugins/tree/master/packages/webview_flutter - webview_flutter: 1.0.7 + webview_flutter: 2.0.1 # 处理键盘事件 https://github.com/diegoveloper/flutter_keyboard_actions keyboard_actions: ^3.3.1+1 # 列表悬浮头 https://github.com/fluttercommunity/flutter_sticky_headers @@ -50,7 +50,7 @@ dependencies: # 手势识别 https://github.com/aleksanderwozniak/simple_gesture_detector # simple_gesture_detector: ^0.1.4 # 路由框架 https://github.com/theyakka/fluro - fluro: ^1.7.8 + fluro: ^2.0.3 # 图片缓存 https://github.com/renefloor/flutter_cached_network_image cached_network_image: ^2.5.0 # 格式化String https://github.com/Naddiseo/dart-sprintf @@ -60,7 +60,7 @@ dependencies: # 扫码 https://github.com/apptreesoftware/flutter_barcode_reader barcode_scan: 3.0.1 # App Shortcuts https://github.com/flutter/plugins/tree/master/packages/quick_actions - quick_actions: 0.4.0+10 + quick_actions: 0.5.0 # 刮刮卡 https://github.com/vintage/scratcher scratcher: ^1.4.1 # 高德2D地图插件 https://github.com/simplezhli/flutter_2d_amap @@ -82,7 +82,7 @@ dev_dependencies: # sdk: flutter # 单元测试 test: ^1.15.2 - intl_translation: ^0.17.10+1 +# intl_translation: ^0.17.10+1 # For information on the generic Dart part of this file, see the # following page: https:/w.dartlang.org/tools/pub/pubspec