flutter/flutter-go
1
0
Fork 0
mirror of https://github.com/alibaba/flutter-go.git synced 2025-08-06 17:48:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(solve conflict):

Browse Source
This commit is contained in:
sanfan.hx
2019-01-14 14:48:32 +08:00
parent 2464c39a7a d166d2113c
commit a2dcfb3717
1 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/main.dart
View File

@ -12,6 +12,7 @@ import 'common/provider.dart';
import 'model/widget.dart'; import 'model/widget.dart';
import './widgets/index.dart'; import './widgets/index.dart';
import 'package:flutter_go/components/search_input.dart'; import 'package:flutter_go/components/search_input.dart';
const int ThemeColor = 0xFFC91B3A; const int ThemeColor = 0xFFC91B3A;
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
@ -128,8 +129,7 @@ class _MyHomePageState extends State<MyHomePage>
} else { } else {
return null; return null;
} }
}, (value) { }, (value) {}, () {});
}, () {});
} }
@override @override
@ -142,14 +142,15 @@ class _MyHomePageState extends State<MyHomePage>
new CollectionPage(), new CollectionPage(),
new FourthPage() new FourthPage()
]), ]),
bottomNavigationBar: new Material( bottomNavigationBar: Material(
color: const Color(0xFFF0EEEF), //底部导航栏主题颜色 color: const Color(0xFFF0EEEF), //底部导航栏主题颜色
child: new Container( child: SafeArea(
child: Container(
height: 65.0, height: 65.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: const Color(0xFFF0F0F0), color: const Color(0xFFF0F0F0),
boxShadow: <BoxShadow>[ boxShadow: <BoxShadow>[
new BoxShadow( BoxShadow(
color: const Color(0xFFd0d0d0), color: const Color(0xFFd0d0d0),
blurRadius: 3.0, blurRadius: 3.0,
spreadRadius: 2.0, spreadRadius: 2.0,
@ -157,20 +158,24 @@ class _MyHomePageState extends State<MyHomePage>
), ),
], ],
), ),
child: new TabBar( child: TabBar(
controller: controller, controller: controller,
indicatorColor: indicatorColor: Theme.of(context).primaryColor, //tab标签的下划线颜色
Theme.of(context).primaryColor, //tab标签的下划线颜色
// labelColor: const Color(0xFF000000), // labelColor: const Color(0xFF000000),
indicatorWeight: 3.0, indicatorWeight: 3.0,
labelColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor,
unselectedLabelColor: const Color(0xFF8E8E8E), unselectedLabelColor: const Color(0xFF8E8E8E),
tabs: <Tab>[ tabs: <Tab>[
new Tab(text: '业界动态', icon: new Icon(Icons.language)), Tab(text: '业界动态', icon: Icon(Icons.language)),
new Tab(text: '组件', icon: new Icon(Icons.extension)), Tab(text: '组件', icon: Icon(Icons.extension)),
new Tab(text: '组件收藏', icon: new Icon(Icons.star)), Tab(text: '组件收藏', icon: Icon(Icons.star)),
new Tab(text: '关于手册', icon: new Icon(Icons.favorite)), Tab(text: '关于手册', icon: Icon(Icons.favorite)),
])))); ],
),
),
),
),
);
} }
void _onTabChange() { void _onTabChange() {