Merge branch 'main' into main

.github/workflows/base.yaml

@@ -22,6 +22,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1 # Use shallow clone for faster checkout
 
       - name: Check broken links
         uses: JustinBeckwith/linkinator-action@v1
@@ -34,10 +36,18 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
 
+      - name: Get Flutter version by FVM
+        uses: kuhnroyal/flutter-fvm-config-action@v2
+        id: fvm-config-action
+        with:
+          path: ".fvmrc"
+
       - name: Flutter action
         uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
+          channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
+          architecture: x64
           cache: true
 
       - name: Install dependencies
@@ -65,19 +75,8 @@ jobs:
           flutter build web
 
   deployment:
-    if: ${{ github.ref_type == 'tag' }}
-    needs: build
-    name: Deploy package
     permissions:
       id-token: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dart-lang/setup-dart@v1
-      - name: Flutter action
-        uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          cache: true
-      - name: Publish package
-        run: dart pub publish -v -f
+    uses: flutter-form-builder-ecosystem/.github/.github/workflows/deployment.yaml@main
+    if: ${{ github.ref_type == 'tag' }}
+    needs: build

.github/workflows/pr.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: PR Conventional Commit Validation
-        uses:  ytanikin/PRConventionalCommits@1.2.0
+        uses:  ytanikin/PRConventionalCommits@1.3.0
         with:
          task_types: '["feat","fix","docs","test","ci","refactor","perf","chore","revert"]'
          add_label: 'false'

CHANGELOG.md

@@ -1,3 +1,40 @@
+# [9.5.0]
+
+## Fixes
+
+* #1350: valueTransformer transform values to null
+* #1416: Added missing TextField properties to FormBuilderTextField
+* #1398: Add hint to FormBuilderDropdown 
+* #1317: Added new property to form_builder_choice_chip
+
+# 9.4.1
+
+## Features
+
+* `FormBuilderTextField` Add missing fields from TextField
+
+## Other
+
+* ci: replace deployment jobs for reuse workflow
+
+# 9.4.0
+
+## Fixes
+
+* #1388 Respect latest field's initial value (esp when its forcefully recreated)
+
+## Features
+
+* `FormBuilderTextField` #1334 set enableSuggestions default to true
+* Replace deprecated property onPopInvoked
+* Use elevated button on main example
+* Update android settings on example
+
+## Chores
+
+* Set minimal Flutter version to 3.24.0
+* Set minimal Dart version to 3.5.0
+
 # [9.3.0]
 
 * Set minimal Flutter version to 3.22.0

example/.gitignore

@@ -31,9 +31,6 @@
 .pub/
 /build/
 
-# Web related
-lib/generated_plugin_registrant.dart
-
 # Symbolication related
 app.*.symbols
 

example/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,13 +22,9 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
     namespace "dev.danvickmiller.flutterformbuilder.example"
-    compileSdkVersion 33
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -48,8 +45,8 @@ android {
         applicationId "dev.danvickmiller.flutterformbuilder.example"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 16
-        targetSdkVersion 33
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -66,7 +63,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}

example/android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -26,4 +13,4 @@ subprojects {
 
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
-}
+}

example/android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.0" apply false
+}
+
+include ":app"

example/lib/sources/complete_form.dart

@@ -320,23 +320,20 @@ class _CompleteFormState extends State<CompleteForm> {
               ],
             ),
           ),
+          const SizedBox(height: 8),
           Row(
             children: <Widget>[
               Expanded(
                 child: ElevatedButton(
-                  onPressed: () {
-                    if (_formKey.currentState?.saveAndValidate() ?? false) {
-                      debugPrint(_formKey.currentState?.value.toString());
-                    } else {
-                      debugPrint(_formKey.currentState?.value.toString());
-                      debugPrint('validation failed');
-                    }
-                  },
-                  child: const Text(
-                    'Submit',
-                    style: TextStyle(color: Colors.white),
-                  ),
-                ),
+                    onPressed: () {
+                      if (_formKey.currentState?.saveAndValidate() ?? false) {
+                        debugPrint(_formKey.currentState?.value.toString());
+                      } else {
+                        debugPrint(_formKey.currentState?.value.toString());
+                        debugPrint('validation failed');
+                      }
+                    },
+                    child: const Text('Submit')),
               ),
               const SizedBox(width: 20),
               Expanded(
@@ -345,11 +342,7 @@ class _CompleteFormState extends State<CompleteForm> {
                     _formKey.currentState?.reset();
                   },
                   // color: Theme.of(context).colorScheme.secondary,
-                  child: Text(
-                    'Reset',
-                    style: TextStyle(
-                        color: Theme.of(context).colorScheme.secondary),
-                  ),
+                  child: const Text('Reset'),
                 ),
               ),
             ],

example/lib/sources/conditional_fields.dart

@@ -54,12 +54,8 @@ class _ConditionalFieldsState extends State<ConditionalFields> {
             child: const Text('Magic info'),
           ),
           const SizedBox(height: 10),
-          MaterialButton(
-            color: Theme.of(context).colorScheme.secondary,
-            child: const Text(
-              "Submit",
-              style: TextStyle(color: Colors.white),
-            ),
+          ElevatedButton(
+            child: const Text("Submit"),
             onPressed: () {
               _formKey.currentState!.saveAndValidate();
               debugPrint(_formKey.currentState?.instantValue.toString() ?? '');

example/lib/sources/custom_fields.dart

@@ -80,12 +80,8 @@ class _CustomFieldsState extends State<CustomFields> {
           Row(
             children: <Widget>[
               Expanded(
-                child: MaterialButton(
-                  color: Theme.of(context).colorScheme.secondary,
-                  child: const Text(
-                    "Submit",
-                    style: TextStyle(color: Colors.white),
-                  ),
+                child: ElevatedButton(
+                  child: const Text("Submit"),
                   onPressed: () {
                     _formKey.currentState!.save();
                     if (_formKey.currentState!.validate()) {
@@ -98,12 +94,8 @@ class _CustomFieldsState extends State<CustomFields> {
               ),
               const SizedBox(width: 20),
               Expanded(
-                child: MaterialButton(
-                  color: Theme.of(context).colorScheme.secondary,
-                  child: const Text(
-                    "Reset",
-                    style: TextStyle(color: Colors.white),
-                  ),
+                child: ElevatedButton(
+                  child: const Text("Reset"),
                   onPressed: () {
                     _formKey.currentState!.reset();
                   },

example/lib/sources/dynamic_fields.dart

@@ -46,12 +46,8 @@ class _DynamicFieldsState extends State<DynamicFields> {
           Row(
             children: <Widget>[
               Expanded(
-                child: MaterialButton(
-                  color: Theme.of(context).colorScheme.secondary,
-                  child: const Text(
-                    "Submit",
-                    style: TextStyle(color: Colors.white),
-                  ),
+                child: ElevatedButton(
+                  child: const Text("Submit"),
                   onPressed: () {
                     _formKey.currentState!.saveAndValidate();
                     setState(() {
@@ -63,12 +59,8 @@ class _DynamicFieldsState extends State<DynamicFields> {
               ),
               const SizedBox(width: 20),
               Expanded(
-                child: MaterialButton(
-                  color: Theme.of(context).colorScheme.secondary,
-                  child: const Text(
-                    "Add field",
-                    style: TextStyle(color: Colors.white),
-                  ),
+                child: ElevatedButton(
+                  child: const Text("Add field"),
                   onPressed: () {
                     final newTextFieldName = 'name_${_newTextFieldId++}';
                     final newTextFieldKey = ValueKey(_newTextFieldId);

example/lib/sources/related_fields.dart

@@ -64,12 +64,8 @@ class _RelatedFieldsState extends State<RelatedFields> {
                 .toList(),
           ),
           const SizedBox(height: 10),
-          MaterialButton(
-            color: Theme.of(context).colorScheme.secondary,
-            child: const Text(
-              "Submit",
-              style: TextStyle(color: Colors.white),
-            ),
+          ElevatedButton(
+            child: const Text("Submit"),
             onPressed: () {
               _formKey.currentState!.saveAndValidate();
               debugPrint(_formKey.currentState?.instantValue.toString() ?? '');

example/lib/sources/signup_form.dart

@@ -89,8 +89,7 @@ class _SignupFormState extends State<SignupForm> {
               },
             ),
             const SizedBox(height: 10),
-            MaterialButton(
-              color: Theme.of(context).colorScheme.secondary,
+            ElevatedButton(
               onPressed: () {
                 if (_formKey.currentState?.saveAndValidate() ?? false) {
                   if (true) {
@@ -103,8 +102,7 @@ class _SignupFormState extends State<SignupForm> {
                 }
                 debugPrint(_formKey.currentState?.value.toString());
               },
-              child:
-                  const Text('Signup', style: TextStyle(color: Colors.white)),
+              child: const Text('Signup'),
             )
           ],
         ),