Merge pull request #1214 from appwrite/chore-improve-dart-flutter-pub-dev-score

chore: ensure the full analysis options are used when formatting

Author: abnegate

templates/dart/.github/workflows/format.yml.twig

@@ -20,6 +20,9 @@ jobs:
           persist-credentials: true
           ref: ${{ '{{'}} github.event.pull_request.head.ref {{ '}}' }}
 
+      - name: Install dependencies
+        run: dart pub get
+
       - name: Format Dart code
         run: dart format .
 
@@ -29,5 +32,5 @@ jobs:
       - name: Add & Commit
         uses: EndBug/[email protected]
         with:
-            add: lib
+            add: '["lib", "test"]'
 

templates/dart/base/requests/oauth.twig

@@ -16,10 +16,11 @@
     params.forEach((key, value) {
       if (value is List) { 
         for (var item in value) {
-          query.add(Uri.encodeComponent(key + '[]') + '=' + Uri.encodeComponent(item));
+          query.add(
+              '${Uri.encodeComponent('$key[]')}=${Uri.encodeComponent(item)}');
         }
       } else if (value != null) {
-        query.add(Uri.encodeComponent(key) + '=' + Uri.encodeComponent(value));
+        query.add('${Uri.encodeComponent(key)}=${Uri.encodeComponent(value)}');
       }
     });
 

templates/dart/lib/query.dart.twig

@@ -6,7 +6,7 @@ class Query {
   final String? attribute;
   final dynamic values;
 
-  Query._(this.method, [this.attribute = null, this.values = null]);
+  Query._(this.method, [this.attribute, this.values]);
 
   Map<String, dynamic> toJson() {
     final result = <String, dynamic>{};

templates/dart/lib/src/client.dart.twig

@@ -42,7 +42,7 @@ abstract class Client {
   ///
   /// {{header.description}}
 {% endif %}
-  Client set{{header.key | caseUcfirst}}(value);
+  Client set{{header.key | caseUcfirst}}(String value);
 
 {% endfor %}
   /// Add headers that should be sent with all API calls.

templates/dart/lib/src/client_mixin.dart.twig

@@ -45,7 +45,7 @@ mixin ClientMixin {
             return MapEntry(key, value.toString());
           }
           if (value is List) {
-            return MapEntry(key + "[]", value);
+            return MapEntry("$key[]", value);
           }
           return MapEntry(key, value);
         });

templates/flutter/.github/workflows/format.yml.twig

@@ -10,8 +10,6 @@ on:
 jobs:
   format:
     runs-on: ubuntu-latest
-    container:
-        image:  dart:stable
 
     steps:
       - name: Checkout repository
@@ -20,6 +18,14 @@ jobs:
           persist-credentials: true
           ref: ${{ '{{'}} github.event.pull_request.head.ref {{ '}}' }}
 
+      - name: Install Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+
+      - name: Install dependencies
+        run: flutter pub get
+
       - name: Format Dart code
         run: dart format .
 
@@ -29,5 +35,5 @@ jobs:
       - name: Add & Commit
         uses: EndBug/[email protected]
         with:
-            add: lib
+            add: '["lib", "test"]'
 

templates/flutter/base/requests/oauth.twig

@@ -16,10 +16,11 @@
         params.forEach((key, value) {
           if (value is List) { 
             for (var item in value) {
-              query.add(Uri.encodeComponent(key + '[]') + '=' + Uri.encodeComponent(item));
+              query.add(
+              '${Uri.encodeComponent('$key[]')}=${Uri.encodeComponent(item)}');
             }
           } else if(value != null) {
-              query.add(Uri.encodeComponent(key) + '=' + Uri.encodeComponent(value));
+              query.add('${Uri.encodeComponent(key)}=${Uri.encodeComponent(value)}');
           }
         });
 

templates/flutter/lib/src/client.dart.twig

@@ -61,7 +61,7 @@ abstract class Client {
   ///
   /// {{header.description}}.
 {% endif %}
-  Client set{{header.key | caseUcfirst}}(value);
+  Client set{{header.key | caseUcfirst}}(String value);
 
 {% endfor %}
   /// Add headers that should be sent with all API calls.

templates/flutter/lib/src/client_io.dart.twig

@@ -181,7 +181,7 @@ class ClientIO extends ClientBase with ClientMixin {
     } catch (e) {
       debugPrint('Error getting device info: $e');
       device = Platform.operatingSystem;
-      addHeader('user-agent', '$device');
+      addHeader('user-agent', device);
     }
 
     _initialized = true;

templates/flutter/lib/src/client_mixin.dart.twig

@@ -45,7 +45,7 @@ mixin ClientMixin {
             return MapEntry(key, value.toString());
           }
           if (value is List) {
-            return MapEntry(key + "[]", value);
+            return MapEntry("$key[]", value);
           }
           return MapEntry(key, value);
         });