Skip to content

Commit 9e22325

Browse files
hanxu317317hanxu317317
committed
Merge branch 'CrazyCoderShi-develop' into develop
2 parents 26b2d3a + a2dcfb3 commit 9e22325

File tree

2 files changed

+43
-38
lines changed

2 files changed

+43
-38
lines changed

‎lib/components/pagination.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Pagination extends StatelessWidget {
2222
{'image': 'https://img.alicdn.com/tfs/TB1W4hMAwHqK1RjSZJnXXbNLpXa-519-260.jpg', 'type': 0, 'id': 9695909, 'url': 'https://www.zhihu.com/question/294145797/answer/551162834', 'title': '为什么阿里巴巴、腾讯和 Google 之类的企业都在使用 Flutter 开发 App？'},
2323
{'image': 'https://img.alicdn.com/tfs/TB1XmFIApzqK1RjSZSgXXcpAVXa-720-338.jpg', 'type': 0, 'id': 9695859, 'url': 'https://zhuanlan.zhihu.com/p/51696594', 'title': 'Flutter 1.0 正式发布: Google 的便携 UI 工具包'},
2424
{'image': 'https://img.alicdn.com/tfs/TB1mClCABLoK1RjSZFuXXXn0XXa-600-362.jpg', 'type': 0, 'id': 96956491409, 'url':'https://zhuanlan.zhihu.com/p/53497167','title': 'Flutter 示范应用现已开源 — 万物起源(The History of Everything)'},
25-
{'image': 'https://img.alicdn.com/tfs/TB1fXxIAAvoK1RjSZFNXXcxMVXa-600-362.jpg', 'type': 0, 'id': 9695816, 'url': 'https://mp.weixin.qq.com/s?__biz=MzAwODY4OTk2Mg==&mid=2652048101&idx=1&sn=20296088e4bd8ca33c5c9991167d9f7d&chksm=808caaa0b7fb23b65c0e5806209f8d86da6732f3a00a70353f3606018339518b0a8656f14dc5&mpshare=1&scene=2&srcid=0106SZapVysZdIS6Oc5AhNH6&from=timeline&ascene=2&devicetype=android-27&version=27000038&nettype=WIFI&abtest_cookie=BQABAAgACgALABMAFAAFAJ2GHgAjlx4AV5keAJuZHgCcmR4AAAA%3D&lang=zh_CN&pass_ticket=4K1%2FUpsxP4suPj2iubR17wbAP7r9LW9iYrPAC2dppTqv7j7JO5FWMXtcKeBRxueV&wx_header=1', 'title': 'Flutter 与 Material Design 双剑合璧，助您构建精美应用'}
25+
{'image': 'https://img.alicdn.com/tfs/TB1fXxIAAvoK1RjSZFNXXcxMVXa-600-362.jpg', 'type': 0, 'id': 9695816, 'url': 'https://mp.weixin.qq.com/s?__biz=MzAwODY4OTk2Mg==&mid=2652048101&idx=1&sn=20296088e4bd8ca33c5c9991167d9f7d&chksm=808caaa0b7fb23b65c0e5806209f8d86da6732f3a00a70353f3606018339518b0a8656f14dc5&mpsshare=1&scene=2&srcid=0106SZapVysZdIS6Oc5AhNH6&from=timeline&ascene=2&devicetype=android-27&version=27000038&nettype=WIFI&abtest_cookie=BQABAAgACgALABMAFAAFAJ2GHgAjlx4AV5keAJuZHgCcmR4AAAA%3D&lang=zh_CN&pass_ticket=4K1%2FUpsxP4suPj2iubR17wbAP7r9LW9iYrPAC2dppTqv7j7JO5FWMXtcKeBRxueV&wx_header=1', 'title': 'Flutter 与 Material Design 双剑合璧，助您构建精美应用'}
2626
];
2727

2828
void _launchURL(String url) async {

‎lib/main.dart

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import 'common/provider.dart';
1212
import 'model/widget.dart';
1313
import './widgets/index.dart';
1414
import 'package:flutter_go/components/search_input.dart';
15+
1516
const int ThemeColor = 0xFFC91B3A;
1617

1718
class MyApp extends StatelessWidget {
@@ -128,49 +129,53 @@ class _MyHomePageState extends State<MyHomePage>
128129
} else {
129130
return null;
130131
}
131-
}, (value) {
132-
}, () {});
132+
}, (value) {}, () {});
133133
}
134134

135135
@override
136136
Widget build(BuildContext context) {
137137
return new Scaffold(
138-
appBar: new AppBar(title: buildSearchInput(context)),
139-
body: new TabBarView(controller: controller, children: <Widget>[
140-
new FirstPage(),
141-
new WidgetPage(db),
142-
new CollectionPage(),
143-
new FourthPage()
144-
]),
145-
bottomNavigationBar: new Material(
146-
color: const Color(0xFFF0EEEF), //底部导航栏主题颜色
147-
child: new Container(
148-
height: 65.0,
149-
decoration: BoxDecoration(
150-
color: const Color(0xFFF0F0F0),
151-
boxShadow: <BoxShadow>[
152-
new BoxShadow(
153-
color: const Color(0xFFd0d0d0),
154-
blurRadius: 3.0,
155-
spreadRadius: 2.0,
156-
offset: Offset(-1.0, -1.0),
157-
),
158-
],
138+
appBar: new AppBar(title: buildSearchInput(context)),
139+
body: new TabBarView(controller: controller, children: <Widget>[
140+
new FirstPage(),
141+
new WidgetPage(db),
142+
new CollectionPage(),
143+
new FourthPage()
144+
]),
145+
bottomNavigationBar: Material(
146+
color: const Color(0xFFF0EEEF), //底部导航栏主题颜色
147+
child: SafeArea(
148+
child: Container(
149+
height: 65.0,
150+
decoration: BoxDecoration(
151+
color: const Color(0xFFF0F0F0),
152+
boxShadow: <BoxShadow>[
153+
BoxShadow(
154+
color: const Color(0xFFd0d0d0),
155+
blurRadius: 3.0,
156+
spreadRadius: 2.0,
157+
offset: Offset(-1.0, -1.0),
159158
),
160-
child: new TabBar(
161-
controller: controller,
162-
indicatorColor:
163-
Theme.of(context).primaryColor, //tab标签的下划线颜色
164-
// labelColor: const Color(0xFF000000),
165-
indicatorWeight: 3.0,
166-
labelColor: Theme.of(context).primaryColor,
167-
unselectedLabelColor: const Color(0xFF8E8E8E),
168-
tabs: <Tab>[
169-
new Tab(text: '业界动态', icon: new Icon(Icons.language)),
170-
new Tab(text: '组件', icon: new Icon(Icons.extension)),
171-
new Tab(text: '组件收藏', icon: new Icon(Icons.star)),
172-
new Tab(text: '关于手册', icon: new Icon(Icons.favorite)),
173-
]))));
159+
],
160+
),
161+
child: TabBar(
162+
controller: controller,
163+
indicatorColor: Theme.of(context).primaryColor, //tab标签的下划线颜色
164+
// labelColor: const Color(0xFF000000),
165+
indicatorWeight: 3.0,
166+
labelColor: Theme.of(context).primaryColor,
167+
unselectedLabelColor: const Color(0xFF8E8E8E),
168+
tabs: <Tab>[
169+
Tab(text: '业界动态', icon: Icon(Icons.language)),
170+
Tab(text: '组件', icon: Icon(Icons.extension)),
171+
Tab(text: '组件收藏', icon: Icon(Icons.star)),
172+
Tab(text: '关于手册', icon: Icon(Icons.favorite)),
173+
],
174+
),
175+
),
176+
),
177+
),
178+
);
174179
}
175180

176181
void _onTabChange() {

0 commit comments

Comments
 (0)