feat: make the section theme configurable and simplify theme resolution

Author: helightdev

packages/dogs_flutter/example/lib/models.conv.g.dart

@@ -38,7 +38,7 @@ class Person with Dataclass<Person> {
 
   @LengthRange(min: 3)
   @MaterialBindingStyle.inputTheme(
-    InputDecorationTheme(border: OutlineInputBorder()),
+    InputDecorationThemeData(border: OutlineInputBorder()),
   )
   String password;
 

packages/dogs_flutter/example/lib/models.dart

@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a
+      sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
       url: "https://pub.dev"
     source: hosted
-    version: "88.0.0"
+    version: "85.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f"
+      sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.1"
+    version: "7.7.1"
   args:
     dependency: transitive
     description:
@@ -173,31 +173,31 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697
+      sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.1"
   dogs_core:
     dependency: "direct overridden"
     description:
       path: "../../dogs_core"
       relative: true
     source: path
-    version: "10.0.0-dev.4"
+    version: "10.0.0-dev.5"
   dogs_flutter:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.0.1-dev.6"
+    version: "0.0.1-dev.7"
   dogs_generator:
     dependency: "direct dev"
     description:
       path: "../../dogs_generator"
       relative: true
     source: path
-    version: "7.0.0-dev.4"
+    version: "7.0.0-dev.5"
   duffer:
     dependency: transitive
     description:
@@ -356,10 +356,10 @@ packages:
     dependency: transitive
     description:
       name: lyell_gen
-      sha256: ce9d006796e2f8286c68e988f7ed7aa1e98e993838ed4e5120d7a526caef0cee
+      sha256: "566acd859dc12207740c5285963c3169b2537f6290760dc86388fcb8b8808187"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.11"
   matcher:
     dependency: transitive
     description:
@@ -489,10 +489,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "800f12fb87434defa13432ab37e33051b43b290a174e15259563b043cda40c46"
+      sha256: "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "3.1.0"
   source_span:
     dependency: transitive
     description:

packages/dogs_flutter/example/pubspec.lock

@@ -5,21 +5,36 @@ import 'package:flutter/material.dart';
 
 class MaterialBindingStyle extends BindingStyleExtension<MaterialBindingStyle>
     implements StructureMetadata, BindingStyleModifier {
-  final InputDecorationTheme? inputTheme;
+  final InputDecorationThemeData? inputTheme;
+  final InputDecorationThemeData? sectionTheme;
   final ButtonStyle? buttonStyle;
 
-  const MaterialBindingStyle({this.inputTheme, this.buttonStyle});
+  const MaterialBindingStyle({
+    this.inputTheme,
+    this.buttonStyle,
+    this.sectionTheme,
+  });
 
-  const MaterialBindingStyle.inputTheme(this.inputTheme) : buttonStyle = null;
+  const MaterialBindingStyle.inputTheme(this.inputTheme)
+    : buttonStyle = null,
+      sectionTheme = null;
 
-  const MaterialBindingStyle.buttonStyle(this.buttonStyle) : inputTheme = null;
+  const MaterialBindingStyle.buttonStyle(this.buttonStyle)
+    : inputTheme = null,
+      sectionTheme = null;
+
+  const MaterialBindingStyle.sectionTheme(this.sectionTheme)
+    : inputTheme = null,
+      buttonStyle = null;
 
   @override
   MaterialBindingStyle merge(MaterialBindingStyle? other) {
     if (other == null) return this;
     return MaterialBindingStyle(
       inputTheme: inputTheme?.merge(other.inputTheme) ?? other.inputTheme,
       buttonStyle: buttonStyle?.merge(other.buttonStyle) ?? other.buttonStyle,
+      sectionTheme:
+          sectionTheme?.merge(other.sectionTheme) ?? other.sectionTheme,
     );
   }
 
@@ -35,14 +50,7 @@ extension BindingStyleDataMaterialExtension on BindingStyle {
     bool includeHelper = true,
     bool includeHint = true,
   }) {
-    final currentTheme = Theme.of(context);
-    final theme =
-        getExtension<MaterialBindingStyle>() ?? MaterialBindingStyle();
-    final inputTheme =
-        theme.inputTheme?.merge(
-          InputDecorationTheme(data: currentTheme.inputDecorationTheme),
-        ) ??
-        currentTheme.inputDecorationTheme;
+    var (inputTheme, style, theme) = resolveTheme(context);
     final decoration = InputDecoration()
         .applyDefaults(inputTheme)
         .copyWith(
@@ -61,17 +69,25 @@ extension BindingStyleDataMaterialExtension on BindingStyle {
     Object? labelOverride = #none,
     String? errorText,
   }) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8.0),
-      child: InputDecorator(
-        decoration: InputDecoration(
-          border: OutlineInputBorder(),
+    var (inputTheme, style, theme) = resolveTheme(context);
+    if (style.sectionTheme != null) {
+      inputTheme = style.sectionTheme!.merge(inputTheme);
+    } else {
+      inputTheme = inputTheme.copyWith(border: OutlineInputBorder());
+    }
+    var decoration = InputDecoration()
+        .applyDefaults(inputTheme)
+        .copyWith(
           labelText: labelOverride == #none ? label : labelOverride.toString(),
           errorText: errorText,
-          helperText: helper
-        ),
-        child: widget,
-      ),
+          helperText: helper,
+          prefix: prefix,
+          suffix: suffix,
+        );
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: InputDecorator(decoration: decoration, child: widget),
     );
   }
 
@@ -86,22 +102,12 @@ extension BindingStyleDataMaterialExtension on BindingStyle {
     }
 
     if (label == null) return null;
-    final currentTheme = Theme.of(context);
-    final theme =
-        getExtension<MaterialBindingStyle>() ?? MaterialBindingStyle();
-    final inputTheme =
-        theme.inputTheme?.merge(
-          InputDecorationTheme(data: currentTheme.inputDecorationTheme),
-        ) ??
-        InputDecorationTheme(data: currentTheme.inputDecorationTheme);
+    final (inputTheme, bindingStyle, theme) = resolveTheme(context);
     var style = inputTheme.labelStyle;
-
     if (isError) {
       style =
-          inputTheme.errorStyle ??
-          TextStyle(color: currentTheme.colorScheme.error);
+          inputTheme.errorStyle ?? TextStyle(color: theme.colorScheme.error);
     }
-
     return Text(label, style: style);
   }
 
@@ -114,37 +120,33 @@ extension BindingStyleDataMaterialExtension on BindingStyle {
 
   Widget? buildMaterialHelperText(BuildContext context) {
     if (helper == null) return null;
-    final currentTheme = Theme.of(context);
-    final theme =
-        getExtension<MaterialBindingStyle>() ?? MaterialBindingStyle();
-    final inputTheme =
-        theme.inputTheme?.merge(
-          InputDecorationTheme(data: currentTheme.inputDecorationTheme),
-        ) ??
-        InputDecorationTheme(data: currentTheme.inputDecorationTheme);
+    final (inputTheme, style, theme) = resolveTheme(context);
     return Text(helper!, style: inputTheme.helperStyle);
   }
 
   Widget? buildMaterialErrorText(BuildContext context, String? error) {
     if (error == null) return null;
-    final currentTheme = Theme.of(context);
-    final theme =
-        getExtension<MaterialBindingStyle>() ?? MaterialBindingStyle();
-    final inputTheme =
-        theme.inputTheme?.merge(
-          InputDecorationTheme(data: currentTheme.inputDecorationTheme),
-        ) ??
-        InputDecorationTheme(data: currentTheme.inputDecorationTheme);
-
+    final (inputTheme, style, theme) = resolveTheme(context);
     return DefaultTextStyle(
-      style:
-          inputTheme.errorStyle ??
-          TextStyle(color: currentTheme.colorScheme.error),
+      style: inputTheme.errorStyle ?? TextStyle(color: theme.colorScheme.error),
       child: Text(error),
     );
   }
 
   ButtonStyle? getMaterialButtonStyle() {
     return getExtension<MaterialBindingStyle>()?.buttonStyle;
   }
+
+  (InputDecorationThemeData, MaterialBindingStyle, ThemeData) resolveTheme(
+    BuildContext context,
+  ) {
+    final currentTheme = Theme.of(context);
+    final style =
+        getExtension<MaterialBindingStyle>() ?? MaterialBindingStyle();
+    var inputTheme = currentTheme.inputDecorationTheme;
+    if (style.inputTheme != null) {
+      inputTheme = style.inputTheme!.merge(inputTheme);
+    }
+    return (inputTheme, style, currentTheme);
+  }
 }

packages/dogs_flutter/lib/databinding/material/style.dart

@@ -24,10 +24,15 @@ import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
+typedef StyleBuilder = BindingStyle Function(BindingStyle);
+typedef FieldBindingWrapper =
+    Widget Function(BuildContext context, Widget inner);
+
 class FieldBinding extends StatefulWidget {
   final FieldBindingController? controller;
   final String? field;
-  final BindingStyle Function(BindingStyle)? styleBuilder;
+  final StyleBuilder? styleBuilder;
+  final FieldBindingWrapper? wrapper;
   final BindingStyle? style;
   final ValidationTrigger? validationTrigger;
   final AnnotationTransformer? annotationTransformer;
@@ -42,6 +47,7 @@ class FieldBinding extends StatefulWidget {
     this.validationTrigger,
     this.annotationTransformer,
     this.binder,
+    this.wrapper,
   });
 
   @override
@@ -80,11 +86,10 @@ class _FieldBindingState extends State<FieldBinding> {
     }
 
     generatedStyle = BindingStyle(label: controller!.fieldName);
-    fieldStyleData =
-        controller!.bindingContext.field
-            .annotationsOf<BindingStyleModifier>()
-            .map((e) => e.createStyleOverrides())
-            .toList();
+    fieldStyleData = controller!.bindingContext.field
+        .annotationsOf<BindingStyleModifier>()
+        .map((e) => e.createStyleOverrides())
+        .toList();
     styleBuilder =
         widget.styleBuilder ?? (style) => widget.style?.merge(style) ?? style;
   }
@@ -132,7 +137,12 @@ class _FieldBindingState extends State<FieldBinding> {
       annotationTransformer: annotationTransformer,
       child: Builder(
         builder: (context) {
-          return currentBinder.buildBindingField(context, currentController);
+          var child = currentBinder.buildBindingField(
+            context,
+            currentController,
+          );
+          if (widget.wrapper != null) child = widget.wrapper!(context, child);
+          return child;
         },
       ),
     );
@@ -151,8 +161,8 @@ class BindingTheme extends InheritedWidget {
   });
 
   static BindingTheme of(BuildContext context) {
-    final BindingTheme? result =
-        context.dependOnInheritedWidgetOfExactType<BindingTheme>();
+    final BindingTheme? result = context
+        .dependOnInheritedWidgetOfExactType<BindingTheme>();
     assert(result != null, 'No BindingContext found in context');
     return result!;
   }