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

79
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,49 +129,53 @@ class _MyHomePageState extends State<MyHomePage>
} else { } else {
return null; return null;
} }
}, (value) { }, (value) {}, () {});
}, () {});
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new Scaffold( return new Scaffold(
appBar: new AppBar(title: buildSearchInput(context)), appBar: new AppBar(title: buildSearchInput(context)),
body: new TabBarView(controller: controller, children: <Widget>[ body: new TabBarView(controller: controller, children: <Widget>[
new FirstPage(), new FirstPage(),
new WidgetPage(db), new WidgetPage(db),
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(
height: 65.0, child: Container(
decoration: BoxDecoration( height: 65.0,
color: const Color(0xFFF0F0F0), decoration: BoxDecoration(
boxShadow: <BoxShadow>[ color: const Color(0xFFF0F0F0),
new BoxShadow( boxShadow: <BoxShadow>[
color: const Color(0xFFd0d0d0), BoxShadow(
blurRadius: 3.0, color: const Color(0xFFd0d0d0),
spreadRadius: 2.0, blurRadius: 3.0,
offset: Offset(-1.0, -1.0), spreadRadius: 2.0,
), offset: Offset(-1.0, -1.0),
],
), ),
child: new TabBar( ],
controller: controller, ),
indicatorColor: child: TabBar(
Theme.of(context).primaryColor, //tab标签的下划线颜色 controller: controller,
// labelColor: const Color(0xFF000000), indicatorColor: Theme.of(context).primaryColor, //tab标签的下划线颜色
indicatorWeight: 3.0, // labelColor: const Color(0xFF000000),
labelColor: Theme.of(context).primaryColor, indicatorWeight: 3.0,
unselectedLabelColor: const Color(0xFF8E8E8E), labelColor: Theme.of(context).primaryColor,
tabs: <Tab>[ unselectedLabelColor: const Color(0xFF8E8E8E),
new Tab(text: '业界动态', icon: new Icon(Icons.language)), tabs: <Tab>[
new Tab(text: '组件', icon: new Icon(Icons.extension)), Tab(text: '业界动态', icon: Icon(Icons.language)),
new Tab(text: '组件收藏', icon: new Icon(Icons.star)), Tab(text: '组件', icon: Icon(Icons.extension)),
new Tab(text: '关于手册', icon: new Icon(Icons.favorite)), Tab(text: '组件收藏', icon: Icon(Icons.star)),
])))); Tab(text: '关于手册', icon: Icon(Icons.favorite)),
],
),
),
),
),
);
} }
void _onTabChange() { void _onTabChange() {