Updates

peiffer-innovations · Sep 10, 2024 · 5c9f92e · 5c9f92e
1 parent 1f5be67
commit 5c9f92e
Show file tree

Hide file tree

Showing 112 changed files with 30 additions and 130 deletions.
diff --git a/json_dynamic_widget/CHANGELOG.md b/json_dynamic_widget/CHANGELOG.md
@@ -1,7 +1,8 @@
-## [7.2.2+1] - September 10, 2024
-
-* Automated dependency updates
+## [7.3.0] - September 10, 2024
 
+* Rebuilt with Flutter 3.24
+* Removed deprecated `ButtonBar` and replaced it with `OverflowBar`
+* [Thauanny](https://github.com/Thauanny): Added error callback when en error happens building wigets 
 
 ## [7.2.1] - June 21, 2024
 

diff --git a/json_dynamic_widget/example/lib/src/export_example_page.dart b/json_dynamic_widget/example/lib/src/export_example_page.dart
@@ -1,4 +1,3 @@
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 class ExportExamplePage extends StatefulWidget {

diff --git a/json_dynamic_widget/example/lib/src/issue_220_page.dart b/json_dynamic_widget/example/lib/src/issue_220_page.dart
@@ -1,4 +1,3 @@
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 /// https://github.com/peiffer-innovations/json_dynamic_widget/issues/220

diff --git a/json_dynamic_widget/lib/builders.dart b/json_dynamic_widget/lib/builders.dart
@@ -15,7 +15,6 @@ export 'src/builders/json_app_bar_builder.dart';
 export 'src/builders/json_aspect_ratio_builder.dart';
 export 'src/builders/json_asset_image_builder.dart';
 export 'src/builders/json_baseline_builder.dart';
-export 'src/builders/json_button_bar_builder.dart';
 export 'src/builders/json_card_builder.dart';
 export 'src/builders/json_center_builder.dart';
 export 'src/builders/json_checkbox_builder.dart';
@@ -71,6 +70,7 @@ export 'src/builders/json_no_op_builder.dart';
 export 'src/builders/json_offstage_builder.dart';
 export 'src/builders/json_opacity_builder.dart';
 export 'src/builders/json_outlined_button_builder.dart';
+export 'src/builders/json_overflow_bar_builder.dart';
 export 'src/builders/json_overflow_box_builder.dart';
 export 'src/builders/json_padding_builder.dart';
 export 'src/builders/json_placeholder_builder.dart';

diff --git a/json_dynamic_widget/lib/src/builders/json_dynamic_builder.dart b/json_dynamic_widget/lib/src/builders/json_dynamic_builder.dart
@@ -108,7 +108,7 @@ class JsonDynamicBuilder extends JsonWidgetBuilder {
 
       registry ??= JsonWidgetRegistry.instance;
       map = registry.processArgs(map, <String>{}).value;
-      
+
       final dynamicArgs = map['dynamic'];
       if (dynamicArgs != null && dynamicArgs['builderType'] != null) {
         result = JsonDynamicBuilder(

diff --git a/...src/builders/json_button_bar_builder.dart → ...c/builders/json_overflow_bar_builder.dart b/...src/builders/json_button_bar_builder.dart → ...c/builders/json_overflow_bar_builder.dart
@@ -1,16 +1,16 @@
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
-part 'json_button_bar_builder.g.dart';
+part 'json_overflow_bar_builder.g.dart';
 
-/// Builder that can build a [ButtonBar] widget.
+/// Builder that can build a [OverflowBar] widget.
 @jsonWidget
-abstract class _JsonButtonBarBuilder extends JsonWidgetBuilder {
-  const _JsonButtonBarBuilder({
+abstract class _JsonOverflowBarBuilder extends JsonWidgetBuilder {
+  const _JsonOverflowBarBuilder({
     required super.args,
   });
 
   @override
-  ButtonBar buildCustom({
+  OverflowBar buildCustom({
     ChildWidgetBuilder? childBuilder,
     required BuildContext context,
     required JsonWidgetData data,

diff --git a/json_dynamic_widget/lib/src/builders/json_widget_builder.dart b/json_dynamic_widget/lib/src/builders/json_widget_builder.dart
@@ -100,15 +100,15 @@ abstract class JsonWidgetBuilder {
     });
 
     if (widget == null) {
-      if (data.jsonWidgetRegistry.onBuildWidgetFailed != null) {
-        return data.jsonWidgetRegistry.onBuildWidgetFailed!(
+      final onBuildWidgetFailed = data.jsonWidgetRegistry.onBuildWidgetFailed;
+      if (onBuildWidgetFailed != null) {
+        widget = onBuildWidgetFailed(
           data: data,
           context: context,
           error: exception,
           stackTrace: stackTrace,
         );
-      }
-      if (exception is HandledJsonWidgetException) {
+      } else if (exception is HandledJsonWidgetException) {
         throw exception;
       } else {
         throw HandledJsonWidgetException(

diff --git a/json_dynamic_widget/lib/src/components/default_registrar.dart b/json_dynamic_widget/lib/src/components/default_registrar.dart
@@ -1,5 +1,4 @@
 // ignore: unused_import
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 part 'default_registrar.g.dart';

diff --git a/json_dynamic_widget/lib/src/components/functions/dynamic.dart b/json_dynamic_widget/lib/src/components/functions/dynamic.dart
@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 /// It accepts variable names which values should be convertable

diff --git a/json_dynamic_widget/lib/src/components/json_widget_registry.dart b/json_dynamic_widget/lib/src/components/json_widget_registry.dart
@@ -27,16 +27,16 @@ class JsonWidgetRegistry {
   /// It allows to extend the default syntax with custom one by passing
   /// [argProcessors].
   JsonWidgetRegistry({
+    List<ArgProcessor>? argProcessors,
     Map<String, JsonWidgetBuilderContainer>? builders,
     bool overrideInternalBuilders = false,
     String? debugLabel,
     bool? disableValidation,
     Map<String, JsonWidgetFunction>? functions,
     bool overrideInternalFunctions = false,
-    this.onBuildWidgetFailed,
     this.navigatorKey,
+    this.onBuildWidgetFailed,
     JsonWidgetRegistry? parent,
-    List<ArgProcessor>? argProcessors,
     Map<String, dynamic>? values,
   })  : debugLabel = (parent != null ? '${parent.debugLabel}.' : '') +
             (debugLabel ?? 'child_${++childCount}'),
@@ -74,16 +74,21 @@ class JsonWidgetRegistry {
   final String debugLabel;
 
   final bool disableValidation;
+  final Widget Function({
+    BuildContext context,
+    JsonWidgetData data,
+    dynamic error,
+    StackTrace? stackTrace,
+  })? onBuildWidgetFailed;
+
   final _functions = <String, JsonWidgetFunction>{};
   final _internalValues = <String, dynamic>{}..addAll(
       CurvesValues.values,
     );
   final JsonWidgetRegistry? _parent;
   final _values = <String?, dynamic>{};
+
   late List<ArgProcessor> _argProcessors;
-  final Widget Function({
-      BuildContext context, JsonWidgetData data, dynamic error,
-      StackTrace? stackTrace})? onBuildWidgetFailed;
   StreamController<void>? _disposeStreamController =
       StreamController<void>.broadcast();
   late Logger _logger;
@@ -439,4 +444,4 @@ class JsonWidgetRegistry {
 
     return result;
   }
-}
+}
diff --git a/json_dynamic_widget/lib/src/schema/json_dynamic_widget_schemas.dart b/json_dynamic_widget/lib/src/schema/json_dynamic_widget_schemas.dart
@@ -1,4 +1,3 @@
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 class JsonDynamicWidgetSchemas {
@@ -21,7 +20,6 @@ class JsonDynamicWidgetSchemas {
     AspectRatioSchema.id: AspectRatioSchema.schema,
     AssetImageSchema.id: AssetImageSchema.schema,
     BaselineSchema.id: BaselineSchema.schema,
-    ButtonBarSchema.id: ButtonBarSchema.schema,
     CardSchema.id: CardSchema.schema,
     CenterSchema.id: CenterSchema.schema,
     CheckboxSchema.id: CheckboxSchema.schema,
@@ -74,6 +72,7 @@ class JsonDynamicWidgetSchemas {
     OffstageSchema.id: OffstageSchema.schema,
     OpacitySchema.id: OpacitySchema.schema,
     OutlinedButtonSchema.id: OutlinedButtonSchema.schema,
+    OverflowBarSchema.id: OverflowBarSchema.schema,
     OverflowBoxSchema.id: OverflowBoxSchema.schema,
     PaddingSchema.id: PaddingSchema.schema,
     PlaceholderSchema.id: PlaceholderSchema.schema,

diff --git a/json_dynamic_widget/lib/src/widgets/json_widget_exporter.dart b/json_dynamic_widget/lib/src/widgets/json_widget_exporter.dart
@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
-import 'package:json_dynamic_widget/src/builders/json_exportable_builder.dart';
 import 'package:logging/logging.dart';
 import 'package:yaml_writer/yaml_writer.dart';
 

diff --git a/json_dynamic_widget/test/builders/json_align_builder_test.dart b/json_dynamic_widget/test/builders/json_align_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_align_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_align_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_container_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_container_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_cross_fade_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_cross_fade_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_default_text_style_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_default_text_style_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_opacity_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_opacity_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_padding_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_padding_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_physical_model_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_physical_model_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_positioned_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_positioned_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_positioned_directional_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_positioned_directional_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_size_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_size_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_switcher_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_switcher_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_animated_theme_builder_test.dart b/json_dynamic_widget/test/builders/json_animated_theme_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_app_bar_builder_test.dart b/json_dynamic_widget/test/builders/json_app_bar_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_aspect_ratio_builder_test.dart b/json_dynamic_widget/test/builders/json_aspect_ratio_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_asset_image_builder_test.dart b/json_dynamic_widget/test/builders/json_asset_image_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_baseline_builder_test.dart b/json_dynamic_widget/test/builders/json_baseline_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_card_builder_test.dart b/json_dynamic_widget/test/builders/json_card_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_center_builder_test.dart b/json_dynamic_widget/test/builders/json_center_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_checkbox_builder_test.dart b/json_dynamic_widget/test/builders/json_checkbox_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_circular_progress_indicator_test.dart b/json_dynamic_widget/test/builders/json_circular_progress_indicator_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_clip_oval_build_test.dart b/json_dynamic_widget/test/builders/json_clip_oval_build_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_clip_path_build_test.dart b/json_dynamic_widget/test/builders/json_clip_path_build_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_clip_rect_builder_test.dart b/json_dynamic_widget/test/builders/json_clip_rect_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_clip_rrect_builder_test.dart b/json_dynamic_widget/test/builders/json_clip_rrect_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_column_builder_test.dart b/json_dynamic_widget/test/builders/json_column_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_conditional_builder_test.dart b/json_dynamic_widget/test/builders/json_conditional_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_container_builder_test.dart b/json_dynamic_widget/test/builders/json_container_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_cupertino_switch_builder_test.dart b/json_dynamic_widget/test/builders/json_cupertino_switch_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_custom_scroll_view_builder_test.dart b/json_dynamic_widget/test/builders/json_custom_scroll_view_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_decorated_box_builder_test.dart b/json_dynamic_widget/test/builders/json_decorated_box_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_directionality_builder_test.dart b/json_dynamic_widget/test/builders/json_directionality_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_dropdown_button_form_field_builder_test.dart b/json_dynamic_widget/test/builders/json_dropdown_button_form_field_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_dynamic_builder_test.dart b/json_dynamic_widget/test/builders/json_dynamic_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_elevated_button_builder_test.dart b/json_dynamic_widget/test/builders/json_elevated_button_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {

diff --git a/json_dynamic_widget/test/builders/json_exclude_semantics_builder_test.dart b/json_dynamic_widget/test/builders/json_exclude_semantics_builder_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:json_dynamic_widget/builders.dart';
 import 'package:json_dynamic_widget/json_dynamic_widget.dart';
 
 void main() {