Merge pull request #208 from cyrilcolinet/main

chore: add missing switch case for AutovalidateMode.onUnfocus
peiffer-innovations · Sep 4, 2024 · 571b25d · 571b25d
2 parents c4cc03a + f08555b
commit 571b25d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 43 deletions.
diff --git a/json_theme/CHANGELOG.md b/json_theme/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [6.5.1+1] - August 7th, 2024
+
+* Add missing case AutovalidateMode.onUnfocus in encoder
+
+
 ## [6.5.0+1] - May 14th, 2024
 
 * Swapped MaterialStateProperty with WidgetStateProperty in preperation for other Flutter 3.22 work.

diff --git a/json_theme/lib/src/codec/theme_encoder.dart b/json_theme/lib/src/codec/theme_encoder.dart
@@ -238,27 +238,12 @@ class ThemeEncoder {
     return _stripDynamicNull(result);
   }
 
-  /// Encodes the given [value] to a [String].  Supported values are:
-  /// * `always`
-  /// * `disabled`
-  /// * `onUserInteraction`
+  /// Encodes the given [value] to a [String].
   static String? encodeAutovalidateMode(AutovalidateMode? value) {
     String? result;
 
     if (value != null) {
-      switch (value) {
-        case AutovalidateMode.always:
-          result = 'always';
-          break;
-
-        case AutovalidateMode.disabled:
-          result = 'disabled';
-          break;
-
-        case AutovalidateMode.onUserInteraction:
-          result = 'onUserInteraction';
-          break;
-      }
+      return value.name;
     }
 
     return _stripDynamicNull(result);

diff --git a/json_theme/pubspec.yaml b/json_theme/pubspec.yaml
@@ -1,7 +1,7 @@
 name: 'json_theme'
 description: 'A library to dynamically generate a ThemeData object from a JSON file or dynamic map object'
 homepage: 'https://github.com/peiffer-innovations/json_theme'
-version: '6.5.0+1'
+version: '6.5.1+1'
 
 environment:
   sdk: '>=3.2.0 <4.0.0'

diff --git a/json_theme/test/json_theme_test.dart b/json_theme/test/json_theme_test.dart
@@ -495,31 +495,11 @@ void main() {
       AutovalidateMode.always,
     );
 
-    expect(
-      ThemeDecoder.decodeAutovalidateMode('always'),
-      AutovalidateMode.always,
-    );
-    expect(
-      ThemeDecoder.decodeAutovalidateMode('disabled'),
-      AutovalidateMode.disabled,
-    );
-    expect(
-      ThemeDecoder.decodeAutovalidateMode('onUserInteraction'),
-      AutovalidateMode.onUserInteraction,
-    );
-
-    expect(
-      ThemeEncoder.encodeAutovalidateMode(AutovalidateMode.always),
-      'always',
-    );
-    expect(
-      ThemeEncoder.encodeAutovalidateMode(AutovalidateMode.disabled),
-      'disabled',
-    );
-    expect(
-      ThemeEncoder.encodeAutovalidateMode(AutovalidateMode.onUserInteraction),
-      'onUserInteraction',
-    );
+    // Test each values from AutovalidateMode enum
+    for (var value in AutovalidateMode.values) {
+      expect(ThemeDecoder.decodeAutovalidateMode(value.name), value);
+      expect(ThemeEncoder.encodeAutovalidateMode(value), value.name);
+    }
   });
 
   test('Axis', () {