From 12bd79e0aa5a30f930f2c1f389def500aceface6 Mon Sep 17 00:00:00 2001 From: Andrew Brogdon Date: Tue, 4 Sep 2018 15:16:40 -0700 Subject: [PATCH] Addressing comments. --- .../{veggie_provider.dart => local_veggie_provider.dart} | 2 +- veggieseasons/lib/data/model.dart | 6 +++--- veggieseasons/lib/main.dart | 1 - veggieseasons/lib/screens/list.dart | 1 + veggieseasons/lib/styles.dart | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename veggieseasons/lib/data/{veggie_provider.dart => local_veggie_provider.dart} (99%) diff --git a/veggieseasons/lib/data/veggie_provider.dart b/veggieseasons/lib/data/local_veggie_provider.dart similarity index 99% rename from veggieseasons/lib/data/veggie_provider.dart rename to veggieseasons/lib/data/local_veggie_provider.dart index 95c3a0a7b..0eddc77df 100644 --- a/veggieseasons/lib/data/veggie_provider.dart +++ b/veggieseasons/lib/data/local_veggie_provider.dart @@ -4,7 +4,7 @@ import 'package:veggieseasons/data/veggie.dart'; -class VeggieProvider { +class LocalVeggieProvider { static List veggies = [ Veggie( id: 1, diff --git a/veggieseasons/lib/data/model.dart b/veggieseasons/lib/data/model.dart index b573311ee..0936e7a04 100644 --- a/veggieseasons/lib/data/model.dart +++ b/veggieseasons/lib/data/model.dart @@ -4,16 +4,16 @@ import 'package:scoped_model/scoped_model.dart'; import 'package:veggieseasons/data/veggie.dart'; -import 'package:veggieseasons/data/veggie_provider.dart'; +import 'package:veggieseasons/data/local_veggie_provider.dart'; class AppState extends Model { List veggies; - AppState() : veggies = VeggieProvider.veggies; + AppState() : veggies = LocalVeggieProvider.veggies; List get allVeggies => veggies; - Veggie getVeggie(int id) => veggies.firstWhere((v) => v.id == id); + Veggie getVeggie(int id) => veggies.singleWhere((v) => v.id == id); List get availableVeggies { Season currentSeason = _getSeasonForDate(DateTime.now()); diff --git a/veggieseasons/lib/main.dart b/veggieseasons/lib/main.dart index e1ee480bc..bb5f4b637 100644 --- a/veggieseasons/lib/main.dart +++ b/veggieseasons/lib/main.dart @@ -7,7 +7,6 @@ import 'package:flutter/services.dart' show DeviceOrientation, SystemChrome; import 'package:scoped_model/scoped_model.dart'; import 'package:veggieseasons/data/model.dart'; import 'package:veggieseasons/screens/home.dart'; -import 'package:veggieseasons/styles.dart'; void main() { SystemChrome.setPreferredOrientations([ diff --git a/veggieseasons/lib/screens/list.dart b/veggieseasons/lib/screens/list.dart index 5558d67a3..b2d453abf 100644 --- a/veggieseasons/lib/screens/list.dart +++ b/veggieseasons/lib/screens/list.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/cupertino.dart'; +import 'package:flutter/widgets.dart'; import 'package:intl/intl.dart'; import 'package:scoped_model/scoped_model.dart'; import 'package:veggieseasons/data/model.dart'; diff --git a/veggieseasons/lib/styles.dart b/veggieseasons/lib/styles.dart index 892f4183d..b9dbeae54 100644 --- a/veggieseasons/lib/styles.dart +++ b/veggieseasons/lib/styles.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/widgets.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/widgets.dart'; import 'package:veggieseasons/data/veggie.dart'; abstract class Styles {