替换颜色

CarGuo · CarGuo · commit fa19aefa6381 · 2018-08-10T15:13:16.000+08:00
diff --git a/lib/common/style/GSYStyle.dart b/lib/common/style/GSYStyle.dart
@@ -264,7 +264,6 @@ class GSYStrings {
 
   static const String nothing_now = "目前什么都没有。";
   static const String loading_text = "努力加载中···";
-  static const String load_more_text = "加载中···";
 
   static const String option_web = "浏览器打开";
   static const String option_copy = "复制链接";
diff --git a/lib/common/utils/CommonUtils.dart b/lib/common/utils/CommonUtils.dart
@@ -169,7 +169,7 @@ class CommonUtils {
                     child: new Column(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: <Widget>[
-                        new Container(child: SpinKitCubeGrid(color: Colors.white)),
+                        new Container(child: SpinKitCubeGrid(color: Color(GSYColors.white))),
                         new Container(height: 10.0),
                         new Container(child: new Text(GSYStrings.loading_text, style: GSYConstant.normalTextWhite)),
                       ],
@@ -219,7 +219,7 @@ class CommonUtils {
               padding: new EdgeInsets.all(4.0),
               margin: new EdgeInsets.all(20.0),
               decoration: new BoxDecoration(
-                color: Colors.white,
+                color: Color(GSYColors.white),
                 //用一个BoxDecoration装饰器提供背景图片
                 borderRadius: BorderRadius.all(Radius.circular(4.0)),
               ),
diff --git a/lib/page/HomePage.dart b/lib/page/HomePage.dart
@@ -71,7 +71,7 @@ class HomePage extends StatelessWidget {
           new MyPage(),
         ],
         backgroundColor: GSYColors.primarySwatch,
-        indicatorColor: Colors.white,
+        indicatorColor:Color(GSYColors.white),
         title: GSYTitleBar(
           GSYStrings.app_name,
           iconData: GSYICons.MAIN_SEARCH,
diff --git a/lib/page/IssueDetailPage.dart b/lib/page/IssueDetailPage.dart
@@ -78,29 +78,29 @@ class _IssueDetailPageState extends GSYListState<IssueDetailPage> {
                 child: new Container(
                   decoration: new BoxDecoration(
                       borderRadius: BorderRadius.all(Radius.circular(4.0)),
-                      color: Colors.white,
+                      color: Color(GSYColors.white),
                       border: new Border.all(color: Color(GSYColors.subTextColor), width: 0.3)),
                   margin: EdgeInsets.all(10.0),
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: <Widget>[
                       new GSYFlexButton(
-                        color: Colors.white,
+                        color: Color(GSYColors.white),
                         text: GSYStrings.issue_edit_issue_edit_commit,
                         onPress: () {
                           _editCommit(issue.id.toString(), issue.body);
                         },
                       ),
                       new GSYFlexButton(
-                        color: Colors.white,
+                        color:Color(GSYColors.white),
                         text: GSYStrings.issue_edit_issue_delete_commit,
                         onPress: () {
                           _deleteCommit(issue.id.toString());
                         },
                       ),
                       new GSYFlexButton(
-                        color: Colors.white,
+                        color: Color(GSYColors.white),
                         text: GSYStrings.issue_edit_issue_copy_commit,
                         onPress: () {
                           CommonUtils.copy(issue.body);
diff --git a/lib/page/MyPage.dart b/lib/page/MyPage.dart
@@ -83,7 +83,7 @@ class _MyPageState extends GSYListState<MyPage> {
   _refreshNotify() {
     UserDao.getNotifyDao(false, false, 0).then((res) {
       if (res != null && res.result && res.data.length > 0) {
-        notifyColor = Colors.blue;
+        notifyColor = Color(GSYColors.actionBlue);
       } else {
         notifyColor = Color(GSYColors.subTextColor);
       }
diff --git a/lib/page/RepositoryDetailPage.dart b/lib/page/RepositoryDetailPage.dart
@@ -253,7 +253,7 @@ class _RepositoryDetailPageState extends State<RepositoryDetailPage> {
       ],
       topPageControl: topPageControl,
       backgroundColor: GSYColors.primarySwatch,
-      indicatorColor: Colors.white,
+      indicatorColor: Color(GSYColors.white),
       title: new GSYTitleBar(
         reposName,
         rightWidget: widget,
diff --git a/lib/page/TrendPage.dart b/lib/page/TrendPage.dart
@@ -50,7 +50,7 @@ class _TrendPageState extends GSYListState<TrendPage> {
               });
               showRefreshLoading();
             }),
-            new Container(height: 10.0, width: 0.5, color: Colors.white),
+            new Container(height: 10.0, width: 0.5, color: Color(GSYColors.white)),
             _renderHeaderPopItem(selectType.name, trendType, (TrendTypeModel result) {
               setState(() {
                 selectType = result;
diff --git a/lib/page/UserProfilePage.dart b/lib/page/UserProfilePage.dart
@@ -105,7 +105,7 @@ class _UserProfileState extends State<UserProfileInfo> {
       return Scaffold(
         appBar: new AppBar(title: new Text(GSYStrings.home_user_info)),
         body: new Container(
-          color: Colors.white,
+          color: Color(GSYColors.white),
           child: new SingleChildScrollView(
             child: new Column(
               children: _renderList(store.state.userInfo, store),
diff --git a/lib/page/WelcomePage.dart b/lib/page/WelcomePage.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:gsy_github_app_flutter/common/dao/UserDao.dart';
 import 'package:gsy_github_app_flutter/common/redux/GSYState.dart';
+import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
 import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
 import 'package:gsy_github_app_flutter/common/utils/NavigatorUtils.dart';
 import 'package:redux/redux.dart';
@@ -32,7 +33,7 @@ class WelcomePage extends StatelessWidget {
     return StoreBuilder<GSYState>(
       builder: (context, store) {
         return new Container(
-          color: Colors.white,
+          color: Color(GSYColors.white),
           child: new Center(
             child: new Image(image: new AssetImage('static/images/welcome.png')),
           ),
diff --git a/lib/widget/GSYSearchInputWidget.dart b/lib/widget/GSYSearchInputWidget.dart
@@ -20,7 +20,7 @@ class GSYSearchInputWidget extends StatelessWidget {
     return new Container(
       decoration: new BoxDecoration(
           borderRadius: BorderRadius.all(Radius.circular(4.0)),
-          color: Colors.white,
+          color:  Color(GSYColors.white),
           border: new Border.all(color: Color(GSYColors.primaryValue), width: 0.3),
           boxShadow: [BoxShadow(color: Color(GSYColors.primaryDarkValue),  blurRadius: 4.0)]),
       padding: new EdgeInsets.only(left: 20.0, top: 12.0, right: 20.0, bottom: 12.0),
diff --git a/lib/widget/IssueEditDIalog.dart b/lib/widget/IssueEditDIalog.dart
@@ -133,7 +133,7 @@ class _IssueEditDialogState extends State<IssueEditDialog> {
                     height: MediaQuery.of(context).size.width * 3 / 4,
                     decoration: new BoxDecoration(
                       borderRadius: BorderRadius.all(Radius.circular(4.0)),
-                      color: Colors.white,
+                      color:  Color(GSYColors.white),
                       border: new Border.all(color: Color(GSYColors.subTextColor), width: .3),
                     ),
                     padding: new EdgeInsets.only(left: 20.0, top: 12.0, right: 20.0, bottom: 12.0),
diff --git a/lib/widget/UserHeader.dart b/lib/widget/UserHeader.dart
@@ -130,7 +130,7 @@ class UserHeaderItem extends StatelessWidget {
     return (userInfo.login != null)
         ? new Card(
       margin: EdgeInsets.only(top: 0.0, left: 10.0, right: 10.0, bottom: 10.0),
-      color: Colors.white,
+      color:  Color(GSYColors.white),
       child: new SingleChildScrollView(
         scrollDirection: Axis.horizontal,
         child: new Container(

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class _MyPageState extends GSYListState<MyPage> {`
`83`	`83`	`_refreshNotify() {`
`84`	`84`	`UserDao.getNotifyDao(false, false, 0).then((res) {`
`85`	`85`	`if (res != null && res.result && res.data.length > 0) {`
`86`		`- notifyColor = Colors.blue;`
	`86`	`+ notifyColor = Color(GSYColors.actionBlue);`
`87`	`87`	`} else {`
`88`	`88`	`notifyColor = Color(GSYColors.subTextColor);`
`89`	`89`	`}`