update

example/lib/main.dart

@@ -57,6 +57,7 @@ class _MyHomePageState extends State<MyHomePage> with TickerProviderStateMixin {
 
   @override
   Widget build(BuildContext context) {
+    print(Theme.of(context).textTheme.headline1.fontFamily);
     return ASScaffold(
       leading: navigator.canPop()
           ? IconButton(

example/lib/widgets/example_picker.dart

@@ -90,6 +90,16 @@ class _ExamplePickerState extends State<ExamplePicker> {
               },
             ),
           ),
+          ListTile(
+            title: Text('图片选择器'),
+            subtitle: Text('ImagePicker'),
+            trailing: ASButton(
+              title: '图片选择器',
+              onPressed: () async {
+                File file = await pickImageFile();
+              },
+            ),
+          ),
           // END
         ],
       ),

lib/ansu_ui.dart

@@ -9,6 +9,7 @@ export 'buttons/as_bottom_button.dart';
 export 'buttons/as_gradient_button.dart';
 export 'buttons/as_radio_button.dart';
 export 'buttons/as_material_button.dart';
+export 'buttons/as_check_button.dart';
 
 //scaffold
 export 'scaffold/as_scaffold.dart';
@@ -70,6 +71,8 @@ export 'extension/widget_extension.dart';
 export 'extension/string_extension.dart';
 export 'extension/text_style_extension.dart';
 export 'extension/image_extension.dart';
-export 'package:velocity_x/velocity_x.dart';
 
 export 'theme/as_theme.dart';
+
+//third party
+export 'package:velocity_x/velocity_x.dart';

lib/bar/as_tabbar.dart

@@ -21,12 +21,15 @@ class ASTabBar extends StatelessWidget implements PreferredSizeWidget {
 
   ///可滚动
   final bool isScrollable;
-  ASTabBar(
+
-      {Key? key,
+  final ValueChanged<int>? onTap;
+  ASTabBar({
+    Key? key,
     required this.items,
     required this.controller,
-      this.isScrollable = false})
+    this.isScrollable = false,
-      : tabItems = null,
+    this.onTap,
+  })  : tabItems = null,
         super(key: key);
 
   /// ## TabBar with tag
@@ -41,12 +44,13 @@ class ASTabBar extends StatelessWidget implements PreferredSizeWidget {
   /// )
   ///```
   ///
-  ASTabBar.tag(
+  ASTabBar.tag({
-      {Key? key,
+    Key? key,
     required this.tabItems,
     required this.controller,
-      this.isScrollable = false})
+    this.isScrollable = false,
-      : items = null,
+    this.onTap,
+  })  : items = null,
         super(key: key);
 
   bool get isTag => items?.isEmpty ?? true;
@@ -57,6 +61,7 @@ class ASTabBar extends StatelessWidget implements PreferredSizeWidget {
       child: TabBar(
         isScrollable: isScrollable,
         controller: controller,
+        onTap: onTap,
         tabs: isTag
             ? tabItems!.map((e) {
                 return Tab(

lib/buttons/as_back_button.dart

@@ -24,7 +24,11 @@ class ASBackButton extends StatelessWidget {
               size: 24,
               color: color,
             ),
-            onPressed: () => Navigator.pop(context),
+            onPressed: () {
+              if (Navigator.canPop(context)) {
+                Navigator.pop(context);
+              }
+            },
           )
         : SizedBox();
   }

lib/buttons/as_check_button.dart

@@ -0,0 +1,36 @@
+import 'package:ansu_ui/styles/as_colors.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:flutter/material.dart';
+
+class ASCheckButton<T> extends StatelessWidget {
+  final T object;
+  final bool checked;
+  final VoidCallback onTap;
+
+  final String title;
+  const ASCheckButton({
+    Key? key,
+    required this.object,
+    required this.onTap,
+    this.checked = false,
+    required this.title,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialButton(
+      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+      height: 31.w,
+      onPressed: onTap,
+      shape: StadiumBorder(),
+      color: checked ? kPrimaryColor : Color(0xFFF2F2F2),
+      elevation: 0,
+      child: Text(
+        title,
+        style: TextStyle(
+          color: checked ? kLightTextColor : kTextColor,
+        ),
+      ),
+    );
+  }
+}

lib/dialog/as_bottom_dialog_item.dart

@@ -17,7 +17,6 @@ class ASBottomDialogItem extends StatelessWidget {
       height: 48.w,
       color: kForegroundColor,
       onPressed: () {
-        Navigator.pop(context);
         onPressed!();
       },
       child: DefaultTextStyle(

lib/list_tile/as_edit_tile.dart

@@ -5,29 +5,23 @@ import 'package:ansu_ui/extension/num_extension.dart';
 
 class ASEditTile extends StatelessWidget {
   final Widget? title;
-  final FocusNode? node;
   final String? hintText;
+  final Widget? prefix;
   final TextEditingController? controller;
+  final Function(String text)? onChange;
+  final Function(String text)? onSubmitted;
   ASEditTile({
     Key? key,
     this.title,
-    this.node,
     this.hintText,
     this.controller,
+    this.prefix,
+    this.onChange,
+    this.onSubmitted,
   }) : super(key: key);
-
-  final FocusNode? _node = FocusNode();
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
+    return ConstrainedBox(
-      onTap: () {
-        if (node != null) {
-          node?.requestFocus();
-        } else {
-          _node?.requestFocus();
-        }
-      },
-      child: ConstrainedBox(
       constraints: BoxConstraints(minHeight: 46.w),
       child: Row(
         children: [
@@ -41,10 +35,12 @@ class ASEditTile extends StatelessWidget {
               child: title ?? Text(''),
             ),
           ),
+          prefix ?? SizedBox(),
           Expanded(
             child: TextField(
-                focusNode: node ?? _node,
               controller: controller,
+              onChanged: onChange,
+              onSubmitted: onSubmitted,
               textAlign: TextAlign.end,
               style: TextStyle(
                 fontSize: 14.sp,
@@ -66,7 +62,6 @@ class ASEditTile extends StatelessWidget {
           10.wb,
         ],
       ),
-      ),
     );
   }
 }

lib/theme/as_theme.dart

@@ -9,15 +9,22 @@ class ASTheme {
   }
 
   static SystemUiOverlayStyle get defaultSystemStyle => SystemUiOverlayStyle(
-        systemNavigationBarColor: Colors.white,
+        systemNavigationBarColor: kBackgroundColor,
         statusBarColor: Colors.transparent,
         statusBarIconBrightness: Brightness.light,
         statusBarBrightness: Brightness.light,
       );
 
+  static SystemUiOverlayStyle get yellow =>
+      defaultSystemStyle.copyWith(systemNavigationBarColor: kPrimaryColor);
+
   static ThemeData get lightTheme =>
       ThemeData(primarySwatch: Colors.yellow).copyWith(
-        textTheme: TextTheme().apply(displayColor: Color(0xFF333333)),
+        textTheme: ThemeData.light().textTheme.apply(
+              displayColor: Color(0xFF333333),
+              bodyColor: Color(0xFF333333),
+            ),
+        inputDecorationTheme: InputDecorationTheme(),
         primaryColor: kPrimaryColor,
         textButtonTheme: TextButtonThemeData(
           style: ButtonStyle(

lib/utils/camera_util.dart

@@ -1,9 +1,42 @@
 import 'dart:io';
 
+import 'package:ansu_ui/dialog/as_bottom_dialog.dart';
+import 'package:ansu_ui/dialog/as_bottom_dialog_item.dart';
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:ansu_ui/utils/camera_view.dart';
 
+Future<File?> pickImageFile(
+    {double maxHeight = 3000, double maxWidth = 3000}) async {
+  File? file = await Get.bottomSheet(ASBottomDialog(
+    items: [
+      ASBottomDialogItem(
+        title: Text('相机'),
+        onPressed: () async {
+          Get.back(result: await camFile());
+        },
+      ),
+      ASBottomDialogItem(
+        title: Text('相册'),
+        onPressed: () async {
+          var pickedFile = await ImagePicker().getImage(
+            source: ImageSource.gallery,
+            maxHeight: maxHeight,
+            maxWidth: maxWidth,
+          );
+          if (pickedFile != null) {
+            Get.back(result: File(pickedFile.path));
+          } else {
+            Get.back();
+          }
+        },
+      ),
+    ],
+  ));
+  return file;
+}
+
 ///获取相机文件
 Future<File?> camFile({double maxHeight = 3000, double maxWidth = 3000}) async {
   var pickedFile = await ImagePicker().getImage(

pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.0.4
 author:
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.17.0"
 
 dependencies:
@@ -25,4 +25,3 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-flutter: