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

# Conflicts:
#	example/lib/main.dart

example/lib/example_button.dart

@@ -0,0 +1,32 @@
+import 'package:ansu_ui/ansu_ui.dart';
+import 'package:flutter/material.dart';
+
+class ExampleButton extends StatefulWidget {
+  ExampleButton({Key key}) : super(key: key);
+
+  @override
+  _ExampleButtonState createState() => _ExampleButtonState();
+}
+
+class _ExampleButtonState extends State<ExampleButton> {
+  @override
+  Widget build(BuildContext context) {
+    return ASScaffold(
+      title: 'Button',
+      body: ListView(
+        children: [  ASButton.delete(title: '删除订单',onpressed: (){},),
+          ASButton.info(title: '删除订单',onpressed: (){},),
+          ASButton.warn(title: '删除订单',onpressed: (){},),
+          ASButton.opration(title: '删除订单',onpressed: (){},),
+          SizedBox(height: 12.w),
+          ASLongButton.solid(title: '确认',onpressed: (){},),
+          ASLongButton.hollow(title: '确认',onpressed: (){},),
+          Padding(
+            padding: EdgeInsets.symmetric(horizontal: 100.w),
+            child: ASLongButton.solid(title: 'null',onpressed:(){} ),
+          ),
+        ],
+      ),
+    );
+  }
+}

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);
@@ -8,11 +9,47 @@ class ExampleScaffold extends StatefulWidget {
   _ExampleScaffoldState createState() => _ExampleScaffoldState();
 }
 
-class _ExampleScaffoldState extends State<ExampleScaffold> {
+class _ExampleScaffoldState extends State<ExampleScaffold>
+    with TickerProviderStateMixin {
+  TabController _tabController;
+  List<String> tabs;
+
+  @override
+  void initState() {
+    super.initState();
+    tabs = List.generate(10, (index) => 'Tab $index');
+    _tabController = TabController(
+      length: tabs.length,
+      vsync: this,
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return ASScaffold(
-      title: '标题',
+      title: '标题 SCaffold',
+      appBarBottom: ASTabBar(
+        items: tabs,
+        isScrollable: true,
+        controller: _tabController,
+      ),
+      endDrawer: ASDrawer(
+        child: Text('DRAWER'),
+      ),
+      body: ListView(
+        children: [
+          Builder(
+            builder: (context) {
+              return TextButton(
+                onPressed: () {
+                  Scaffold.of(context).openEndDrawer();
+                },
+                child: Text('open drawer'),
+              );
+            },
+          )
+        ],
+      ),
     );
   }
 }

example/lib/main.dart

@@ -1,10 +1,9 @@
 import 'package:ansu_ui/ansu_ui.dart';
-import 'package:ansu_ui/buttons/as_button.dart';
-import 'package:ansu_ui/buttons/as_longbutton.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
 import 'example_scaffold.dart';
+import 'example_button.dart';
 
 void main() {
   runApp(MyApp());
@@ -39,29 +38,12 @@ class MyHomePage extends StatefulWidget {
 class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return ASScaffold(
-      appBar: AppBar(
+      title: '安速组件',
-        title: Text('title'),
-      ),
       body: ListView(
         children: [
-          ASButton.delete(title: '删除订单',onpressed: (){},),
+          ASButton.info(title:'Button',onpressed: () => Get.to(ExampleButton())),
-          ASButton.info(title: '删除订单',onpressed: (){},),
+          ASButton.info(title:'Scaffold', onpressed:() => Get.to(ExampleScaffold())),
-          ASButton.warn(title: '删除订单',onpressed: (){},),
-          ASButton.opration(title: '删除订单',onpressed: (){},),
-          SizedBox(height: 12.w),
-          ASLongButton.solid(title: '确认',onpressed: (){},),
-          ASLongButton.hollow(title: '确认',onpressed: (){},),
-          Padding(
-            padding: EdgeInsets.symmetric(horizontal: 100.w),
-            child: ASLongButton.solid(title: 'null',onpressed:(){} ),
-          ),
-          
-          TextButton(
-              onPressed: () {
-                Get.to(ExampleScaffold());
-              },
-              child: Text('SCAFFOLD')),
         ],
       ),
     );

lib/ansu_ui.dart

@@ -1,8 +1,13 @@
 library ansu_ui;
 
 export 'buttons/as_button.dart';
+export 'buttons/as_longbutton.dart';
+export 'buttons/as_back_button.dart';
 export 'scaffold/as_scaffold.dart';
 export 'styles/as_colors.dart';
+export 'bar/as_tabbar.dart';
+export 'drawer/as_drawer.dart';
+export 'utils/screen_adapter.dart';
 
 //`BOTTOM` is external lib
 export 'package:flutter_screenutil/flutter_screenutil.dart';

lib/bar/as_tab_indicator.dart

@@ -0,0 +1,84 @@
+import 'package:flutter/material.dart';
+
+///渐变indicator
+///
+///fork from TabIndicator
+///
+///仅仅在发现页面中使用
+class ASTabIndicator extends Decoration {
+  const ASTabIndicator({
+    this.borderSide = const BorderSide(width: 4.0, color: Colors.white),
+    this.insets = EdgeInsets.zero,
+  })  : assert(borderSide != null),
+        assert(insets != null);
+
+  final BorderSide borderSide;
+  final EdgeInsetsGeometry insets;
+
+  @override
+  Decoration lerpFrom(Decoration a, double t) {
+    if (a is ASTabIndicator) {
+      return ASTabIndicator(
+        borderSide: BorderSide.lerp(a.borderSide, borderSide, t),
+        insets: EdgeInsetsGeometry.lerp(a.insets, insets, t),
+      );
+    }
+    return super.lerpFrom(a, t);
+  }
+
+  @override
+  Decoration lerpTo(Decoration b, double t) {
+    if (b is ASTabIndicator) {
+      return ASTabIndicator(
+        borderSide: BorderSide.lerp(borderSide, b.borderSide, t),
+        insets: EdgeInsetsGeometry.lerp(insets, b.insets, t),
+      );
+    }
+    return super.lerpTo(b, t);
+  }
+
+  @override
+  _UnderlinePainter createBoxPainter([VoidCallback onChanged]) {
+    return _UnderlinePainter(this, onChanged);
+  }
+}
+
+class _UnderlinePainter extends BoxPainter {
+  _UnderlinePainter(this.decoration, VoidCallback onChanged)
+      : assert(decoration != null),
+        super(onChanged);
+
+  final ASTabIndicator decoration;
+
+  BorderSide get borderSide => decoration.borderSide;
+  EdgeInsetsGeometry get insets => decoration.insets;
+
+  Rect _indicatorRectFor(Rect rect, TextDirection textDirection) {
+    assert(rect != null);
+    assert(textDirection != null);
+    final Rect indicator = insets.resolve(textDirection).deflateRect(rect);
+    return Rect.fromLTWH(
+      indicator.left,
+      indicator.bottom - borderSide.width,
+      indicator.width,
+      borderSide.width,
+    );
+  }
+
+  @override
+  void paint(Canvas canvas, Offset offset, ImageConfiguration configuration) {
+    assert(configuration != null);
+    assert(configuration.size != null);
+    final Rect rect = offset & configuration.size;
+    final TextDirection textDirection = configuration.textDirection;
+    final Rect indicator =
+        _indicatorRectFor(rect, textDirection).deflate(borderSide.width / 2.0);
+    final Paint paint = borderSide.toPaint()
+      ..strokeCap = StrokeCap.square
+      ..shader = LinearGradient(colors: [
+        Color(0xFFE50112),
+        Color(0xFFFFB1B1),
+      ]).createShader(rect);
+    canvas.drawLine(indicator.bottomLeft, indicator.bottomRight, paint);
+  }
+}

lib/bar/as_tabbar.dart

@@ -0,0 +1,51 @@
+import 'package:ansu_ui/styles/as_colors.dart';
+import 'package:ansu_ui/bar/as_tab_indicator.dart';
+import 'package:flutter/material.dart';
+
+/// ## 安速Tabbar
+///
+/// [items]
+///
+/// [controller] see more TabController
+class ASTabBar extends StatefulWidget implements PreferredSizeWidget {
+  final List<String> items;
+  final TabController controller;
+
+  ///可滚动
+  final bool isScrollable;
+  ASTabBar(
+      {Key key,
+      @required this.items,
+      @required this.controller,
+      this.isScrollable = false})
+      : super(key: key);
+
+  @override
+  _ASTabBarState createState() => _ASTabBarState();
+
+  @override
+  Size get preferredSize => Size.fromHeight(46);
+}
+
+class _ASTabBarState extends State<ASTabBar> {
+  @override
+  Widget build(BuildContext context) {
+    return TabBar(
+      isScrollable: widget.isScrollable,
+      controller: widget.controller,
+      tabs: widget.items.map((e) => Tab(text: e)).toList(),
+      labelStyle: TextStyle(
+        fontSize: 14,
+        fontWeight: FontWeight.bold,
+      ),
+      unselectedLabelStyle: TextStyle(
+        fontWeight: FontWeight.normal,
+      ),
+      labelColor: kTextColor,
+      unselectedLabelColor: kTextSubColor,
+      indicatorSize: TabBarIndicatorSize.label,
+      indicatorPadding: EdgeInsets.zero,
+      indicator: ASTabIndicator(),
+    );
+  }
+}

lib/buttons/as_back_button.dart

@@ -2,6 +2,11 @@ import 'package:ansu_ui/ansu_ui.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
+///安速返回按钮
+///
+///ASBackButton 黑色返回按钮
+///
+///ASBackButton.white 白色返回按钮
 class ASBackButton extends StatelessWidget {
   final Color color;
   const ASBackButton({Key key, this.color = kDarkColor}) : super(key: key);

lib/drawer/as_drawer.dart

@@ -0,0 +1,34 @@
+import 'package:ansu_ui/utils/screen_adapter.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+///安速抽屉
+class ASDrawer extends StatefulWidget {
+  ///子组件
+  final Widget child;
+  ASDrawer({Key key, @required this.child}) : super(key: key);
+
+  @override
+  _ASDrawerState createState() => _ASDrawerState();
+}
+
+class _ASDrawerState extends State<ASDrawer> {
+  @override
+  Widget build(BuildContext context) {
+    return Align(
+      alignment: Alignment.bottomRight,
+      child: SizedBox(
+        height: screenHeight - statusBarHeight,
+        width: screenWidth - 44.w,
+        child: Material(
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.only(
+              topLeft: Radius.circular(34.w),
+            ),
+          ),
+          child: widget.child,
+        ),
+      ),
+    );
+  }
+}

lib/scaffold/as_scaffold.dart

@@ -25,6 +25,11 @@ class ASScaffold extends StatefulWidget {
 
   /// `AppBar` appBarBottom
   final PreferredSizeWidget appBarBottom;
+
+  /// `EndDrawer` endDrawer
+  /// 
+  /// 右方向的抽屉
+  final Widget endDrawer;
   ASScaffold({
     Key key,
     @required this.title,
@@ -32,6 +37,7 @@ class ASScaffold extends StatefulWidget {
     this.body,
     this.bottomNavigationBar,
     this.appBarBottom,
+    this.endDrawer,
   }) : super(key: key);
 
   @override
@@ -42,6 +48,7 @@ class _ASScaffoldState extends State<ASScaffold> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      endDrawer: widget.endDrawer,
       backgroundColor: kBackgroundColor,
       bottomNavigationBar: widget.bottomNavigationBar,
       appBar: AppBar(

lib/utils/screen_adapter.dart

@@ -0,0 +1,5 @@
+import 'package:ansu_ui/ansu_ui.dart';
+
+double statusBarHeight = ScreenUtil().statusBarHeight;
+double screenHeight = ScreenUtil().screenHeight;
+double screenWidth = ScreenUtil().screenWidth;