Fix for button issue

peiffer-innovations · Nov 12, 2023 · f5d886a · f5d886a
1 parent 042eafa
commit f5d886a
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 8 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -21,4 +21,5 @@ jobs:
       - name: Validate
         uses: peiffer-innovations/actions-flutter-validate@v1
         with:
+          generate_code: 'true'
           path: json_theme
diff --git a/annotation/CHANGELOG.md b/annotation/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [1.0.3] - November 12th, 2023
+
+* Dependency updates
+
+
 ## [1.0.2] - November 2nd, 2023
 
 * Updated [flutter_lints](https://pub.dev/packages/flutter_lints) to `3.0.0`

diff --git a/annotation/pubspec.yaml b/annotation/pubspec.yaml
@@ -1,7 +1,7 @@
 name: 'json_theme_annotation'
 description: 'Simple package holding the annotations needed by the JsonTheme code generator.'
 homepage: 'https://github.com/peiffer-innovations/json_theme'
-version: '1.0.2'
+version: '1.0.3'
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -12,8 +12,8 @@ analyzer:
     - 'lib/**/*.g.dart'
 
 dev_dependencies:
-  flutter_lints: '^3.0.0'
-  test: '^1.24.6'
+  flutter_lints: '^3.0.1'
+  test: '^1.24.9'
 
 ignore_updates:
   - 'archive'

diff --git a/json_theme/CHANGELOG.md b/json_theme/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [6.3.2] - November 12th, 2023
+
+* Fix for `filledButtonTheme` key (thanks [ajil-apx](https://github.com/ajil-apx))
+
+
 ## [6.3.1] - November 2nd, 2023
 
 * Updated [flutter_lints](https://pub.dev/packages/flutter_lints) to `3.0.0`

diff --git a/json_theme/lib/src/codec/theme_decoder.dart b/json_theme/lib/src/codec/theme_decoder.dart
@@ -13344,7 +13344,7 @@ class ThemeDecoder {
         // extensions: @unencodable,
 
         filledButtonTheme: decodeFilledButtonThemeData(
-          value[''],
+          value['filledButtonTheme'],
           validate: false,
         ),
 

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.3.1'
+version: '6.3.2'
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -14,9 +14,9 @@ analyzer:
 dependencies:
   flutter:
     sdk: 'flutter'
-  json_class: '^3.0.0'
+  json_class: '^3.0.0+8'
   json_schema: '^5.1.3'
-  json_theme_annotation: '^1.0.1+1'
+  json_theme_annotation: '^1.0.3'
   logging: '^1.2.0'
   meta: '^1.9.1'
 
@@ -25,7 +25,7 @@ dev_dependencies:
   build: '^2.4.1'
   build_runner: '^2.4.6'
   code_builder: '^4.7.0'
-  flutter_lints: '^3.0.0'
+  flutter_lints: '^3.0.1'
   flutter_test:
     sdk: 'flutter'
   json_theme_codegen: '^1.1.0'

diff --git a/json_theme/test/json_theme_test.dart b/json_theme/test/json_theme_test.dart
@@ -10967,6 +10967,13 @@ void main() {
           ),
         ),
       ),
+      filledButtonTheme: FilledButtonThemeData(
+        style: ButtonStyle(
+          backgroundColor: MaterialStateProperty.all(
+            const Color(0xff222222),
+          ),
+        ),
+      ),
       floatingActionButtonTheme: const FloatingActionButtonThemeData(
         backgroundColor: Color(0xeedddddd),
       ),
@@ -11276,6 +11283,21 @@ void main() {
           }
         }
       },
+      'filledButtonTheme': {
+        'style': {
+          'backgroundColor': {
+            'disabled': '#ff222222',
+            'dragged': '#ff222222',
+            'empty': '#ff222222',
+            'error': '#ff222222',
+            'focused': '#ff222222',
+            'hovered': '#ff222222',
+            'pressed': '#ff222222',
+            'scrolledUnder': '#ff222222',
+            'selected': '#ff222222'
+          }
+        }
+      },
       'floatingActionButtonTheme': {'backgroundColor': '#eedddddd'},
       'focusColor': '#ee333333',
       'highlightColor': '#dd111111',