diff --git a/place_tracker/lib/place_map.dart b/place_tracker/lib/place_map.dart index 12fcaf404..c9b923e58 100644 --- a/place_tracker/lib/place_map.dart +++ b/place_tracker/lib/place_map.dart @@ -224,7 +224,6 @@ class PlaceMapState extends State { void _confirmAddPlace(BuildContext context) async { if (_pendingMarker != null) { - // Create a new Place and map it to the marker we just added. final Place newPlace = Place( id: Uuid().v1(), diff --git a/travis_script.sh b/travis_script.sh index f53c7a95a..4c619cf7c 100755 --- a/travis_script.sh +++ b/travis_script.sh @@ -18,7 +18,7 @@ do ../flutter/bin/flutter analyze # Run the formatter on all the dart files to make sure everything's linted. - find . | grep "\.dart$" | xargs ../flutter/bin/flutter format -n + ../flutter/bin/flutter format -n --set-exit-if-changed . # Run the actual tests. ../flutter/bin/flutter test diff --git a/veggieseasons/lib/screens/list.dart b/veggieseasons/lib/screens/list.dart index 709ac3cb3..9a5611fc6 100644 --- a/veggieseasons/lib/screens/list.dart +++ b/veggieseasons/lib/screens/list.dart @@ -13,11 +13,8 @@ import 'package:veggieseasons/styles.dart'; import 'package:veggieseasons/widgets/veggie_card.dart'; class ListScreen extends StatelessWidget { - List _generateVeggieRows( - List veggies, - Preferences prefs, - { bool inSeason = true } - ) { + List _generateVeggieRows(List veggies, Preferences prefs, + {bool inSeason = true}) { final cards = List(); for (Veggie veggie in veggies) { @@ -27,7 +24,8 @@ class ListScreen extends StatelessWidget { future: prefs.preferredCategories, builder: (context, snapshot) { final data = snapshot.data ?? Set(); - return VeggieCard(veggie, inSeason, data.contains(veggie.category)); + return VeggieCard( + veggie, inSeason, data.contains(veggie.category)); }), )); } @@ -69,7 +67,8 @@ class ListScreen extends StatelessWidget { ), ); - rows.addAll(_generateVeggieRows(appState.unavailableVeggies, prefs, inSeason: false)); + rows.addAll(_generateVeggieRows(appState.unavailableVeggies, prefs, + inSeason: false)); return DecoratedBox( decoration: BoxDecoration(color: Color(0xffffffff)), diff --git a/veggieseasons/lib/styles.dart b/veggieseasons/lib/styles.dart index 83f0084b7..6e3371298 100644 --- a/veggieseasons/lib/styles.dart +++ b/veggieseasons/lib/styles.dart @@ -270,8 +270,7 @@ abstract class Styles { static const servingInfoBorderColor = Color(0xffb0b0b0); - static const ColorFilter desaturatedColorFilter = + static const ColorFilter desaturatedColorFilter = // 222222 is a random color that has low color saturation. ColorFilter.mode(Color(0xFF222222), BlendMode.saturation); - } diff --git a/veggieseasons/lib/widgets/veggie_card.dart b/veggieseasons/lib/widgets/veggie_card.dart index 5686edd36..7449a8623 100644 --- a/veggieseasons/lib/widgets/veggie_card.dart +++ b/veggieseasons/lib/widgets/veggie_card.dart @@ -130,9 +130,8 @@ class VeggieCard extends StatelessWidget { decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.cover, - colorFilter: isInSeason - ? null - : Styles.desaturatedColorFilter, + colorFilter: + isInSeason ? null : Styles.desaturatedColorFilter, image: AssetImage( veggie.imageAssetPath, ),