优化结构

Author: yangshangzhi

lib/components/baseComp.dart

@@ -1,28 +1,25 @@
 import 'package:flutter/material.dart';
-import 'package:efox_flutter/store/STORE.dart';
+import 'package:efox_flutter/store/store.dart' show STORE;
+import 'header.dart' as Header;
 
 class Index extends StatelessWidget {
   final dynamic child;
   final String title;
 
-  Index({Key key, this.title, this.child}):super(key: key);
+  Index({Key key, this.title, this.child}) : super(key: key);
 
   @override
-  Widget build (BuildContext context ) {
-    return STORE.connect(
-      builder: (context, child, model) {
-        return Scaffold(
-          appBar: AppBar(
-            title: Text(this.title),
-          ),
-          body: ListView(
-            children: [
-              this.child(context, child, model)
-            ],
-          ),
-        );
-      }
-    );
+  Widget build(BuildContext context) {
+    return STORE.connect(builder: (context, child, model) {
+      return Scaffold(
+        appBar: AppBar(
+          title: Header.Index(this.title),
+        ),
+        body: ListView(
+          children: [this.child(context, child, model)],
+        ),
+      );
+    });
   }
 }
 

lib/components/exampleComp.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:efox_flutter/store/models/main_state_model.dart' show MainStateModel;
-import 'package:efox_flutter/store/STORE.dart' show STORE;
+import 'package:efox_flutter/store/store.dart' show STORE;
 
 class Index extends StatelessWidget {
   final Widget child;

lib/components/header.dart

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+class Index extends StatelessWidget {
+  final String text;
+  Index(this.text);
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      this.text,
+      style: TextStyle(
+        // fontStyle: FontStyle.normal,
+      ),
+    );
+  }
+}

lib/components/webviewComp.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'header.dart' as Header;
 import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
 
 class Index extends StatelessWidget {
@@ -12,12 +13,13 @@ class Index extends StatelessWidget {
       print('url ${url}');
     });
   }
+
   @override
   Widget build(BuildContext context) {
     return WebviewScaffold(
       url: this.url,
       appBar: new AppBar(
-        title: new Text("Webview"),
+        title: Header.Index(this.title),
       ),
       withZoom: true,
       withLocalStorage: true,

lib/components/widgetComp.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:efox_flutter/store/STORE.dart' show STORE;
+import 'package:efox_flutter/store/store.dart' show STORE;
+import 'header.dart' as Header;
 import 'package:efox_flutter/components/markdownComp.dart' as MarkDownComp;
 import 'package:efox_flutter/lang/app_translations.dart' show AppTranslations;
 import 'package:efox_flutter/components/baseComp.dart' as BaseComp;
@@ -13,10 +14,10 @@ class Index extends StatefulWidget {
   final String originCodeUrl;
   final String codeUrl;
   final String mdUrl;
-  final String name;
+  final String title;
   Index({
     Key key,
-    this.name,
+    this.title,
     this.demoChild,
     this.originCodeUrl,
     this.codeUrl,
@@ -25,7 +26,7 @@ class Index extends StatefulWidget {
 
   @override
   State<StatefulWidget> createState() => IndexState(
-      name: name,
+      title: title,
       demoChild: demoChild,
       originCodeUrl: originCodeUrl,
       codeUrl: codeUrl,
@@ -40,13 +41,13 @@ class IndexState extends State<Index> {
   final String originCodeUrl;
   final String codeUrl;
   final String mdUrl;
-  final String name;
+  final String title;
   bool loading = true;
   dynamic model;
 
   IndexState({
     Key key,
-    this.name,
+    this.title,
     this.modelChild,
     this.mdList,
     this.demoChild,
@@ -63,15 +64,17 @@ class IndexState extends State<Index> {
 
   void init() async {
     this._bodyList.length = 0;
-    this._bodyList.add(await MarkDownComp.Index(await this.getMdFile(this.mdUrl)));
+    this
+        ._bodyList
+        .add(await MarkDownComp.Index(await this.getMdFile(this.mdUrl)));
 
     // 增加
     if (this.demoChild != null) {
       this.demoChild.forEach((Widget item) {
         this._bodyList.add(ExampleComp.Index(child: item));
       });
     }
-    
+
     setState(() {
       this.loading = false;
     });
@@ -83,7 +86,7 @@ class IndexState extends State<Index> {
       this.model = model;
       return Scaffold(
         appBar: AppBar(
-          title: Text(this.name),
+          title: Header.Index(this.title),
           actions: this.getActions(context, model),
         ),
         body: this.loading ? this.renderLoading() : this.renderWidget(),
@@ -102,7 +105,7 @@ class IndexState extends State<Index> {
       Navigator.of(context).push(
         MaterialPageRoute(builder: (BuildContext context) {
           return BaseComp.Index(
-            title: this.name,
+            title: this.title,
             child: (context, child, model) {
               return MarkDownComp.Index(mdStr);
             },
@@ -163,7 +166,9 @@ class IndexState extends State<Index> {
               child: Row(children: [
                 Icon(
                   Icons.home,
+                  color: Color(model.theme.blackColor),
                 ),
+                Text("  "),
                 Text('官网'),
               ]),
               value: 0,
@@ -172,7 +177,9 @@ class IndexState extends State<Index> {
               child: Row(children: [
                 Icon(
                   Icons.all_inclusive,
+                  color: Color(model.theme.blackColor),
                 ),
+                Text("  "),
                 Text("Markdown"),
               ]),
               value: 1,
@@ -181,8 +188,10 @@ class IndexState extends State<Index> {
               child: Row(children: [
                 Icon(
                   Icons.code,
+                  color: Color(model.theme.blackColor),
                 ),
-                Text(this.name),
+                Text("  "),
+                Text(this.title),
               ]),
               value: 2,
             ),
@@ -217,15 +226,16 @@ class IndexState extends State<Index> {
                 mainAxisSize: MainAxisSize.min,
                 children: <Widget>[
                   CircularProgressIndicator(
-                    backgroundColor: Color(this.model.theme.secondColor),
+                    // backgroundColor: Color(this.model.theme.mainColor),
+                    strokeWidth: 4,
                   ),
                   Container(
                     padding: const EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 0),
                     child: Text(
                       AppTranslations.of(context).t('loading'),
                       style: TextStyle(
                           color: Color(this.model.theme.secondColor),
-                          fontSize: 16.0),
+                          fontSize: 20.0),
                     ),
                   )
                 ],

lib/main.dart

@@ -57,7 +57,6 @@ class MainAppState extends State<MainApp> {
         ],
         title: 'Flutter Demo',
         theme: ThemeData(
-          // primarySwatch: Colors.blue,
           textTheme: TextTheme(
             body1: TextStyle(
               // color: Colors.black,
@@ -67,16 +66,16 @@ class MainAppState extends State<MainApp> {
           platform: TargetPlatform.iOS,
           iconTheme: IconThemeData(
             size: 32,
-            color: Colors.grey.shade900,
+            color: Color(model.theme.thirdColor),
             opacity: 0.85,
           ),
+          // primaryIconTheme 导航栏按钮颜色
           primaryIconTheme: IconThemeData(
-            color: Colors.black,
+            color: Color(model.theme.secondColor),
           ),
-          accentColor: Colors.grey,
-          accentColorBrightness: Brightness.light,
-          primaryColor: Colors.redAccent, // appbar背景
-          scaffoldBackgroundColor: Colors.grey.shade50, // 整体的scaffold背景颜色
+          accentColor: Colors.grey, // 选中颜色
+          primaryColor: Color(model.theme.mainColor), // appbar背景
+          scaffoldBackgroundColor: Color(model.theme.thirdColor), // 整体的scaffold背景颜色
         ),
         onGenerateRoute: FluroRouter.router.generator,
       ),

lib/page/component/index.dart

@@ -14,7 +14,9 @@ class Index extends StatefulWidget {
 class _IndexState extends State<Index> {
   final MainStateModel model;
   List mapList = [];
+  int index;
   _IndexState({Key key, this.model});
+
   @override
   initState() {
     super.initState();
@@ -41,7 +43,7 @@ class _IndexState extends State<Index> {
           fontFamily: 'MaterialIcons',
           matchTextDirection: true,
         ),
-        color: Color(model.theme.mainColor),
+        // color: Color(model.theme.mainColor),
       ),
       backgroundColor: Colors.white,
       children: [
@@ -56,9 +58,10 @@ class _IndexState extends State<Index> {
               return Container(
                 decoration: BoxDecoration(
                   border: Border(
-                      bottom: BorderSide(
-                    width: .1,
-                  )),
+                    bottom: BorderSide(
+                      width: .1,
+                    ),
+                  ),
                 ),
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
@@ -71,16 +74,17 @@ class _IndexState extends State<Index> {
                           fontFamily: 'MaterialIcons',
                           matchTextDirection: true,
                         ),
+                        color: Color(model.theme.mainColor),
                       ),
                       onPressed: () {
                         FluroRouter.router.navigateTo(
                           context,
-                          nameSpaces + _tmpWidgetList[index].name,
+                          nameSpaces + _tmpWidgetList[index].title,
                         );
                       },
                     ),
                     Text(
-                      _tmpWidgetList[index].name,
+                      _tmpWidgetList[index].title,
                     ),
                   ],
                 ),
@@ -89,7 +93,6 @@ class _IndexState extends State<Index> {
           ),
         ),
       ],
-      initiallyExpanded: false,
     );
   }
 
@@ -98,11 +101,9 @@ class _IndexState extends State<Index> {
       physics: BouncingScrollPhysics(),
       padding: EdgeInsets.all(10),
       child: Column(
-        children: mapList.map(
-          (widgetsItem) {
-            return renderExpanel(model, widgetsItem);
-          },
-        ).toList(),
+        children: List.generate(mapList.length, (_index) {
+          return renderExpanel(model, mapList[_index]);
+        }),
       ),
     );
   }

lib/page/home.dart

@@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:efox_flutter/lang/application.dart';
 import 'package:efox_flutter/lang/app_translations.dart';
 //
-import 'package:efox_flutter/store/STORE.dart';
+import 'package:efox_flutter/store/store.dart' show STORE, MainStateModel;
 
+import 'package:efox_flutter/components/header.dart' as Header;
 import 'component/index.dart' as TabIndex;
 import 'mine/index.dart' as MyIndex;
 
@@ -24,7 +25,7 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
         border: Border(
           top: BorderSide(
             width: .1,
-            color: Color(model.theme.mainColor),
+            color: Color(model.theme.greyColor),
           ),
         ),
       ),
@@ -38,7 +39,7 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
           ),
         ),
         labelColor: Color(model.theme.mainColor),
-        unselectedLabelColor: Color(model.theme.thirdColor),
+        unselectedLabelColor: Color(model.theme.greyColor),
         indicatorSize: TabBarIndicatorSize.tab,
         indicatorColor: Color(model.theme.secondColor),
         labelStyle: TextStyle(
@@ -110,7 +111,7 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
           length: 2,
           child: Scaffold(
             appBar: AppBar(
-              title: Text(lang.t('title')),
+              title: Header.Index(lang.t('title')),
               actions: appBarActions(model),
             ),
             bottomNavigationBar: menu(model),

lib/router/index.dart

@@ -26,7 +26,7 @@ class FluroRouter {
       print('widgetsItem $widgetsItem');
       widgetsItem.widgetList.forEach((itemInfo) {
         router.define(
-          widgetsItem.nameSpaces + itemInfo.name,
+          widgetsItem.nameSpaces + itemInfo.title,
           handler: Handler(
               handlerFunc: (BuildContext context, Map<String, List> params) {
             return itemInfo.widget;

lib/store/STORE.dart

@@ -3,7 +3,7 @@ import './models/main_state_model.dart';
 export './models/main_state_model.dart';
 
 /**
- * import 'package:efox_flutter/store/STORE.dart' as Store;
+ * import 'package:efox_flutter/store/store.dart' as Store;
  * Store.model.config.state.isPro
  */
 class STORE {