style:优化二级页面主题样式

Author: wanwusangzhi

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.flutter.beer"
-    android:versionCode="1"
-    android:versionName="1.0" 
     android:installLocation="preferExternal">
 
     <!-- The INTERNET permission is required for development. Specifically,

lib/components/headerComp.dart

@@ -8,7 +8,7 @@ class Index extends StatelessWidget {
     return Text(
       this.text,
       style: TextStyle(
-        // fontStyle: FontStyle.normal,
+        color: Theme.of(context).primaryTextTheme.title.color
       ),
     );
   }

lib/components/webviewComp.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'headerComp.dart' as Header;
-import 'package:flutter_webview_plugin/flutter_webview_plugin.dart' show FlutterWebviewPlugin, WebviewScaffold;
+import 'package:flutter_webview_plugin/flutter_webview_plugin.dart'
+    show FlutterWebviewPlugin, WebviewScaffold;
 
 class Index extends StatelessWidget {
   final String url;
@@ -18,17 +19,20 @@ class Index extends StatelessWidget {
   Widget build(BuildContext context) {
     return WebviewScaffold(
       url: this.url,
-      appBar: new AppBar(
-        title: Header.Index(this.title),
+      enableAppScheme: false,
+      appBar: AppBar(
+        title: Text(
+          this.title,
+        ),
+        leading: IconButton(
+          icon: Icon(Icons.arrow_back),
+          color: Theme.of(context).primaryTextTheme.title.color,
+          onPressed: () => Navigator.pop(context),
+        ),
       ),
       withZoom: true,
       withLocalStorage: true,
       hidden: true,
-      // initialChild: Container(
-      //   child: const Center(
-      //     child: CircularProgressIndicator(),
-      //   ),
-      // ),
     );
   }
 }

lib/components/widgetComp.dart

@@ -84,17 +84,14 @@ class IndexState extends State<Index> {
       this.model = model;
       return Scaffold(
         appBar: AppBar(
-          /* title: Header.Index(
-            this.title,
-          ), */
+          title: Text(this.title),
           elevation: 0,
-          backgroundColor: Color(AppTheme.secondColor),
           actions: this.getActions(
             context,
           ),
           leading: IconButton(
             icon: Icon(Icons.arrow_back),
-            color: Color(AppTheme.blackColor),
+            color: Theme.of(context).primaryTextTheme.title.color,
             onPressed: () => Navigator.pop(context),
           ),
         ),
@@ -133,7 +130,7 @@ class IndexState extends State<Index> {
   getActions(context) {
     return [
       IconButton(
-        color: Color(AppTheme.blackColor),
+        color: Theme.of(context).primaryTextTheme.title.color,
         icon: Icon(
           Icons.insert_link,
         ),
@@ -154,7 +151,7 @@ class IndexState extends State<Index> {
       ), */
       IconButton(
         icon: Icon(Icons.share),
-        color: Color(AppTheme.blackColor),
+        color: Theme.of(context).primaryTextTheme.title.color,
         onPressed: () {
           final String msg =
               this.model.config.state.env.githubAssetOrigin + this.mdUrl;

lib/config/theme.dart

@@ -7,7 +7,6 @@ import 'color.dart' show materialColor;
  */
 
 class AppTheme {
-
   //static int mainColor = 0xFFD32F2F;
   static int mainColor = materialColor['red'];
   static int secondColor = 0xFFFFFFFF;
@@ -17,7 +16,7 @@ class AppTheme {
   static int lineColor = 0xFFEEEEEE;
   static getThemeData(String theme) {
     print('==================================getThemeData=$theme');
-    mainColor =materialColor[theme];
+    mainColor = materialColor[theme];
     ThemeData themData = ThemeData(
       textTheme: TextTheme(
         body1: TextStyle(
@@ -37,6 +36,14 @@ class AppTheme {
       ),
       accentColor: Colors.grey, // 选中颜色
       primaryColor: Color(mainColor), // appbar背景
+      primaryTextTheme:TextTheme(
+        title:TextStyle(
+          // color: Colors.red
+        ),
+        button: TextStyle(
+          color: Colors.red
+        )
+      ),
       scaffoldBackgroundColor: Color(secondColor), // 整体的scaffold背景颜色
     );
     return themData;