Flutter 3.19

json_dynamic_widget/CHANGELOG.md

@@ -1,6 +1,7 @@
-## [7.0.6+6] - February 20, 2024
+## [7.1.0] - February 20, 2024
 
-* Automated dependency updates
+* Updated for Flutter 3.19
+* Fixed `decoration` and `foregroundDecoration` on `animated_container` and `container`.
 
 
 ## [7.0.6+5] - January 16, 2024
@@ -739,33 +740,3 @@ This is a huge release with several breaking changes.  It brings in the ability
 ## [0.9.9] - July 18th, 2020
 
 * Initial release
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

json_dynamic_widget/bin/migrate_7.dart

@@ -60,7 +60,7 @@ Attempting to migrate the files found in:
       output.writeAsStringSync(content);
       if (isYaml) {
         file.writeAsStringSync(
-          YAMLWriter(
+          YamlWriter(
             allowUnquotedStrings: true,
             indentSize: 2,
           ).convert(data),

json_dynamic_widget/example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

json_dynamic_widget/example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

json_dynamic_widget/example/ios/Podfile.lock

@@ -0,0 +1,16 @@
+PODS:
+  - Flutter (1.0.0)
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+
+SPEC CHECKSUMS:
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+
+PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
+
+COCOAPODS: 1.15.0

json_dynamic_widget/example/ios/Runner.xcodeproj/project.pbxproj

@@ -163,7 +163,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -212,6 +212,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -332,7 +333,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -417,7 +418,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -466,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

json_dynamic_widget/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

json_dynamic_widget/example/lib/src/launcher.dart

@@ -327,6 +327,7 @@ class _RootPageState extends State<RootPage> {
     String pageId,
     String extension,
   ) async {
+    final nav = Navigator.of(context);
     final registry = JsonWidgetRegistry.instance.copyWith();
     final pageStr = await rootBundle.loadString(
       'assets/pages/$pageId$extension',
@@ -344,7 +345,7 @@ class _RootPageState extends State<RootPage> {
     );
 
     if (mounted) {
-      await Navigator.of(context).push(
+      await nav.push(
         MaterialPageRoute(
           builder: (BuildContext context) => FullWidgetPage(
             data: data,
@@ -365,6 +366,7 @@ class _RootPageState extends State<RootPage> {
     String themeId,
   ) async {
     final registry = JsonWidgetRegistry.instance.copyWith();
+    final nav = Navigator.of(context);
     final pageStr = await rootBundle.loadString('assets/pages/$themeId.json');
     final dataJson = json.decode(pageStr);
 
@@ -379,7 +381,7 @@ class _RootPageState extends State<RootPage> {
     );
 
     if (mounted) {
-      await Navigator.of(context).push(
+      await nav.push(
         MaterialPageRoute(
           builder: (BuildContext context) => UntestableFullWidgetPage(
             data: data,

json_dynamic_widget/lib/json_dynamic_widget.dart

@@ -1,6 +1,7 @@
 export 'package:child_builder/child_builder.dart';
 export 'package:dynamic_widget_annotation/dynamic_widget_annotation.dart';
 export 'package:flutter/material.dart';
+export 'package:flutter/rendering.dart';
 export 'package:flutter/services.dart';
 export 'package:json_class/json_class.dart';
 export 'package:json_theme/json_theme.dart';

json_dynamic_widget/lib/src/builders/json_animated_container_builder.dart

@@ -9,6 +9,34 @@ abstract class _JsonAnimatedContainerBuilder extends JsonWidgetBuilder {
   const _JsonAnimatedContainerBuilder({
     required super.args,
   });
+  @JsonArgSchema('decoration')
+  static Map<String, dynamic> _decorationSchema() => BoxDecorationSchema.schema;
+
+  @JsonArgSchema('foregroundDecoration')
+  static Map<String, dynamic> _foregroundDecorationSchema() =>
+      BoxDecorationSchema.schema;
+
+  @JsonArgEncoder('decoration')
+  static Map<String, dynamic>? _encodeDecoration(dynamic value) =>
+      value is BoxDecoration ? ThemeEncoder.encodeBoxDecoration(value) : null;
+
+  @JsonArgEncoder('foregroundDecoration')
+  static Map<String, dynamic>? _encodeForegroundDecoration(dynamic value) =>
+      value is BoxDecoration ? ThemeEncoder.encodeBoxDecoration(value) : null;
+
+  @JsonArgDecoder('decoration')
+  Decoration? _decodeDecoration({required dynamic value}) =>
+      ThemeDecoder.decodeBoxDecoration(
+        value,
+        validate: false,
+      );
+
+  @JsonArgDecoder('foregroundDecoration')
+  Decoration? _decodeForegroundDecoration({required dynamic value}) =>
+      ThemeDecoder.decodeBoxDecoration(
+        value,
+        validate: false,
+      );
 
   @override
   AnimatedContainer buildCustom({

json_dynamic_widget/lib/src/builders/json_container_builder.dart

@@ -9,10 +9,21 @@ abstract class _JsonContainerBuilder extends JsonWidgetBuilder {
     required super.args,
   });
 
+  @JsonArgSchema('decoration')
+  static Map<String, dynamic> _decorationSchema() => BoxDecorationSchema.schema;
+
+  @JsonArgSchema('foregroundDecoration')
+  static Map<String, dynamic> _foregroundDecorationSchema() =>
+      BoxDecorationSchema.schema;
+
   @JsonArgEncoder('decoration')
   static Map<String, dynamic>? _encodeDecoration(dynamic value) =>
       value is BoxDecoration ? ThemeEncoder.encodeBoxDecoration(value) : null;
 
+  @JsonArgEncoder('foregroundDecoration')
+  static Map<String, dynamic>? _encodeForegroundDecoration(dynamic value) =>
+      value is BoxDecoration ? ThemeEncoder.encodeBoxDecoration(value) : null;
+
   @JsonArgDecoder('decoration')
   Decoration? _decodeDecoration({required dynamic value}) =>
       ThemeDecoder.decodeBoxDecoration(

json_dynamic_widget/lib/src/builders/json_rich_text_builder.dart

@@ -1,5 +1,3 @@
-// ignore: unused_import
-import 'package:flutter/rendering.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 part 'json_rich_text_builder.g.dart';

json_dynamic_widget/lib/src/builders/json_semantics_builder.dart

@@ -1,5 +1,3 @@
-// ignore: unused_import
-import 'package:flutter/rendering.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 part 'json_semantics_builder.g.dart';

json_dynamic_widget/lib/src/widgets/json_widget_exporter.dart

@@ -97,7 +97,7 @@ class JsonWidgetExporterData extends State<JsonWidgetExporter> {
           break;
 
         case ReverseEncodingMode.yaml:
-          final lines = YAMLWriter(
+          final lines = YamlWriter(
             allowUnquotedStrings: true,
             indentSize: max(indent.length, 2),
           )

json_dynamic_widget/pubspec.yaml

@@ -1,47 +1,47 @@
 name: 'json_dynamic_widget'
 description: 'A library to dynamically generate widgets within Flutter from JSON or other Map-like structures.'
 repository: 'https://github.com/peiffer-innovations/json_dynamic_widget/tree/main/json_dynamic_widget'
-version: '7.0.6+6'
+version: '7.1.0'
 
-environment: 
+environment:
   sdk: '>=3.0.0 <4.0.0'
 
-analyzer: 
-  exclude: 
+analyzer:
+  exclude:
     - 'lib/generated/**'
 
-dependencies: 
+dependencies:
   child_builder: '^2.0.2'
   collection: '^1.17.1'
   dynamic_widget_annotation: '^1.1.2+2'
   execution_timer: '^1.1.0+5'
-  flutter: 
+  flutter:
     sdk: 'flutter'
   form_validation: '^3.1.1+4'
   interpolation: '^2.1.2'
   json_class: '^3.0.0+12'
   json_conditional: '^3.0.1+6'
   json_schema: '^5.1.3'
-  json_theme: '^6.4.0'
+  json_theme: '^6.4.1'
   logging: '^1.2.0'
   meta: '^1.9.1'
-  template_expressions: '^3.1.5+5'
+  template_expressions: '^3.1.6'
   uuid: '^4.1.0'
   yaml_writer: '^2.0.0'
   yaon: '^1.1.4+4'
 
-dev_dependencies: 
+dev_dependencies:
   build_runner: '^2.4.8'
   flutter_lints: '^3.0.1'
-  flutter_test: 
+  flutter_test:
     sdk: 'flutter'
   json_dynamic_widget_codegen: '^1.0.5+2'
 
-dependency_overrides: 
-  json_dynamic_widget_codegen: 
+dependency_overrides:
+  json_dynamic_widget_codegen:
     path: '../codegen'
 
-ignore_updates: 
+ignore_updates:
   - 'archive'
   - 'async'
   - 'boolean_selector'