Merge branch 'master' of http://192.168.2.201:8099/laiiihz/ansu_ui

# Conflicts:
#	lib/ansu_ui.dart

example/lib/data/color_object.dart

@@ -24,7 +24,7 @@ List<ColorObject> colorObjects = [
     codeName: 'kTextColor',
   ),
   ColorObject(
-    color: Color.fromRGBO(0, 0, 0, 0.65),
+    color: Color(0xFF999999),
     name: '次文本颜色',
     codeName: 'kTextSubColor',
   ),

example/lib/example_button.dart

@@ -50,7 +50,7 @@ class _ExampleButtonState extends State<ExampleButton> {
                 title: '立即下单',
                 onPressed: () {},
               )),
-           ListTile(
+          ListTile(
               title: Text('order'),
               subtitle: Text('null function'),
               trailing: ASButton.order(
@@ -84,11 +84,9 @@ class _ExampleButtonState extends State<ExampleButton> {
               onPressed: () {},
             ),
           ),
-          ListTile(
+          Padding(
-            trailing: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 100.w),
-              padding: EdgeInsets.symmetric(horizontal: 100.w),
+            child: ASLongButton.solid(title: 'adaptable', onPressed: () {}),
-              child: ASLongButton.solid(title: 'adaptable', onPressed: () {}),
-            ),
           ),
           SizedBox(
             height: 12.w,

example/lib/example_numeric_button.dart

@@ -15,6 +15,8 @@ class _ExampleNumericButtonState extends State<ExampleNumericButton> {
     );
   }
 
+  int _pickedValue = 0;
+
   @override
   Widget build(BuildContext context) {
     return ASScaffold(
@@ -23,17 +25,25 @@ class _ExampleNumericButtonState extends State<ExampleNumericButton> {
         builder: (context) {
           return ListView(
             children: [
-              ASNumericButton(
+              ListTile(
-                initValue: 0,
+                title: Text(_pickedValue.toString()),
-                maxValue: 10,
+                subtitle: Text('一般用法'),
-                onChange: (value) {},
+                trailing: ASNumericButton(
-                reachMax: (value) {
+                  initValue: _pickedValue,
-                  _showSnack(context, 'reach max');
+                  maxValue: 10,
-                },
+                  onChange: (value) {
-                reachMin: (value) {
+                    setState(() {
-                  _showSnack(context, 'reach min');
+                      _pickedValue = value;
-                },
+                    });
-              )
+                  },
+                  reachMax: (value) {
+                    _showSnack(context, 'reach max');
+                  },
+                  reachMin: (value) {
+                    _showSnack(context, 'reach min');
+                  },
+                ),
+              ),
             ],
           );
         },

example/lib/example_picker.dart

@@ -16,21 +16,29 @@ class _ExamplePickerState extends State<ExamplePicker> {
       title: '选择器',
       body: ListView(
         children: [
-          ASButton(
+          ListTile(
-            title: '日期选择器 DatePicker',
+            title: Text('日期选择器'),
-            onPressed: () async {
+            subtitle: Text('DatePicker'),
-              DateTime date = await asDatePicker(context);
+            trailing: ASButton(
-              Get.snackbar(date.toString(), 'MESSAGE');
+              title: '日期选择器',
-            },
+              onPressed: () async {
+                DateTime date = await asDatePicker(context);
+                Get.snackbar(date.toString(), 'MESSAGE');
+              },
+            ),
           ),
-          ASButton(
+          ListTile(
-            title: '自定义选择器',
+            title: Text('自定义选择器'),
-            onPressed: () async {
+            subtitle: Text('CustomPicker'),
-              Get.bottomSheet(ASPickerBox(
+            trailing: ASButton(
-                title: '自定义选择器',
+              title: '自定义选择器',
-                child: Text('CHILD'),
+              onPressed: () async {
-              ));
+                Get.bottomSheet(ASPickerBox(
-            },
+                  title: '自定义选择器',
+                  child: Text('CHILD'),
+                ));
+              },
+            ),
           ),
         ],
       ),

example/lib/example_scaffold.dart

@@ -1,5 +1,6 @@
 import 'package:ansu_ui/ansu_ui.dart';
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 
 class ExampleScaffold extends StatefulWidget {
   ExampleScaffold({Key key}) : super(key: key);
@@ -48,7 +49,18 @@ class _ExampleScaffoldState extends State<ExampleScaffold>
                 child: Text('open drawer'),
               );
             },
-          )
+          ),
+          TextButton(
+            onPressed: () {
+              Get.dialog(
+                ASScaffold(
+                  title: '框架 Scaffold',
+                ),
+                useSafeArea: false,
+              );
+            },
+            child: Text('open drawer'),
+          ),
         ],
       ),
     );

example/lib/example_style_color.dart

@@ -11,24 +11,13 @@ class ExampleStyleColor extends StatefulWidget {
 
 class _ExampleStyleColorState extends State<ExampleStyleColor> {
   _buildCard(ColorObject object) {
-    return Column(
+    return ListTile(
-      children: [
+      title: Text('${object.name} ${object.color.toString().substring(6, 16)}'),
-        Text(object.name),
+      subtitle: Text(object.codeName),
-        Text(object.codeName),
+      trailing: Card(
-        Text(
+        color: object.color,
-          object.color.toString(),
+        child: SizedBox(height: 50.w, width: 50.w),
-          style: TextStyle(
+      ),
-            color: object.color,
-            backgroundColor:
-                object.color.value > 0xFFAAAAAA ? Colors.black : Colors.white,
-          ),
-        ),
-        Card(
-          color: object.color,
-          child: SizedBox(height: 50.w, width: double.infinity),
-        ),
-        SizedBox(height: 16.w),
-      ],
     );
   }
 

example/lib/example_text_field.dart

@@ -0,0 +1,31 @@
+import 'package:ansu_ui/ansu_ui.dart';
+import 'package:flutter/material.dart';
+
+class ExampleTextFiled extends StatefulWidget {
+  ExampleTextFiled({Key key}) : super(key: key);
+
+  @override
+  _ExampleTextFiledState createState() => _ExampleTextFiledState();
+}
+
+class _ExampleTextFiledState extends State<ExampleTextFiled> {
+  TextEditingController _controller;
+  @override
+  Widget build(BuildContext context) {
+    return ASScaffold(
+      title: '文本框 TextFiled',
+      appBarBottom: ASSearchTextField(
+        controller: _controller,
+        hintText: '搜索',
+      ),
+      body: ListView(
+        children: [
+          ASSearchTextField.button(
+            hintText: '搜索',
+            onPressed: () {},
+          ),
+        ],
+      ),
+    );
+  }
+}

example/lib/main.dart

@@ -4,6 +4,7 @@ import 'package:example/example_dialog.dart';
 import 'package:example/example_drawer.dart';
 import 'package:example/example_listtile.dart';
 import 'package:example/example_tag.dart';
+import 'package:example/example_text_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -108,9 +109,14 @@ class _MyHomePageState extends State<MyHomePage> {
             title: '对话框 Dialog',
             onPressed: () => Get.to(ExampleDialog()),
           ),
-          ASButton.info(title:'列表内容项 ListTile',
+          ASButton.info(
-          onPressed: () => Get.to(ExampleListTile()),
+            title: '列表内容项 ListTile',
-          )
+            onPressed: () => Get.to(ExampleListTile()),
+          ),
+          ASButton.info(
+            title: '文本框 TextField',
+            onPressed: () => Get.to(ExampleTextFiled()),
+          ),
         ],
       ),
     );

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.2"
+    version: "0.0.4"
   async:
     dependency: transitive
     description:

lib/ansu_ui.dart

@@ -7,6 +7,7 @@ export 'buttons/as_numeric_button.dart';
 export 'buttons/as_bottom_button.dart';
 export 'buttons/as_gradientbutton.dart';
 export 'scaffold/as_scaffold.dart';
+
 export 'styles/as_colors.dart';
 export 'bar/as_tabbar.dart';
 export 'drawer/as_drawer.dart';
@@ -15,6 +16,8 @@ export 'pickers/as_picker_box.dart';
 export 'dialog/as_dialog.dart';
 export 'widget/as_listtile.dart';
 export 'tag/as_tag.dart';
+export 'divider/as_divider.dart';
+export 'text_field/as_search_text_field.dart';
 
 export 'utils/screen_adapter.dart';
 

lib/divider/as_divider.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+///安速水平分割线
 class ASDivider extends StatelessWidget {
   final Color color;
   final double height;
@@ -22,3 +23,26 @@ class ASDivider extends StatelessWidget {
     );
   }
 }
+
+///安速 垂直分割线
+class ASVDivider extends StatelessWidget {
+  final Color color;
+  final double height;
+  final double indent;
+  final double endIndent;
+  ASVDivider({Key key, this.indent, this.endIndent})
+      : color = const Color(0xFFE9E9E9),
+        height = 1.w,
+        super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return VerticalDivider(
+      color: color,
+      width: height,
+      thickness: height,
+      indent: indent,
+      endIndent: endIndent,
+    );
+  }
+}

lib/scaffold/as_scaffold.dart

@@ -7,9 +7,13 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 ///
 ///made with Scaffold from `Material`
 ///
-///`title`,`body`
 ///
-///`leading`,`bottomNavigationBar`,`appBarBottom`
+///
+///`title`,`body`,`leading`,`bottomNavigationBar`,`appBarBottom`,`appBar`
+///
+///title , AppBar 和 AppBarBottom 均为 `null`时不显示scaffold的AppBar
+///
+///只有AppBarBottom时只显示AppBarBottom中的内容
 class ASScaffold extends StatefulWidget {
   ///标题，可为`String`或`Text`
   final dynamic title;
@@ -30,14 +34,18 @@ class ASScaffold extends StatefulWidget {
   ///
   /// 右方向的抽屉
   final Widget endDrawer;
+
+  /// `AppBar` appBar
+  final Widget appBar;
   ASScaffold({
     Key key,
-    @required this.title,
+    this.title,
     this.leading,
     this.body,
     this.bottomNavigationBar,
     this.appBarBottom,
     this.endDrawer,
+    this.appBar,
   }) : super(key: key);
 
   @override
@@ -51,22 +59,36 @@ class _ASScaffoldState extends State<ASScaffold> {
       endDrawer: widget.endDrawer,
       backgroundColor: kBackgroundColor,
       bottomNavigationBar: widget.bottomNavigationBar,
-      appBar: AppBar(
+      appBar: widget.title == null &&
-        brightness: Brightness.light,
+              widget.appBar == null &&
-        backgroundColor: kForegroundColor,
+              widget.appBarBottom == null
-        elevation: 0,
+          ? null
-        leading: widget.leading ?? ASBackButton(),
+          : widget.appBar ??
-        centerTitle: true,
+              AppBar(
-        title: DefaultTextStyle(
+                brightness: Brightness.light,
-          style: TextStyle(
+                backgroundColor: kForegroundColor,
-            color: kTextColor,
+                elevation: 0,
-            fontSize: 18.sp,
+                toolbarHeight: widget.title == null && widget.appBar == null
-            fontWeight: FontWeight.bold,
+                    ? widget.appBarBottom.preferredSize.height + 2.0
-          ),
+                    : null,
-          child: widget.title is String ? Text(widget.title) : widget.title,
+                leading: widget.leading ?? ASBackButton(),
-        ),
+                centerTitle: true,
-        bottom: widget.appBarBottom,
+                title: DefaultTextStyle(
-      ),
+                  style: TextStyle(
+                    color: kTextColor,
+                    fontSize: 18.sp,
+                    fontWeight: FontWeight.bold,
+                  ),
+                  child: widget.title is String
+                      ? Text(widget.title)
+                      : widget.title ?? SizedBox(),
+                ),
+                bottom: widget.appBarBottom ??
+                    PreferredSize(
+                      child: SizedBox(),
+                      preferredSize: Size.fromHeight(0),
+                    ),
+              ),
       body: widget.body,
     );
   }

lib/styles/as_colors.dart

@@ -7,7 +7,7 @@ const Color kDarkColor = Color(0xFF333333);
 const Color kTextColor = kDarkColor;
 
 ///次文本颜色
-const Color kTextSubColor = Color.fromRGBO(0, 0, 0, 0.65);
+const Color kTextSubColor = Color(0xFF999999);
 
 ///主题色
 const Color kPrimaryColor = Color(0xFFF6B72D);

lib/text_field/as_search_text_field.dart

@@ -0,0 +1,159 @@
+import 'package:ansu_ui/styles/as_colors.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+///TextFiled
+class ASSearchTextField extends StatefulWidget implements PreferredSizeWidget {
+  ASSearchTextField({
+    Key key,
+    this.controller,
+    this.hintText,
+    this.onChanged,
+    this.focusNode,
+    this.onSubmitted,
+    this.margin,
+    this.onPressed,
+  })  : button = false,
+        super(key: key);
+
+  ///
+  ASSearchTextField.button({
+    Key key,
+    this.controller,
+    this.hintText,
+    this.onChanged,
+    this.focusNode,
+    this.onSubmitted,
+    this.margin,
+    this.onPressed,
+  })  : button = true,
+        super(key: key);
+
+  ///渲染成按钮
+  final bool button;
+
+  ///控制器
+  final TextEditingController controller;
+
+  ///hint Text
+  final String hintText;
+
+  ///文字变化回调
+  final ValueChanged<String> onChanged;
+
+  ///完成输入回调
+  final ValueChanged<String> onSubmitted;
+
+  ///焦点
+  final FocusNode focusNode;
+
+  ///margin
+  final EdgeInsets margin;
+
+  final VoidCallback onPressed;
+
+  @override
+  _ASSearchTextFieldState createState() => _ASSearchTextFieldState();
+
+  @override
+  Size get preferredSize => Size.fromHeight(42.w);
+}
+
+class _ASSearchTextFieldState extends State<ASSearchTextField> {
+  get _border => OutlineInputBorder(
+        borderRadius: BorderRadius.circular(21.w),
+        borderSide: BorderSide(
+          color: Color(0xFF979797),
+          width: 1.w,
+        ),
+      );
+
+  _buildButton() {
+    return Padding(
+      padding: widget.margin ??
+          EdgeInsets.symmetric(
+            horizontal: 15.w,
+            vertical: 3.w,
+          ),
+      child: MaterialButton(
+        padding: EdgeInsets.zero,
+        color: Color(0xFFF8F8F8),
+        elevation: 0,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(21.w),
+          side: BorderSide(
+            color: Color(0xFF979797),
+            width: 1.w,
+          ),
+        ),
+        child: Row(
+          children: [
+            Padding(
+              padding: EdgeInsets.only(left: 13.w, right: 8.w),
+              child: Icon(
+                Icons.search,
+                size: 16.w,
+                color: Colors.black,
+              ),
+            ),
+            Expanded(
+              child: Text(
+                widget.hintText ?? '',
+                style: TextStyle(
+                  color: kTextSubColor,
+                  fontSize: 14.sp,
+                ),
+              ),
+            ),
+          ],
+        ),
+        onPressed: widget.onPressed,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.button) return _buildButton();
+    return Container(
+      height: 42.w,
+      padding: widget.margin ??
+          EdgeInsets.symmetric(
+            horizontal: 15.w,
+            vertical: 3.w,
+          ),
+      child: TextField(
+        controller: widget.controller,
+        onChanged: widget.onChanged,
+        onSubmitted: widget.onSubmitted,
+        onTap: widget.onPressed,
+        focusNode: widget.focusNode,
+        cursorColor: kPrimaryColor,
+        textInputAction: TextInputAction.search,
+        decoration: InputDecoration(
+          fillColor: Color(0xFFF8F8F8),
+          filled: true,
+          hintText: widget.hintText,
+          hintStyle: TextStyle(
+            color: kTextSubColor,
+            fontSize: 14.sp,
+          ),
+          border: _border,
+          enabledBorder: _border,
+          focusedBorder: _border,
+          focusedErrorBorder: _border,
+          prefixIcon: Padding(
+            padding: EdgeInsets.only(left: 13.w, right: 8.w),
+            child: Icon(
+              Icons.search,
+              size: 16.w,
+              color: Colors.black,
+            ),
+          ),
+          prefixIconConstraints: BoxConstraints(minWidth: 0, minHeight: 0),
+          contentPadding: EdgeInsets.zero,
+        ),
+      ),
+    );
+  }
+}

pubspec.yaml

@@ -1,6 +1,6 @@
 name: ansu_ui
 description: A new Flutter package.
-version: 0.0.2
+version: 0.0.4
 author:
 
 environment: