Skip to content

Commit a6e46f3

Browse files
authored
Merge pull request #50 from EightMinuteYouth/master
Modify the wording to avoid misreading
2 parents f96cb26 + bfba886 commit a6e46f3

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

mecury_project/example/provider_example/lib/screens.dart

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import 'package:flutter/material.dart';
22
import 'package:provider/provider.dart';
33
import 'package:provider_example/order_provider.dart';
4-
import 'counter_model.dart';
4+
55
import 'color_model.dart';
6+
import 'counter_model.dart';
67
import 'goods_model.dart';
78

89
class FirstScreen extends StatelessWidget {
@@ -26,8 +27,7 @@ class FirstScreen extends StatelessWidget {
2627
),
2728
),
2829
floatingActionButton: FloatingActionButton(
29-
onPressed: () => Navigator.of(context)
30-
.push(MaterialPageRoute(builder: (context) => SecondScreen())),
30+
onPressed: () => Navigator.of(context).push(MaterialPageRoute(builder: (context) => SecondScreen())),
3131
child: Icon(Icons.navigate_next),
3232
),
3333
);
@@ -95,8 +95,7 @@ class SecondScreen extends StatelessWidget {
9595
),
9696
SizedBox(height: 20),
9797
Consumer<CounterModel>(
98-
builder: (context, CounterModel counter, child) =>
99-
FloatingActionButton(
98+
builder: (context, CounterModel counter, child) => FloatingActionButton(
10099
onPressed: () => counter.increment(),
101100
child: child,
102101
),
@@ -171,8 +170,7 @@ class GoodsListScreen extends StatelessWidget {
171170
title: Text(data.goodsName),
172171
trailing: GestureDetector(
173172
onTap: () => provider.collect(index),
174-
child: Icon(
175-
data.isCollection ? Icons.star : Icons.star_border),
173+
child: Icon(data.isCollection ? Icons.star : Icons.star_border),
176174
),
177175
);
178176
},
@@ -196,7 +194,6 @@ class GoodsListScreen extends StatelessWidget {
196194
}
197195
}
198196

199-
200197
class OrderListScreen extends StatefulWidget {
201198
@override
202199
_OrderListScreenState createState() => _OrderListScreenState();
@@ -211,22 +208,21 @@ class _OrderListScreenState extends State<OrderListScreen> {
211208
value: _provider,
212209
child: Scaffold(
213210
body: Selector<OrderProvider, List<Order>>(
214-
selector: (context, provider) => provider.orderList,
215-
builder: (context, provider, child) {
211+
selector: (BuildContext _, OrderProvider provider) => provider.orderList,
212+
builder: (BuildContext _, List<Order> orderList, Widget __) {
216213
return ListView.builder(
217214
itemCount: _provider.listSize,
218215
itemBuilder: (context, index) {
219216
return Selector<OrderProvider, Order>(
220-
selector: (context, provider) => provider.orderList[index],
221-
builder: (context, data, child) {
217+
selector: (BuildContext _, OrderProvider provider) => provider.orderList[index],
218+
builder: (BuildContext _, Order data, Widget __) {
222219
print(('No.${index + 1} rebuild'));
223220

224221
return ListTile(
225222
title: Text(data.goodsName),
226223
trailing: GestureDetector(
227224
onTap: () => _provider.collect(index),
228-
child: Icon(
229-
data.isCollection ? Icons.star : Icons.star_border),
225+
child: Icon(data.isCollection ? Icons.star : Icons.star_border),
230226
),
231227
);
232228
},
@@ -236,7 +232,7 @@ class _OrderListScreenState extends State<OrderListScreen> {
236232
},
237233
),
238234
floatingActionButton: Consumer<OrderProvider>(
239-
builder: (context, OrderProvider provider, child) {
235+
builder: (BuildContext _, OrderProvider provider, Widget __) {
240236
return FloatingActionButton(
241237
child: Icon(Icons.add),
242238
onPressed: () {

0 commit comments

Comments
 (0)