🥝 modify some colors

persilee · Jun 28, 2020 · de608e1 · de608e1
1 parent 73e1239
commit de608e1
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 38 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -59,6 +59,7 @@
 
 ### 更新日志
 
+- 2020-06-28 08:44 新增 My Page 案例
 - 2020-06-28 07:15 新增 **futureBuilder** 、 **streamBuilder** 的使用案例
 - 2020-06-27 02:15 新增 **provider** 的使用案例
 - 2020-06-26 23:56 调整整体目录结构

diff --git a/lib/demo/base_widget_demo/my_page.dart b/lib/demo/base_widget_demo/my_page.dart
@@ -34,6 +34,8 @@ class _MyPageState extends State<MyPage> {
           removeTop: true,
           child: RefreshIndicator(
             onRefresh: _handleRefresh,
+            color: Colors.yellow,
+            backgroundColor: Colors.black38,
             child: ListView(
               children: <Widget>[
                 Container(

diff --git a/lib/demo/stream_demo/base_stateful_demo.dart b/lib/demo/stream_demo/base_stateful_demo.dart
@@ -35,7 +35,10 @@ class _BaseStatefulDemoState extends State<BaseStatefulDemo> {
       ),
       body: _fetchingData
           ? Center(
-              child: CircularProgressIndicator(),
+              child: CircularProgressIndicator(
+                valueColor: AlwaysStoppedAnimation<Color>(Colors.amber),
+                backgroundColor: Colors.yellow,
+              ),
             )
           : ListView.builder(
               itemCount: _pageData.length,

diff --git a/lib/demo/stream_demo/future_builder_demo.dart b/lib/demo/stream_demo/future_builder_demo.dart
@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 
 class FutureBuilderDemo extends StatelessWidget {
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -13,15 +12,20 @@ class FutureBuilderDemo extends StatelessWidget {
       body: FutureBuilder(
         future: _getListData(),
         builder: (buildContext, snapshot) {
-          if(snapshot.hasError) {
+          if (snapshot.hasError) {
             return _getInfoMessage(snapshot.error);
           }
 
-          if(!snapshot.hasData) {
-            return Center(child: CircularProgressIndicator(),);
+          if (!snapshot.hasData) {
+            return Center(
+              child: CircularProgressIndicator(
+                valueColor: AlwaysStoppedAnimation<Color>(Colors.amber),
+                backgroundColor: Colors.yellow,
+              ),
+            );
           }
           var listData = snapshot.data;
-          if(listData.length == 0) {
+          if (listData.length == 0) {
             return _getInfoMessage('No data found');
           }
 
@@ -43,7 +47,7 @@ class FutureBuilderDemo extends StatelessWidget {
     );
   }
 
-  Widget _getInfoMessage(String msg){
+  Widget _getInfoMessage(String msg) {
     return Center(
       child: Text(msg),
     );

diff --git a/lib/demo/stream_demo/stream_builder_demo.dart b/lib/demo/stream_demo/stream_builder_demo.dart
@@ -1,17 +1,14 @@
-
 import 'package:flutter/material.dart';
 import 'package:pro_flutter/demo/stream_demo/stream_demo_event.dart';
 import 'package:pro_flutter/demo/stream_demo/stream_demo_model.dart';
 import 'package:pro_flutter/demo/stream_demo/stream_demo_state.dart';
 
 class StreamBuilderDemo extends StatefulWidget {
-
   @override
   _StreamBuilderDemoState createState() => _StreamBuilderDemoState();
 }
 
 class _StreamBuilderDemoState extends State<StreamBuilderDemo> {
-
   final model = StreamDemoModel();
 
   @override
@@ -28,7 +25,10 @@ class _StreamBuilderDemoState extends State<StreamBuilderDemo> {
       ),
       floatingActionButton: FloatingActionButton(
         backgroundColor: Colors.yellow,
-        child: Icon(Icons.cached, color: Colors.black87,),
+        child: Icon(
+          Icons.cached,
+          color: Colors.black87,
+        ),
         onPressed: () {
           model.dispatch(FetchData());
         },
@@ -44,12 +44,15 @@ class _StreamBuilderDemoState extends State<StreamBuilderDemo> {
 
           if (!snapshot.hasData || homeState is BusyState) {
             return Center(
-              child: CircularProgressIndicator(),
+              child: CircularProgressIndicator(
+                valueColor: AlwaysStoppedAnimation<Color>(Colors.amber),
+                backgroundColor: Colors.yellow,
+              ),
             );
           }
 
           if (homeState is DataFetchedState) {
-            if(!homeState.hasData) {
+            if (!homeState.hasData) {
               return _getInformationMessage('not found data');
             }
           }

diff --git a/lib/main.dart b/lib/main.dart
@@ -52,6 +52,7 @@ class App extends StatelessWidget {
       },
       theme: ThemeData(
         primaryColor: Colors.yellow,
+        accentColor: Colors.amber,
         highlightColor: Color.fromRGBO(255, 255, 255, 0.6),
         splashColor: Colors.white70,
       ),