diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 1c922f8..de7d397 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,3 +1,4 @@ { - "flutterSdkVersion": "stable" + "flutterSdkVersion": "2.0.2", + "flavors": {} } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 67dba15..2ccc2b5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "dart.flutterSdkPath": "/Users/akufe/fvm/versions/stable" + "dart.flutterSdkPath": "/Users/zhangmeng/fvm/versions/2.0.2" } \ No newline at end of file diff --git a/example/lib/widgets/example_picker.dart b/example/lib/widgets/example_picker.dart index e8fedec..0379ea1 100644 --- a/example/lib/widgets/example_picker.dart +++ b/example/lib/widgets/example_picker.dart @@ -36,7 +36,7 @@ class _ExamplePickerState extends State { // BEGIN picker ListTile( title: Text('日期选择器'), - subtitle: Text('DatePicker'), + subtitle: Text('DatePicker/asDatePicker'), trailing: ASButton( title: '日期选择器', onPressed: () async { @@ -47,7 +47,7 @@ class _ExamplePickerState extends State { ), ListTile( title: Text('自定义选择器'), - subtitle: Text('CustomPicker'), + subtitle: Text('CustomPicker/ASPickerBox'), trailing: ASButton( title: '自定义选择器', onPressed: () async { @@ -60,7 +60,7 @@ class _ExamplePickerState extends State { ), ListTile( title: Text('时间区间选择器'), - subtitle: Text('DateRangePicker'), + subtitle: Text('DateRangePicker/show2DatePicker'), trailing: ASButton( title: '时间区间选择器', onPressed: () async { @@ -71,7 +71,7 @@ class _ExamplePickerState extends State { ), ListTile( title: Text('图片选择器'), - subtitle: Text('ImagePicker'), + subtitle: Text('ImagePicker/camView'), trailing: ASButton( title: '图片选择器', onPressed: () async { @@ -82,7 +82,7 @@ class _ExamplePickerState extends State { ), ListTile( title: Text('图片选择器'), - subtitle: Text('ImagePicker'), + subtitle: Text('ImagePicker/pickImageFile'), trailing: ASButton( title: '图片选择器', onPressed: () async { diff --git a/example/lib/widgets/example_text_field.dart b/example/lib/widgets/example_text_field.dart index 03acd7c..54194bd 100644 --- a/example/lib/widgets/example_text_field.dart +++ b/example/lib/widgets/example_text_field.dart @@ -17,10 +17,13 @@ class _ExampleTextFiledState extends State { backgroundColor: kForegroundColor, body: ListView( children: [ + 'ASSearchTextField'.text.size(18.sp).make(), ASSearchTextField( controller: _controller, hintText: '搜索', ), + 40.w.heightBox, + 'ASSearchTextField.button'.text.size(18.sp).black.make(), ASSearchTextField.button( hintText: '搜索', onPressed: () {}, diff --git a/example/pubspec.lock b/example/pubspec.lock index 5983b84..f805e34 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,7 +7,7 @@ packages: path: "." ref: HEAD resolved-ref: d724abf91595f58ed58f6c722ebe60acdb750c67 - url: "http://159.75.73.143:8080/laiiihz/animated_collection.git" + url: "https://git.oa00.com/flutter_pub/animated_collection.git" source: git version: "0.0.1" animator: diff --git a/lib/buttons/as_numeric_button.dart b/lib/buttons/as_numeric_button.dart index ae5f8a7..a581314 100644 --- a/lib/buttons/as_numeric_button.dart +++ b/lib/buttons/as_numeric_button.dart @@ -148,6 +148,7 @@ class _ASNumericButtonState extends State { textAlign: TextAlign.center, decoration: InputDecoration( border: InputBorder.none, + contentPadding: EdgeInsets.zero, isDense: true, suffixText: widget.suffix, suffixStyle: TextStyle( diff --git a/pubspec.lock b/pubspec.lock index d392066..347e0bd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: path: "." ref: HEAD resolved-ref: d724abf91595f58ed58f6c722ebe60acdb750c67 - url: "http://159.75.73.143:8080/laiiihz/animated_collection.git" + url: "https://git.oa00.com/flutter_pub/animated_collection.git" source: git version: "0.0.1" animator: @@ -16,7 +16,7 @@ packages: name: animator url: "https://pub.flutter-io.cn" source: hosted - version: "3.0.0" + version: "3.1.0" async: dependency: transitive description: @@ -73,6 +73,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.15.0" + cross_file: + dependency: transitive + description: + name: cross_file + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.3.1+4" expandable: dependency: "direct main" description: @@ -105,14 +112,14 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.1" + version: "2.0.2" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil url: "https://pub.flutter-io.cn" source: hosted - version: "5.0.0" + version: "5.0.0+2" flutter_test: dependency: "direct dev" description: flutter @@ -136,7 +143,7 @@ packages: name: http url: "https://pub.flutter-io.cn" source: hosted - version: "0.13.1" + version: "0.13.3" http_parser: dependency: transitive description: @@ -150,21 +157,21 @@ packages: name: image_picker url: "https://pub.flutter-io.cn" source: hosted - version: "0.7.4" + version: "0.7.5+4" image_picker_for_web: dependency: transitive description: name: image_picker_for_web url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.0" + version: "2.1.0" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.1" + version: "2.2.0" intl: dependency: transitive description: @@ -185,7 +192,7 @@ packages: name: lpinyin url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.1" + version: "2.0.3" matcher: dependency: transitive description: @@ -213,14 +220,14 @@ packages: name: pedantic url: "https://pub.flutter-io.cn" source: hosted - version: "1.11.0" + version: "1.11.1" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.0" + version: "2.0.1" sky_engine: dependency: transitive description: flutter @@ -246,7 +253,7 @@ packages: name: states_rebuilder url: "https://pub.flutter-io.cn" source: hosted - version: "4.0.0+1" + version: "4.3.0" stream_channel: dependency: transitive description: @@ -302,7 +309,7 @@ packages: name: vxstate url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.1" + version: "2.1.0" sdks: dart: ">=2.12.0 <3.0.0" flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 3ee9f9e..2079115 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,6 +2,7 @@ name: ansu_ui description: A new Flutter package. version: 0.0.4 author: +publish_to: none environment: sdk: ">=2.12.0 <3.0.0" @@ -19,7 +20,7 @@ dependencies: expandable: ^5.0.1 animated_collection: git: - url: http://159.75.73.143:8080/laiiihz/animated_collection.git + url: https://git.oa00.com/flutter_pub/animated_collection.git get: ^4.1.3 dev_dependencies: