Merge pull request #11 from efoxTeam/dev-ken

ckken · web-flow · commit 61f05752f421 · 2019-03-01T15:55:57.000+08:00
Dev ken
diff --git a/git.md b/git.md
@@ -0,0 +1,9 @@
+# git使用规范   
+## 提交规范     
++ feat：新功能（feature）
++ fix：修补bug
++ docs：文档（documentation）
++ style： 格式（不影响代码运行的变动）
++ refactor：重构（即不是新增功能，也不是修改bug的代码变动）
++ test：增加测试
++ chore：构建过程或辅助工具的变动
diff --git a/lib/components/exampleComp.dart b/lib/components/exampleComp.dart
@@ -1,11 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:efox_flutter/store/models/main_state_model.dart' show MainStateModel;
+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/config/theme.dart' show AppTheme;
 
 class Index extends StatelessWidget {
   final Widget child;
 
-  Index({Key key, this.child}):super(key: key);
+  Index({Key key, this.child}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -15,14 +17,11 @@ class Index extends StatelessWidget {
           height: 420.0,
           margin: EdgeInsets.fromLTRB(50, 40, 50, 40),
           decoration: BoxDecoration(
-            border: Border.all(
-              color: Color(model.theme.mainColor),
-              width: 1.0
-            ),
+            border: Border.all(color: Color(AppTheme.mainColor), width: 1.0),
           ),
           child: this.child,
         );
       },
     );
   }
-}
+}
diff --git a/lib/components/widgetComp.dart b/lib/components/widgetComp.dart
@@ -8,6 +8,7 @@ import 'package:efox_flutter/components/exampleComp.dart' as ExampleComp;
 import 'package:efox_flutter/utils/file.dart' as FileUtils;
 import 'package:efox_flutter/utils/loadAsset.dart' as LoadAssetUtils;
 import 'package:efox_flutter/router/index.dart' show FluroRouter;
+import 'package:efox_flutter/config/theme.dart' show AppTheme;
 
 class Index extends StatefulWidget {
   final List<Widget> demoChild;
@@ -149,7 +150,7 @@ class IndexState extends State<Index> {
               child: Row(children: [
                 Icon(
                   Icons.home,
-                  color: Color(model.theme.greyColor),
+                  color: Color(AppTheme.greyColor),
                 ),
                 Text("  "),
                 Text('Flutter-UI'),
@@ -160,7 +161,7 @@ class IndexState extends State<Index> {
               child: Row(children: [
                 Icon(
                   Icons.code,
-                  color: Color(model.theme.greyColor),
+                  color: Color(AppTheme.greyColor),
                 ),
                 Text("  "),
                 Text(this.title),
@@ -205,8 +206,7 @@ class IndexState extends State<Index> {
                     child: Text(
                       AppTranslations.of(context).t('loading'),
                       style: TextStyle(
-                          color: Color(this.model.theme.secondColor),
-                          fontSize: 20.0),
+                          color: Color(AppTheme.secondColor), fontSize: 20.0),
                     ),
                   )
                 ],
diff --git a/lib/config/theme.dart b/lib/config/theme.dart
@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+
+class AppTheme {
+  static int mainColor = 0xFFD32F2F;
+  static int secondColor = 0xFFFFFFFF;
+  static int thirdColor = 0xFFFAFAFA;
+  static int greyColor = 0x8A000000;
+  static int blackColor = 0xFF000000;
+  static ThemeData themData = ThemeData(
+    textTheme: TextTheme(
+      body1: TextStyle(
+          // color: Colors.black,
+          // fontWeight: FontWeight.bold,
+          ),
+    ),
+    platform: TargetPlatform.iOS,
+    iconTheme: IconThemeData(
+      size: 32,
+      color: Color(thirdColor),
+      opacity: 0.85,
+    ),
+    // primaryIconTheme 导航栏按钮颜色
+    primaryIconTheme: IconThemeData(
+      color: Color(secondColor),
+    ),
+    accentColor: Colors.grey, // 选中颜色
+    primaryColor: Color(mainColor), // appbar背景
+    scaffoldBackgroundColor: Color(thirdColor), // 整体的scaffold背景颜色
+  );
+}
diff --git a/lib/main.dart b/lib/main.dart
@@ -7,6 +7,9 @@ import 'package:efox_flutter/lang/app_translations_delegate.dart';
 import 'package:efox_flutter/store/store.dart' show model, Store;
 //路由
 import 'package:efox_flutter/router/index.dart';
+//主题
+import 'package:efox_flutter/config/theme.dart' show AppTheme;
+
 void main() => runApp(MainApp());
 
 class MainApp extends StatefulWidget {
@@ -56,27 +59,7 @@ class MainAppState extends State<MainApp> {
           const Locale('zh'),
         ],
         title: 'Flutter Demo',
-        theme: ThemeData(
-          textTheme: TextTheme(
-            body1: TextStyle(
-              // color: Colors.black,
-              // fontWeight: FontWeight.bold,
-            ),
-          ),
-          platform: TargetPlatform.iOS,
-          iconTheme: IconThemeData(
-            size: 32,
-            color: Color(model.theme.thirdColor),
-            opacity: 0.85,
-          ),
-          // primaryIconTheme 导航栏按钮颜色
-          primaryIconTheme: IconThemeData(
-            color: Color(model.theme.secondColor),
-          ),
-          accentColor: Colors.grey, // 选中颜色
-          primaryColor: Color(model.theme.mainColor), // appbar背景
-          scaffoldBackgroundColor: Color(model.theme.thirdColor), // 整体的scaffold背景颜色
-        ),
+        theme: AppTheme.themData,
         onGenerateRoute: FluroRouter.router.generator,
       ),
     );
diff --git a/lib/page/component/index.dart b/lib/page/component/index.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:efox_flutter/router/index.dart';
 import 'package:efox_flutter/store/models/main_state_model.dart';
 import 'package:efox_flutter/widget/index.dart' as WidgetRoot;
+import 'package:efox_flutter/config/theme.dart' show AppTheme;
 
 class Index extends StatefulWidget {
   final MainStateModel model;
@@ -43,7 +44,7 @@ class _IndexState extends State<Index> {
           fontFamily: 'MaterialIcons',
           matchTextDirection: true,
         ),
-        // color: Color(model.theme.mainColor),
+        // color: Color(AppTheme.mainColor),
       ),
       backgroundColor: Colors.white,
       children: [
@@ -74,7 +75,7 @@ class _IndexState extends State<Index> {
                           fontFamily: 'MaterialIcons',
                           matchTextDirection: true,
                         ),
-                        color: Color(model.theme.mainColor),
+                        color: Color(AppTheme.mainColor),
                       ),
                       onPressed: () {
                         FluroRouter.router.navigateTo(
diff --git a/lib/page/home.dart b/lib/page/home.dart
@@ -8,6 +8,7 @@ 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;
+import 'package:efox_flutter/config/theme.dart' show AppTheme;
 
 class Index extends StatefulWidget {
   @override
@@ -26,7 +27,7 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
         border: Border(
           top: BorderSide(
             width: .1,
-            color: Color(model.theme.greyColor),
+            color: Color(AppTheme.greyColor),
           ),
         ),
       ),
@@ -35,14 +36,14 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
           border: Border(
             bottom: BorderSide(
               width: .2,
-              color: Color(model.theme.mainColor),
+              color: Color(AppTheme.mainColor),
             ),
           ),
         ),
-        labelColor: Color(model.theme.mainColor),
-        unselectedLabelColor: Color(model.theme.greyColor),
+        labelColor: Color(AppTheme.mainColor),
+        unselectedLabelColor: Color(AppTheme.greyColor),
         indicatorSize: TabBarIndicatorSize.tab,
-        indicatorColor: Color(model.theme.secondColor),
+        indicatorColor: Color(AppTheme.secondColor),
         labelStyle: TextStyle(
           color: Colors.green,
           fontWeight: FontWeight.w700,
@@ -73,7 +74,7 @@ class _IndexState extends State<Index> with SingleTickerProviderStateMixin {
       PopupMenuButton(
         icon: Icon(
           Icons.more_vert,
-          // color: Color(model.theme.textColor),
+          // color: Color(AppTheme.textColor),
         ),
         onSelected: (local) {
           Application().onLocaleChanged(Locale(local));
diff --git a/locale/en.json b/locale/en.json
@@ -1,5 +1,5 @@
 {
-    "title": "efox flutter tech app",
+    "title": "Components",
     "title_component": "Components",
     "title_my": "My",
     "widgetType": {
diff --git a/locale/zh.json b/locale/zh.json
@@ -1,5 +1,5 @@
 {
-    "title": "efox flutter教学应用",
+    "title": "组件",
     "title_component": "组件",
     "title_my": "我的",
     "widgetType": {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "title": "efox flutter tech app",`
	`2`	`+ "title": "Components",`
`3`	`3`	`"title_component": "Components",`
`4`	`4`	`"title_my": "My",`
`5`	`5`	`"widgetType": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "title": "efox flutter教学应用",`
	`2`	`+ "title": "组件",`
`3`	`3`	`"title_component": "组件",`
`4`	`4`	`"title_my": "我的",`
`5`	`5`	`"widgetType": {`