From ad97fb0f92a14a2331b78d1c7785caae6adb1d75 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Tue, 29 Mar 2022 20:43:27 +1100
Subject: [PATCH] Fixes for static analysis

---
 analysis_options.yaml           |  6 +++++-
 lib/api_form.dart               |  4 ++++
 lib/settings/login.dart         |  9 +++++++++
 lib/widget/fields.dart          |  4 ++--
 lib/widget/submit_feedback.dart |  2 ++
 pubspec.yaml                    | 10 ++++------
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index ac57e310..29c06ebb 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -57,6 +57,10 @@ linter:
 
     sort_child_properties_last: false
 
+    depend_on_referenced_packages: false
+
+    noop_primitive_operations: false
+
     directives_ordering: false
 
     # Blindly follow the Flutter code style, which prefers types everywhere
@@ -70,4 +74,4 @@ linter:
 
     avoid_dynamic_calls: false
 
-    body_might_complete_normally_nullable: false
\ No newline at end of file
+    avoid_classes_with_only_static_members: false
\ No newline at end of file
diff --git a/lib/api_form.dart b/lib/api_form.dart
index 617aad27..b38b55b3 100644
--- a/lib/api_form.dart
+++ b/lib/api_form.dart
@@ -486,6 +486,8 @@ class APIFormField {
         if (quantity == null) {
           return L10().numberInvalid;
         }
+
+        return null;
       },
       onSaved: (val) {
         data["value"] = val;
@@ -673,6 +675,8 @@ class APIFormField {
         if (required && (value == null || value.isEmpty)) {
           // return L10().valueCannotBeEmpty;
         }
+
+        return null;
       },
     );
   }
diff --git a/lib/settings/login.dart b/lib/settings/login.dart
index 086be345..5c29e162 100644
--- a/lib/settings/login.dart
+++ b/lib/settings/login.dart
@@ -303,6 +303,8 @@ class _ProfileEditState extends State<ProfileEditWidget> {
                   if (value == null || value.trim().isEmpty) {
                     return L10().valueCannotBeEmpty;
                   }
+
+                  return null;
                 }
               ),
               TextFormField(
@@ -348,6 +350,9 @@ class _ProfileEditState extends State<ProfileEditWidget> {
                       return L10().invalidHost;
                     }
                   }
+
+                  // Everything is OK
+                  return null;
                 },
               ),
               TextFormField(
@@ -365,6 +370,8 @@ class _ProfileEditState extends State<ProfileEditWidget> {
                   if (value == null || value.trim().isEmpty) {
                     return L10().usernameEmpty;
                   }
+
+                  return null;
                 },
               ),
               TextFormField(
@@ -383,6 +390,8 @@ class _ProfileEditState extends State<ProfileEditWidget> {
                   if (value == null || value.trim().isEmpty) {
                     return L10().passwordEmpty;
                   }
+
+                  return null;
                 }
               )
             ]
diff --git a/lib/widget/fields.dart b/lib/widget/fields.dart
index eb5b7b1a..c50a20ec 100644
--- a/lib/widget/fields.dart
+++ b/lib/widget/fields.dart
@@ -48,9 +48,9 @@ class FilePickerDialog {
       if (path != null) {
         return File(path);
       }
-
-      return null;
     }
+
+    return null;
   }
 
   // Present a dialog to pick a file, either from local file system or from camera
diff --git a/lib/widget/submit_feedback.dart b/lib/widget/submit_feedback.dart
index 6a94bf1c..34392926 100644
--- a/lib/widget/submit_feedback.dart
+++ b/lib/widget/submit_feedback.dart
@@ -71,6 +71,8 @@ class _SubmitFeedbackState extends State<SubmitFeedbackWidget> {
                   if (value == null || value.trim().isEmpty) {
                     return L10().valueCannotBeEmpty;
                   }
+
+                  return null;
                 },
                 onSaved: (value) {
                   if (value != null) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 0ea3eb46..da04d3ac 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,12 +15,6 @@ environment:
 
 dependencies:
 
-  flutter:
-    sdk: flutter
-
-  flutter_localizations:
-    sdk: flutter
-
   audioplayers: ^0.20.1                   # Play audio files
   cached_network_image: ^3.2.0            # Download and cache remote images
   camera: ^0.9.4                       # Camera
@@ -29,7 +23,11 @@ dependencies:
   device_info_plus: ^3.2.2                # Information about the device
   dropdown_search: ^0.6.3                  # Dropdown autocomplete form fields
   file_picker: ^4.5.1                     # Select files from the device
+  flutter:
+    sdk: flutter
   flutter_cache_manager: ^3.3.0
+  flutter_localizations:
+    sdk: flutter
   flutter_markdown: ^0.6.9                # Rendering markdown
   font_awesome_flutter: ^9.1.0            # FontAwesome icon set
   http: ^0.13.4