TE trailing commas, dartfmt edits

fungsgithub · Sep 19, 2021 · a6704e4 · a6704e4
1 parent 5840998
commit a6704e4
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 36 deletions.
diff --git a/03-basic-widgets/projects/final/lib/author_card.dart b/03-basic-widgets/projects/final/lib/author_card.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'fooderlich_theme.dart';
 
 import 'circle_image.dart';
+import 'fooderlich_theme.dart';
 
 class AuthorCard extends StatelessWidget {
   // 1

diff --git a/03-basic-widgets/projects/final/lib/card1.dart b/03-basic-widgets/projects/final/lib/card1.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'fooderlich_theme.dart';
 
 class Card1 extends StatelessWidget {
@@ -53,7 +54,10 @@ class Card1 extends StatelessWidget {
         // 1
         padding: const EdgeInsets.all(16),
         // 2
-        constraints: const BoxConstraints.expand(width: 350, height: 450),
+        constraints: const BoxConstraints.expand(
+          width: 350,
+          height: 450,
+        ),
         // 3
         decoration: const BoxDecoration(
           // 4

diff --git a/03-basic-widgets/projects/final/lib/card2.dart b/03-basic-widgets/projects/final/lib/card2.dart
@@ -9,18 +9,27 @@ class Card2 extends StatelessWidget {
   Widget build(BuildContext context) {
     return Center(
       child: Container(
-        constraints: const BoxConstraints.expand(width: 350, height: 450),
+        constraints: const BoxConstraints.expand(
+          width: 350,
+          height: 450,
+        ),
         decoration: const BoxDecoration(
-            image: DecorationImage(
-                image: AssetImage('assets/mag5.png'), fit: BoxFit.cover),
-            borderRadius: BorderRadius.all(Radius.circular(10.0))),
+          image: DecorationImage(
+            image: AssetImage('assets/mag5.png'),
+            fit: BoxFit.cover,
+          ),
+          borderRadius: BorderRadius.all(
+            Radius.circular(10.0),
+          ),
+        ),
         child: Column(
           children: [
             // TODO 1: add author information
             const AuthorCard(
-                authorName: 'Mike Katz',
-                title: 'Smoothie Connoisseur',
-                imageProvider: AssetImage('assets/author_katz.jpeg')),
+              authorName: 'Mike Katz',
+              title: 'Smoothie Connoisseur',
+              imageProvider: AssetImage('assets/author_katz.jpeg'),
+            ),
             // TODO 4: add Positioned text
             // 1
             Expanded(

diff --git a/03-basic-widgets/projects/final/lib/card3.dart b/03-basic-widgets/projects/final/lib/card3.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'fooderlich_theme.dart';
 
 class Card3 extends StatelessWidget {
@@ -7,7 +8,10 @@ class Card3 extends StatelessWidget {
   Widget build(BuildContext context) {
     return Center(
       child: Container(
-        constraints: const BoxConstraints.expand(width: 350, height: 450),
+        constraints: const BoxConstraints.expand(
+          width: 350,
+          height: 450,
+        ),
         decoration: const BoxDecoration(
           image: DecorationImage(
             image: AssetImage('assets/mag2.png'),

diff --git a/03-basic-widgets/projects/final/lib/fooderlich_theme.dart b/03-basic-widgets/projects/final/lib/fooderlich_theme.dart
@@ -61,17 +61,24 @@ class FooderlichTheme {
   static ThemeData light() {
     return ThemeData(
       brightness: Brightness.light,
-      checkboxTheme:
-          CheckboxThemeData(
-            fillColor: MaterialStateColor.resolveWith((states) {
-        return Colors.black;
-      })),
+      checkboxTheme: CheckboxThemeData(
+        fillColor: MaterialStateColor.resolveWith(
+          (states) {
+            return Colors.black;
+          },
+        ),
+      ),
       appBarTheme: const AppBarTheme(
-          foregroundColor: Colors.black, backgroundColor: Colors.white),
+        foregroundColor: Colors.black,
+        backgroundColor: Colors.white,
+      ),
       floatingActionButtonTheme: const FloatingActionButtonThemeData(
-          foregroundColor: Colors.white, backgroundColor: Colors.black),
-      bottomNavigationBarTheme:
-          const BottomNavigationBarThemeData(selectedItemColor: Colors.green),
+        foregroundColor: Colors.white,
+        backgroundColor: Colors.black,
+      ),
+      bottomNavigationBarTheme: const BottomNavigationBarThemeData(
+        selectedItemColor: Colors.green,
+      ),
       textTheme: lightTextTheme,
     );
   }
@@ -80,12 +87,17 @@ class FooderlichTheme {
     return ThemeData(
       brightness: Brightness.dark,
       appBarTheme: AppBarTheme(
-          foregroundColor: Colors.white, backgroundColor: Colors.grey[900]),
+        foregroundColor: Colors.white,
+        backgroundColor: Colors.grey[900],
+      ),
       floatingActionButtonTheme: const FloatingActionButtonThemeData(
-          foregroundColor: Colors.white, backgroundColor: Colors.green),
-      bottomNavigationBarTheme:
-          const BottomNavigationBarThemeData(selectedItemColor: Colors.green),
+        foregroundColor: Colors.white,
+        backgroundColor: Colors.green,
+      ),
+      bottomNavigationBarTheme: const BottomNavigationBarThemeData(
+        selectedItemColor: Colors.green,
+      ),
       textTheme: darkTextTheme,
     );
   }
-}
+}
diff --git a/03-basic-widgets/projects/final/lib/home.dart b/03-basic-widgets/projects/final/lib/home.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'card1.dart';
 import 'card2.dart';
 import 'card3.dart';
@@ -33,9 +34,10 @@ class _HomeState extends State<Home> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-          title: Text('Fooderlich',
-              // 2
-              style: Theme.of(context).textTheme.headline6)),
+        title: Text('Fooderlich',
+            // 2
+            style: Theme.of(context).textTheme.headline6),
+      ),
       body: pages[_selectedIndex],
       // 4
       bottomNavigationBar: BottomNavigationBar(

diff --git a/03-basic-widgets/projects/final/lib/main.dart b/03-basic-widgets/projects/final/lib/main.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'fooderlich_theme.dart';
 import 'home.dart';
 

diff --git a/03-basic-widgets/projects/starter/lib/fooderlich_theme.dart b/03-basic-widgets/projects/starter/lib/fooderlich_theme.dart
@@ -61,10 +61,13 @@ class FooderlichTheme {
   static ThemeData light() {
     return ThemeData(
       brightness: Brightness.light,
-      checkboxTheme:
-          CheckboxThemeData(fillColor: MaterialStateColor.resolveWith((states) {
-        return Colors.black;
-      })),
+      checkboxTheme: CheckboxThemeData(
+        fillColor: MaterialStateColor.resolveWith(
+          (states) {
+            return Colors.black;
+          },
+        ),
+      ),
       appBarTheme: const AppBarTheme(
         foregroundColor: Colors.black,
         backgroundColor: Colors.white,
@@ -73,8 +76,9 @@ class FooderlichTheme {
         foregroundColor: Colors.white,
         backgroundColor: Colors.black,
       ),
-      bottomNavigationBarTheme:
-          const BottomNavigationBarThemeData(selectedItemColor: Colors.green),
+      bottomNavigationBarTheme: const BottomNavigationBarThemeData(
+        selectedItemColor: Colors.green,
+      ),
       textTheme: lightTextTheme,
     );
   }
@@ -83,13 +87,16 @@ class FooderlichTheme {
     return ThemeData(
       brightness: Brightness.dark,
       appBarTheme: AppBarTheme(
-          foregroundColor: Colors.white, backgroundColor: Colors.grey[900]),
+        foregroundColor: Colors.white,
+        backgroundColor: Colors.grey[900],
+      ),
       floatingActionButtonTheme: const FloatingActionButtonThemeData(
         foregroundColor: Colors.white,
         backgroundColor: Colors.green,
       ),
-      bottomNavigationBarTheme:
-          const BottomNavigationBarThemeData(selectedItemColor: Colors.green),
+      bottomNavigationBarTheme: const BottomNavigationBarThemeData(
+        selectedItemColor: Colors.green,
+      ),
       textTheme: darkTextTheme,
     );
   }