Merge cf97068d7b into 70b344bbbd

.github/workflows/flutterfmt.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-DIRS="lib test"
-EXIT=0
-
-for DIR in $DIRS; do
-    OUT="$(flutter format -l 120 --suppress-analytics "$DIR" | sed -e "s/^Formatted \(.*\)/::error file=$DIR\/\1::Not formatted/g")"
-    echo "$OUT" | grep "::error" && EXIT=1
-done
-
-exit $EXIT

.github/workflows/flutterfmt.yml

@@ -23,5 +23,5 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
 
-      - name: flutter format
+      - name: Check formating
-        run: $GITHUB_WORKSPACE/.github/workflows/flutterfmt.sh
+        run: dart format -l120 lib/ --set-exit-if-changed --suppress-analytics --output none

README.md

@@ -32,13 +32,16 @@ If you are having issues with iOS pods, try blowing it all away! `cd ios && rm -
 
 # Formatting
 
-`flutter format` can be used to format the code in `lib` and `test` but it's default is 80 char line limit, it's 2020
+`dart format` can be used to format the code in `lib` and `test`.  We use a line-length of 120 characters.
 
 Use:
 ```sh
-flutter format lib/ test/ -l 120
+dart format lib/ test/ -l 120
 ```
 
+In Android Studio, set the line length using Preferences -> Editor -> Code Style -> Dart -> Line length, set it to 120.  Enable auto-format with Preferences -> Languages & Frameworks -> Flutter -> Format code on save.
+
+
 # Release
 
 Update `version` in `pubspec.yaml` to reflect this release, then
@@ -53,4 +56,4 @@ Upload the android bundle to the google play store https://play.google.com/apps/
 
 ## iOS
 
-In xcode, Release -> Archive then follow the directions to upload to the app store. If you have issues, https://flutter.dev/docs/deployment/ios#create-a-build-archive
+In xcode, Release -> Archive then follow the directions to upload to the app store. If you have issues, https://flutter.dev/docs/deployment/ios#create-a-build-archive

lib/main.dart

@@ -85,44 +85,44 @@ class _AppState extends State<App> {
     return MaterialApp(
       theme: brightness == Brightness.light ? lightTheme : darkTheme,
       home: Scaffold(
-      body: PlatformProvider(
+        body: PlatformProvider(
-        //initialPlatform: initialPlatform,
+          //initialPlatform: initialPlatform,
-        builder: (context) => PlatformApp(
+          builder: (context) => PlatformApp(
-          debugShowCheckedModeBanner: false,
+            debugShowCheckedModeBanner: false,
-          localizationsDelegates: <LocalizationsDelegate<dynamic>>[
+            localizationsDelegates: <LocalizationsDelegate<dynamic>>[
-            DefaultMaterialLocalizations.delegate,
+              DefaultMaterialLocalizations.delegate,
-            DefaultWidgetsLocalizations.delegate,
+              DefaultWidgetsLocalizations.delegate,
-            DefaultCupertinoLocalizations.delegate,
+              DefaultCupertinoLocalizations.delegate,
-          ],
+            ],
-          title: 'Nebula',
+            title: 'Nebula',
-          material: (_, __) {
+            material: (_, __) {
-            return new MaterialAppData(
+              return new MaterialAppData(
-              themeMode: brightness == Brightness.light ? ThemeMode.light : ThemeMode.dark,
+                themeMode: brightness == Brightness.light ? ThemeMode.light : ThemeMode.dark,
-            );
-          },
-          cupertino: (_, __) => CupertinoAppData(
-            theme: CupertinoThemeData(brightness: brightness),
-          ),
-          onGenerateRoute: (settings) {
-            if (settings.name == '/') {
-              return platformPageRoute(context: context, builder: (context) => MainScreen(this.dnEnrolled));
-            }
-
-            final uri = Uri.parse(settings.name!);
-            if (uri.path == EnrollmentScreen.routeName) {
-              // TODO: maybe implement this as a dialog instead of a page, you can stack multiple enrollment screens which is annoying in dev
-              return platformPageRoute(
-                context: context,
-                builder: (context) =>
-                    EnrollmentScreen(code: EnrollmentScreen.parseCode(settings.name!), stream: this.dnEnrolled),
               );
-            }
+            },
+            cupertino: (_, __) => CupertinoAppData(
+              theme: CupertinoThemeData(brightness: brightness),
+            ),
+            onGenerateRoute: (settings) {
+              if (settings.name == '/') {
+                return platformPageRoute(context: context, builder: (context) => MainScreen(this.dnEnrolled));
+              }
 
-            return null;
+              final uri = Uri.parse(settings.name!);
-          },
+              if (uri.path == EnrollmentScreen.routeName) {
+                // TODO: maybe implement this as a dialog instead of a page, you can stack multiple enrollment screens which is annoying in dev
+                return platformPageRoute(
+                  context: context,
+                  builder: (context) =>
+                      EnrollmentScreen(code: EnrollmentScreen.parseCode(settings.name!), stream: this.dnEnrolled),
+                );
+              }
+
+              return null;
+            },
+          ),
         ),
       ),
-      ),
     );
   }
 }