mirror of
https://github.com/flutter/samples.git
synced 2026-06-07 23:09:51 +00:00
Updates veggieseasons to Dart 2.3, adds some minor UI updates (#88)
This commit is contained in:
@@ -13,24 +13,16 @@ import 'package:veggieseasons/styles.dart';
|
||||
import 'package:veggieseasons/widgets/veggie_card.dart';
|
||||
|
||||
class ListScreen extends StatelessWidget {
|
||||
List<Widget> _generateVeggieRows(List<Veggie> veggies, Preferences prefs,
|
||||
{bool inSeason = true}) {
|
||||
final cards = List<Widget>();
|
||||
|
||||
for (Veggie veggie in veggies) {
|
||||
cards.add(Padding(
|
||||
padding: EdgeInsets.only(left: 16.0, right: 16.0, bottom: 24.0),
|
||||
child: FutureBuilder<Set<VeggieCategory>>(
|
||||
future: prefs.preferredCategories,
|
||||
builder: (context, snapshot) {
|
||||
final data = snapshot.data ?? Set<VeggieCategory>();
|
||||
return VeggieCard(
|
||||
veggie, inSeason, data.contains(veggie.category));
|
||||
}),
|
||||
));
|
||||
}
|
||||
|
||||
return cards;
|
||||
Widget _generateVeggieRow(veggie, Preferences prefs, {bool inSeason = true}) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(left: 16, right: 16, bottom: 24),
|
||||
child: FutureBuilder<Set<VeggieCategory>>(
|
||||
future: prefs.preferredCategories,
|
||||
builder: (context, snapshot) {
|
||||
final data = snapshot.data ?? Set<VeggieCategory>();
|
||||
return VeggieCard(veggie, inSeason, data.contains(veggie.category));
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -38,42 +30,46 @@ class ListScreen extends StatelessWidget {
|
||||
return CupertinoTabView(
|
||||
builder: (context) {
|
||||
String dateString = DateFormat("MMMM y").format(DateTime.now());
|
||||
|
||||
final appState =
|
||||
ScopedModel.of<AppState>(context, rebuildOnChange: true);
|
||||
final prefs =
|
||||
ScopedModel.of<Preferences>(context, rebuildOnChange: true);
|
||||
|
||||
final rows = <Widget>[];
|
||||
|
||||
rows.add(
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16.0, 24.0, 16.0, 16.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(dateString.toUpperCase(), style: Styles.minorText),
|
||||
Text('In season today', style: Styles.headlineText),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
rows.addAll(_generateVeggieRows(appState.availableVeggies, prefs));
|
||||
|
||||
rows.add(
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16.0, 24.0, 16.0, 16.0),
|
||||
child: Text('Not in season', style: Styles.headlineText),
|
||||
),
|
||||
);
|
||||
|
||||
rows.addAll(_generateVeggieRows(appState.unavailableVeggies, prefs,
|
||||
inSeason: false));
|
||||
|
||||
return DecoratedBox(
|
||||
decoration: BoxDecoration(color: Color(0xffffffff)),
|
||||
child: ListView(
|
||||
children: rows,
|
||||
child: ListView.builder(
|
||||
itemCount: appState.allVeggies.length + 2,
|
||||
itemBuilder: (context, index) {
|
||||
if (index == 0) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 24, 16, 16),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(dateString.toUpperCase(), style: Styles.minorText),
|
||||
Text('In season today', style: Styles.headlineText),
|
||||
],
|
||||
),
|
||||
);
|
||||
} else if (index <= appState.availableVeggies.length) {
|
||||
return _generateVeggieRow(
|
||||
appState.availableVeggies[index - 1],
|
||||
prefs,
|
||||
);
|
||||
} else if (index <= appState.availableVeggies.length + 1) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 24, 16, 16),
|
||||
child: Text('Not in season', style: Styles.headlineText),
|
||||
);
|
||||
} else {
|
||||
int relativeIndex =
|
||||
index - (appState.availableVeggies.length + 2);
|
||||
return _generateVeggieRow(
|
||||
appState.unavailableVeggies[relativeIndex], prefs,
|
||||
inSeason: false);
|
||||
}
|
||||
},
|
||||
),
|
||||
);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user