diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 309af34..1c922f8 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,3 +1,3 @@ { - "flutterSdkVersion": "2.0.0" + "flutterSdkVersion": "stable" } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index c6471a7..67dba15 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "dart.flutterSdkPath": "/Users/akufe/fvm/versions/2.0.0" + "dart.flutterSdkPath": "/Users/akufe/fvm/versions/stable" } \ No newline at end of file diff --git a/example/lib/main.dart b/example/lib/main.dart index 72da06b..b911899 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -18,7 +18,6 @@ class MyApp extends StatelessWidget { Widget build(BuildContext context) { return ScreenUtilInit( designSize: Size(375, 812), - allowFontScaling: false, builder: () => GetMaterialApp( title: 'Flutter Demo', home: MyHomePage(), diff --git a/example/pubspec.lock b/example/pubspec.lock index 5ff7ac3..f587c51 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -10,6 +10,13 @@ packages: url: "http://159.75.73.143:8080/laiiihz/animated_collection.git" source: git version: "0.0.1" + animator: + dependency: transitive + description: + name: animator + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.0" ansu_ui: dependency: "direct main" description: @@ -21,86 +28,86 @@ packages: dependency: "direct main" description: name: args - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.0" async: dependency: transitive description: name: async - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.5.0" auto_size_text_pk: dependency: transitive description: name: auto_size_text_pk - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "3.0.0-nullsafety.1" + version: "3.0.0" bot_toast: dependency: transitive description: name: bot_toast - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "4.0.0+1" + version: "4.0.1" characters: dependency: transitive description: name: characters - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.0" charcode: dependency: transitive description: name: charcode - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.2.0" cli_util: dependency: transitive description: name: cli_util - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.0" collection: dependency: transitive description: name: collection - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.15.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.0.2" expandable: dependency: transitive description: name: expandable - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "4.1.4" + version: "5.0.1" file: dependency: transitive description: name: file - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "5.2.1" + version: "6.1.0" flutter: dependency: "direct main" description: flutter @@ -109,10 +116,12 @@ packages: flutter_easyrefresh: dependency: transitive description: - name: flutter_easyrefresh - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.8" + path: "." + ref: v2 + resolved-ref: "73f03412c46b4662db6fb92fa18902d82c52e6b6" + url: "https://github.com/xuelongqy/flutter_easyrefresh" + source: git + version: "2.2.0" flutter_localizations: dependency: "direct main" description: flutter @@ -122,126 +131,124 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.1" flutter_screenutil: dependency: transitive description: name: flutter_screenutil - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "5.0.0-nullsafety.7" + version: "5.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" get: dependency: "direct main" description: name: get - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "4.0.0-nullsafety.2" + version: "4.1.4" glob: dependency: transitive description: name: glob - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "2.0.1" grinder: dependency: "direct main" description: name: grinder - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.8.6" + version: "0.9.0" http: dependency: transitive description: name: http - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.13.0" + version: "0.13.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "4.0.0" image_picker: dependency: transitive description: name: image_picker - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.4" + image_picker_for_web: + dependency: transitive + description: + name: image_picker_for_web + url: "https://pub.dartlang.org" source: hosted - version: "0.7.2" + version: "2.0.0" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.1" intl: dependency: transitive description: name: intl - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.17.0" js: dependency: transitive description: name: js - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.6.3" lpinyin: dependency: transitive description: name: lpinyin - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.1" meta: dependency: transitive description: name: meta - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.3.0" - node_interop: - dependency: transitive - description: - name: node_interop - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.2.1" - node_io: - dependency: transitive - description: - name: node_io - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.2.0" path: dependency: transitive description: name: path - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.8.0" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.11.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.0" sky_engine: @@ -253,46 +260,58 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.8.1" + states_rebuilder: + dependency: transitive + description: + name: states_rebuilder + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.0+1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.2.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.3.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.1.0" velocity_x: dependency: transitive description: - path: "." - ref: "dev#null-safety" - resolved-ref: "7fddc3889565d74dcfcca5b73011efa54ccfdad3" - url: "http://159.75.73.143:8080/akufe/velocityX" - source: git - version: "2.3.1-nullsafety.0" + name: velocity_x + url: "https://pub.dartlang.org" + source: hosted + version: "2.6.1" + vxstate: + dependency: transitive + description: + name: vxstate + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.24.0-0" + flutter: ">=2.0.0" diff --git a/pubspec.lock b/pubspec.lock index 2ef894e..800be4b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -10,74 +10,81 @@ packages: url: "http://159.75.73.143:8080/laiiihz/animated_collection.git" source: git version: "0.0.1" + animator: + dependency: transitive + description: + name: animator + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.0" async: dependency: transitive description: name: async - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.5.0" auto_size_text_pk: dependency: transitive description: name: auto_size_text_pk - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "3.0.0-nullsafety.1" + version: "3.0.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.1.0" bot_toast: dependency: "direct main" description: name: bot_toast - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "4.0.0+1" + version: "4.0.1" characters: dependency: transitive description: name: characters - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.0" charcode: dependency: transitive description: name: charcode - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.2.0" clock: dependency: transitive description: name: clock - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.0" collection: dependency: transitive description: name: collection - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.15.0" expandable: dependency: "direct main" description: name: expandable - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "4.1.4" + version: "5.0.1" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.2.0" flutter: @@ -88,111 +95,132 @@ packages: flutter_easyrefresh: dependency: "direct main" description: - name: flutter_easyrefresh - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.8" + path: "." + ref: v2 + resolved-ref: "73f03412c46b4662db6fb92fa18902d82c52e6b6" + url: "https://github.com/xuelongqy/flutter_easyrefresh" + source: git + version: "2.2.0" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.1" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "5.0.0-nullsafety.7" + version: "5.0.0" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" get: dependency: "direct main" description: name: get - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "4.0.0-nullsafety.2" + version: "4.1.4" http: dependency: transitive description: name: http - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.13.0" + version: "0.13.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "4.0.0" image_picker: dependency: "direct main" description: name: image_picker - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted - version: "0.7.2" + version: "0.7.4" + image_picker_for_web: + dependency: transitive + description: + name: image_picker_for_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.1" intl: dependency: transitive description: name: intl - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.17.0" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.3" lpinyin: dependency: "direct main" description: name: lpinyin - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.12.10" meta: dependency: transitive description: name: meta - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.3.0" path: dependency: transitive description: name: path - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.8.0" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.11.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.0" sky_engine: @@ -204,67 +232,79 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.8.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.10.0" + states_rebuilder: + dependency: transitive + description: + name: states_rebuilder + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.0+1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.2.0" test_api: dependency: transitive description: name: test_api - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "0.2.19" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.3.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.flutter-io.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.1.0" velocity_x: dependency: "direct main" description: - path: "." - ref: "dev#null-safety" - resolved-ref: "7fddc3889565d74dcfcca5b73011efa54ccfdad3" - url: "http://159.75.73.143:8080/akufe/velocityX" - source: git - version: "2.3.1-nullsafety.0" + name: velocity_x + url: "https://pub.dartlang.org" + source: hosted + version: "2.6.1" + vxstate: + dependency: transitive + description: + name: vxstate + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.24.0-0" + flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 4bca20c..9fda783 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,20 +10,20 @@ environment: dependencies: flutter: sdk: flutter - flutter_screenutil: ^5.0.0-nullsafety.7 - flutter_easyrefresh: ^2.1.8 + flutter_screenutil: ^5.0.0 + flutter_easyrefresh: + git: + url: https://github.com/xuelongqy/flutter_easyrefresh + ref: v2 lpinyin: ^2.0.1 image_picker: ^0.7.2 bot_toast: ^4.0.0+1 - velocity_x: - git: - url: http://159.75.73.143:8080/akufe/velocityX - ref: dev#null-safety - expandable: ^4.1.4 + velocity_x: ^2.6.1 + expandable: ^5.0.1 animated_collection: git: url: http://159.75.73.143:8080/laiiihz/animated_collection.git - get: ^4.0.0-nullsafety.2 + get: ^4.1.3 dev_dependencies: flutter_test: