Merge branch 'test' of https://github.com/efoxTeam/flutter-ui into test

Author: DIVINER-only

lib/components/widgetComp.dart

@@ -71,7 +71,6 @@ class IndexState extends State<Index> {
       });
     }
 
-    print('end $_bodyList');
     setState(() {
       this.loading = false;
     });

lib/main.dart

@@ -59,7 +59,26 @@ class MainAppState extends State<MainApp> {
         ],
         title: 'Flutter Demo',
         theme: ThemeData(
-          primarySwatch: Colors.indigo,
+          // primarySwatch: Colors.blue,
+          textTheme: TextTheme(
+            body1: TextStyle(
+              // color: Colors.black,
+              // fontWeight: FontWeight.bold,
+            ),
+          ),
+          platform: TargetPlatform.iOS,
+          iconTheme: IconThemeData(
+            size: 32,
+            color: Colors.grey.shade900,
+            opacity: 0.85,
+          ),
+          primaryIconTheme: IconThemeData(
+            color: Colors.black,
+          ),
+          accentColor: Colors.grey,
+          accentColorBrightness: Brightness.light,
+          primaryColor: Colors.grey.shade50, // appbar背景
+          scaffoldBackgroundColor: Colors.grey.shade50, // 整体的scaffold背景颜色
         ),
         onGenerateRoute: FluroRouter.router.generator,
       ),

lib/page/component/index.dart

@@ -24,21 +24,26 @@ class _IndexState extends State<Index> {
   /**
    * 渲染折叠板
    */
-  Widget renderExpanel(MainStateModel model, item) {
-    List _tmpWidgetList = item.widgetList;
+  Widget renderExpanel(MainStateModel model, widgetsItem) {
+    String nameSpaces = widgetsItem.nameSpaces;
+    List _tmpWidgetList = widgetsItem.widgetList;
     return ExpansionTile(
       title: Text(
-        item.typeName,
+        widgetsItem.typeName,
         style: TextStyle(
-          color: Color(model.theme.textColor),
+          fontSize: 20,
+          fontWeight: FontWeight.bold,
         ),
       ),
       leading: Icon(
-        IconData(item.code ?? 58353,
-            fontFamily: 'MaterialIcons', matchTextDirection: true),
-        color: Color(model.theme.textColor),
+        IconData(
+          widgetsItem.code ?? 58353,
+          fontFamily: 'MaterialIcons',
+          matchTextDirection: true,
+        ),
+        color: Color(model.theme.mainColor),
       ),
-      backgroundColor: Colors.white70,
+      backgroundColor: Colors.white,
       children: [
         GridView.count(
           shrinkWrap: true,
@@ -66,20 +71,16 @@ class _IndexState extends State<Index> {
                           fontFamily: 'MaterialIcons',
                           matchTextDirection: true,
                         ),
-                        color: Color(model.theme.secondColor),
                       ),
                       onPressed: () {
                         FluroRouter.router.navigateTo(
                           context,
-                          _tmpWidgetList[index].routerName,
+                          nameSpaces + _tmpWidgetList[index].name,
                         );
                       },
                     ),
                     Text(
                       _tmpWidgetList[index].name,
-                      style: TextStyle(
-                        color: Color(model.theme.secondColor),
-                      ),
                     ),
                   ],
                 ),
@@ -98,8 +99,8 @@ class _IndexState extends State<Index> {
       padding: EdgeInsets.all(10),
       child: Column(
         children: mapList.map(
-          (item) {
-            return renderExpanel(model, item);
+          (widgetsItem) {
+            return renderExpanel(model, widgetsItem);
           },
         ).toList(),
       ),

lib/page/home.dart

@@ -23,6 +23,7 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
       decoration: BoxDecoration(
         border: Border(
           top: BorderSide(
+            width: .1,
             color: Color(model.theme.mainColor),
           ),
         ),
@@ -31,6 +32,7 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
         indicator: BoxDecoration(
           border: Border(
             bottom: BorderSide(
+              width: .2,
               color: Color(model.theme.mainColor),
             ),
           ),
@@ -40,7 +42,10 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
         indicatorSize: TabBarIndicatorSize.tab,
         indicatorColor: Color(model.theme.secondColor),
         labelStyle: TextStyle(
-            color: Colors.white, fontWeight: FontWeight.w500, fontSize: 16),
+          color: Colors.green,
+          fontWeight: FontWeight.w700,
+          fontSize: 16,
+        ),
         tabs: [
           Tab(
             text: AppTranslations.of(context).t('title_component'),
@@ -66,7 +71,7 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
       PopupMenuButton(
         icon: Icon(
           Icons.more_vert,
-          color: Color(model.theme.textColor),
+          // color: Color(model.theme.textColor),
         ),
         onSelected: (local) {
           Application().onLocaleChanged(Locale(local));

lib/router/index.dart

@@ -22,13 +22,14 @@ class FluroRouter {
     router.define('/webview', handler: webviewHandler);
 
     // 组件
-    WidgetConfig.getAllWidgets().forEach((widgetListInfo) {
-      widgetListInfo.widgetList.forEach((widgetInfo) {
+    WidgetConfig.getAllWidgets().forEach((widgetsItem) {
+      print('widgetsItem $widgetsItem');
+      widgetsItem.widgetList.forEach((itemInfo) {
         router.define(
-          widgetInfo.routerName,
+          widgetsItem.nameSpaces + itemInfo.name,
           handler: Handler(
               handlerFunc: (BuildContext context, Map<String, List> params) {
-            return widgetInfo.widget;
+            return itemInfo.widget;
           }),
         );
       });

lib/store/models/theme_model.dart

@@ -1,10 +1,11 @@
 import 'package:scoped_model/scoped_model.dart';
 
 class AppTheme {
-  int mainColor = 0xFF1A237E;
+  int mainColor = 0xFF000000;
   int secondColor = 0xFF1565C0;
   int thirdColor = 0x8A000000;
-  int textColor = 0x8A000000;
+  int textColor = 0xFF00C853;
+  // int textColor = 0x8A000000;
 }
 
 mixin AppThemeModel on Model {

lib/store/objects/widget_info.dart

@@ -2,30 +2,30 @@ import 'package:flutter/widgets.dart';
 class ItemInfo extends Object {
   int code;
   String name;
-  String routerName;
   Widget widget;
   String webviewTitle;
 
-  ItemInfo({this.code, this.name, this.routerName, this.widget, this.webviewTitle});
+  ItemInfo({this.code, this.name, this.widget, this.webviewTitle});
 
   ItemInfo.fromJson(Map<String, dynamic> json) {
     code = json['code'];
     name = json['name'];
     widget = json['widget'];
-    routerName = json['routerName'];
     webviewTitle = json['webviewTitle'];
   }
 }
 
 class ItemListInfo {
   String typeName;
+  String nameSpaces;
   int code;
   List widgetList;
 
-  ItemListInfo({ this.typeName, this.code, this.widgetList});
+  ItemListInfo({ this.typeName, this.nameSpaces, this.code, this.widgetList});
 
   ItemListInfo.fromJson(Map<String, dynamic> json) {
     typeName = json['typeName'];
+    nameSpaces = json['nameSpaces'];
     code = json['code'];
 
     List _list = [];

lib/widget/regular/column/index.dart

@@ -5,7 +5,6 @@ import 'demo_expanded.dart' as DemoExpanded;
 
 class Index extends StatefulWidget {
   static String name = 'Column';
-  static String routerName = 'column';
   static String originCodeUrl = 'https://docs.flutter.io/flutter/widgets/Column-class.html';
   static String codeUrl = 'docs/widget/regular/column/code.md';
   static String mdUrl = 'docs/widget/regular/column/index.md';

lib/widget/regular/container/index.dart

@@ -5,7 +5,6 @@ import 'demo.dart' as Demo;
 
 class Index extends StatefulWidget {
   static String name = 'Container';
-  static String routerName = 'container';
   static String originCodeUrl = 'https://docs.flutter.io/flutter/widgets/Container-class.html';
   static String codeUrl = 'docs/widget/regular/container/code.md';
   static String mdUrl = 'docs/widget/regular/container/index.md';

lib/widget/regular/index.dart

@@ -9,25 +9,21 @@ const nameSpaces = '/regular_';
 
 List widgets = [
   ItemInfo(
-    routerName: nameSpaces + Row.Index.routerName,
     widget: Row.Index(),
     code: 59702, // calendar_view_day
     name: Row.Index.name,
   ),
   ItemInfo(
-    routerName: nameSpaces + Column.Index.routerName,
     widget: Column.Index(),
     code: 59692, // accessibility_new
     name: Column.Index.name
   ),
   ItemInfo(
-    routerName: nameSpaces + Container.Index.routerName,
     widget: Container.Index(),
     code: 60219, // ac_unit 
     name: Container.Index.name
   ),
   ItemInfo(
-    routerName: nameSpaces + Padding.Index.routerName,
     widget: Padding.Index(),
     code: 59483, // aspect_ratio
     name: Padding.Index.name
@@ -42,6 +38,7 @@ List widgets = [
 
 List widgetMap = [
   ItemListInfo(
+    nameSpaces: nameSpaces,
     widgetList: widgets,
     typeName: 'Regular',
     code: 59692,