fix(ui): move theme_resolver in compnoent to fix code generation

2023-02-15 20:35:25 +01:00 · 2023-02-15 20:35:25 +01:00 · ed06e18043
commit ed06e18043
parent 96781880f4
20 changed files with 104 additions and 30 deletions
--- a/packages/wyatt_ui_components/lib/src/core/core.dart
+++ b/packages/wyatt_ui_components/lib/src/core/core.dart
@ -18,5 +18,4 @@ export 'enums/control_state.dart';
 export 'extensions/build_context_extensions.dart';
 export 'extensions/string_extension.dart';
 export 'mixins/copy_with_mixin.dart';
-export 'utils/multi_color.dart';
-export 'utils/text_wrapper.dart';
+export 'utils/utils.dart';
--- a/packages/wyatt_ui_components/lib/src/core/utils/theme_resolver.dart
+++ b/packages/wyatt_ui_components/lib/src/core/utils/theme_resolver.dart
@ -15,7 +15,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.

 import 'package:flutter/material.dart';
-import 'package:wyatt_ui_kit/src/core/extensions/theme_extensions.dart';

 /// {@template theme_resolver}
 /// In charge of theme negotiation and merge.
@ -72,7 +71,7 @@ abstract class ThemeResolver<S, T, E> {
    return previousPhaseValue;
  }

-  T? findExtension(BuildContext context) => context.themeExtension<T>();
+  T? findExtension(BuildContext context) => Theme.of(context).extension<T>();

  /// Choose most suitable style for a given context.
  S negotiate(BuildContext context, {E? extra}) {
--- a/packages/wyatt_ui_components/lib/src/core/utils/utils.dart
+++ b/packages/wyatt_ui_components/lib/src/core/utils/utils.dart
@ -0,0 +1,19 @@
+// Copyright (C) 2023 WYATT GROUP
+// Please see the AUTHORS file for details.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+export 'multi_color.dart';
+export 'text_wrapper.dart';
+export 'theme_resolver.dart';
--- a/packages/wyatt_ui_components/lib/src/domain/entities/buttons/button_component.dart
+++ b/packages/wyatt_ui_components/lib/src/domain/entities/buttons/button_component.dart
@ -26,6 +26,7 @@ abstract class ButtonComponent extends Component {
    this.selectedStyle,
    this.invalidStyle,
    this.onPressed,
+    this.themeResolver,
    super.key,
  });

@ -52,4 +53,7 @@ abstract class ButtonComponent extends Component {

  /// Callback on button press
  final void Function(ControlState state)? onPressed;
+
+  /// Theme Resolver for this component
+  final ThemeResolver<dynamic, dynamic, dynamic>? themeResolver;
 }
--- a/packages/wyatt_ui_components/lib/src/domain/entities/buttons/file_selection_button_component.dart
+++ b/packages/wyatt_ui_components/lib/src/domain/entities/buttons/file_selection_button_component.dart
@ -36,6 +36,7 @@ abstract class FileSelectionButtonComponent extends ButtonComponent
    super.selectedStyle,
    super.invalidStyle,
    super.onPressed,
+    super.themeResolver,
    super.key,
  });

--- a/packages/wyatt_ui_components/lib/src/domain/entities/buttons/flat_button_component.dart
+++ b/packages/wyatt_ui_components/lib/src/domain/entities/buttons/flat_button_component.dart
@ -34,6 +34,7 @@ abstract class FlatButtonComponent extends ButtonComponent
    super.focusedStyle,
    super.tappedStyle,
    super.onPressed,
+    super.themeResolver,
    super.key,
  });

--- a/packages/wyatt_ui_components/lib/src/domain/entities/buttons/simple_icon_button_component.dart
+++ b/packages/wyatt_ui_components/lib/src/domain/entities/buttons/simple_icon_button_component.dart
@ -31,6 +31,7 @@ abstract class SimpleIconButtonComponent extends ButtonComponent
    super.focusedStyle,
    super.tappedStyle,
    super.onPressed,
+    super.themeResolver,
    super.key,
  });

--- a/packages/wyatt_ui_components/lib/src/domain/entities/buttons/symbol_button_component.dart
+++ b/packages/wyatt_ui_components/lib/src/domain/entities/buttons/symbol_button_component.dart
@ -34,6 +34,7 @@ abstract class SymbolButtonComponent extends ButtonComponent
    super.tappedStyle,
    super.selectedStyle,
    super.onPressed,
+    super.themeResolver,
    super.key,
  });

--- a/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button.dart
@ -40,7 +40,7 @@ class FileSelectionButton extends FileSelectionButtonComponent
    super.invalidStyle,
    super.onPressed,
    super.mainAxisSize,
-    this.themeResolver,
+    super.themeResolver,
    super.key,
  });

@ -76,8 +76,10 @@ class FileSelectionButton extends FileSelectionButtonComponent
  @override
  FileSelectionButtonStyle? get invalidStyle =>
      super.invalidStyle as FileSelectionButtonStyle?;
-  
-  final FileSelectionButtonThemeResolver? themeResolver;
+
+  @override
+  FileSelectionButtonThemeResolver? get themeResolver =>
+      super.themeResolver as FileSelectionButtonThemeResolver?;

  @override
  Widget build(BuildContext context) => exportBloc(
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button.g.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button.g.dart
@ -45,6 +45,10 @@ class $FileSelectionButtonCWProxyImpl
  FileSelectionButton onPressed(void Function(ControlState)? onPressed) =>
      this(onPressed: onPressed);
  @override
+  FileSelectionButton themeResolver(
+          ThemeResolver<dynamic, dynamic, dynamic>? themeResolver) =>
+      this(themeResolver: themeResolver);
+  @override
  FileSelectionButton key(Key? key) => this(key: key);
  @override
  FileSelectionButton call({
@ -60,6 +64,7 @@ class $FileSelectionButtonCWProxyImpl
    ButtonStyle<dynamic>? selectedStyle,
    ButtonStyle<dynamic>? invalidStyle,
    void Function(ControlState)? onPressed,
+    ThemeResolver<dynamic, dynamic, dynamic>? themeResolver,
    Key? key,
  }) =>
      FileSelectionButton(
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_theme_resolver.dart
@ -17,7 +17,6 @@
 import 'package:flutter/material.dart';
 import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
 import 'package:wyatt_ui_kit/src/components/buttons/cubit/button_cubit.dart';
-import 'package:wyatt_ui_kit/src/core/helpers/theme_resolver.dart';
 import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';

 class FileSelectionButtonThemeResolver extends ThemeResolver<
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button.dart
@ -38,7 +38,7 @@ class FlatButton extends FlatButtonComponent
    super.tappedStyle,
    super.onPressed,
    super.mainAxisSize,
-    this.themeResolver,
+    super.themeResolver,
    super.key,
  });

@ -62,7 +62,9 @@ class FlatButton extends FlatButtonComponent
  @override
  FlatButtonStyle? get tappedStyle => super.tappedStyle as FlatButtonStyle?;

-  final FlatButtonThemeResolver? themeResolver;
+  @override
+  FlatButtonThemeResolver? get themeResolver =>
+      super.themeResolver as FlatButtonThemeResolver?;

  @override
  Widget build(BuildContext context) => exportBloc(
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button.g.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button.g.dart
@ -37,6 +37,10 @@ class $FlatButtonCWProxyImpl implements $FlatButtonComponentCWProxy {
  FlatButton onPressed(void Function(ControlState)? onPressed) =>
      this(onPressed: onPressed);
  @override
+  FlatButton themeResolver(
+          ThemeResolver<dynamic, dynamic, dynamic>? themeResolver) =>
+      this(themeResolver: themeResolver);
+  @override
  FlatButton key(Key? key) => this(key: key);
  @override
  FlatButton call({
@ -50,6 +54,7 @@ class $FlatButtonCWProxyImpl implements $FlatButtonComponentCWProxy {
    ButtonStyle<dynamic>? focusedStyle,
    ButtonStyle<dynamic>? tappedStyle,
    void Function(ControlState)? onPressed,
+    ThemeResolver<dynamic, dynamic, dynamic>? themeResolver,
    Key? key,
  }) =>
      FlatButton(
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_theme_resolver.dart
@ -16,7 +16,6 @@

 import 'package:flutter/material.dart';
 import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
-import 'package:wyatt_ui_kit/src/core/helpers/theme_resolver.dart';
 import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';

 class FlatButtonThemeResolver extends ThemeResolver<FlatButtonStyle,
@ -26,9 +25,8 @@ class FlatButtonThemeResolver extends ThemeResolver<FlatButtonStyle,
    required this.customStyleFn,
  });

-  @override
-
  /// Values taken from <https://api.flutter.dev/flutter/material/ElevatedButton/defaultStyleOf.html>
+  @override
  FlatButtonStyle computeDefaultValue(
    BuildContext context, {
    ControlState? extra,
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button.dart
@ -35,7 +35,7 @@ class SimpleIconButton extends SimpleIconButtonComponent
    super.focusedStyle,
    super.tappedStyle,
    super.onPressed,
-    this.themeResolver,
+    super.themeResolver,
    super.key,
  });

@ -64,7 +64,9 @@ class SimpleIconButton extends SimpleIconButtonComponent
  SimpleIconButtonStyle? get tappedStyle =>
      super.tappedStyle as SimpleIconButtonStyle?;

-  final SimpleIconButtonThemeResolver? themeResolver;
+  @override
+  SimpleIconButtonThemeResolver? get themeResolver =>
+      super.themeResolver as SimpleIconButtonThemeResolver?;

  @override
  Widget build(BuildContext context) => exportBloc(
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button.g.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button.g.dart
@ -31,6 +31,10 @@ class $SimpleIconButtonCWProxyImpl
  SimpleIconButton onPressed(void Function(ControlState)? onPressed) =>
      this(onPressed: onPressed);
  @override
+  SimpleIconButton themeResolver(
+          ThemeResolver<dynamic, dynamic, dynamic>? themeResolver) =>
+      this(themeResolver: themeResolver);
+  @override
  SimpleIconButton key(Key? key) => this(key: key);
  @override
  SimpleIconButton call({
@ -41,6 +45,7 @@ class $SimpleIconButtonCWProxyImpl
    ButtonStyle<dynamic>? focusedStyle,
    ButtonStyle<dynamic>? tappedStyle,
    void Function(ControlState)? onPressed,
+    ThemeResolver<dynamic, dynamic, dynamic>? themeResolver,
    Key? key,
  }) =>
      SimpleIconButton(
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button_theme_resolver.dart
@ -16,7 +16,6 @@

 import 'package:flutter/material.dart';
 import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
-import 'package:wyatt_ui_kit/src/core/helpers/theme_resolver.dart';
 import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';

 class SimpleIconButtonThemeResolver extends ThemeResolver<SimpleIconButtonStyle,
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button.dart
@ -37,7 +37,7 @@ class SymbolButton extends SymbolButtonComponent
    super.tappedStyle,
    super.selectedStyle,
    super.mainAxisSize,
-    this.themeResolver,
+    super.themeResolver,
    super.onPressed,
    super.key,
  });
@ -69,7 +69,9 @@ class SymbolButton extends SymbolButtonComponent
  SymbolButtonStyle? get selectedStyle =>
      super.selectedStyle as SymbolButtonStyle?;

-  final SymbolButtonThemeResolver? themeResolver;
+  @override
+  SymbolButtonThemeResolver? get themeResolver =>
+      super.themeResolver as SymbolButtonThemeResolver?;

  @override
  Widget build(BuildContext context) => exportBloc(
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button.g.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button.g.dart
@ -38,6 +38,10 @@ class $SymbolButtonCWProxyImpl implements $SymbolButtonComponentCWProxy {
  SymbolButton onPressed(void Function(ControlState)? onPressed) =>
      this(onPressed: onPressed);
  @override
+  SymbolButton themeResolver(
+          ThemeResolver<dynamic, dynamic, dynamic>? themeResolver) =>
+      this(themeResolver: themeResolver);
+  @override
  SymbolButton key(Key? key) => this(key: key);
  @override
  SymbolButton call({
@ -51,6 +55,7 @@ class $SymbolButtonCWProxyImpl implements $SymbolButtonComponentCWProxy {
    ButtonStyle<dynamic>? tappedStyle,
    ButtonStyle<dynamic>? selectedStyle,
    void Function(ControlState)? onPressed,
+    ThemeResolver<dynamic, dynamic, dynamic>? themeResolver,
    Key? key,
  }) =>
      SymbolButton(
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_theme_resolver.dart
@ -17,7 +17,6 @@
 import 'package:flutter/material.dart';
 import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
 import 'package:wyatt_ui_kit/src/components/buttons/cubit/button_cubit.dart';
-import 'package:wyatt_ui_kit/src/core/helpers/theme_resolver.dart';
 import 'package:wyatt_ui_kit/wyatt_ui_kit.dart';

 class SymbolButtonThemeResolver extends ThemeResolver<SymbolButtonStyle,
@ -31,17 +30,43 @@ class SymbolButtonThemeResolver extends ThemeResolver<SymbolButtonStyle,
  SymbolButtonStyle computeDefaultValue(
    BuildContext context, {
    ButtonState? extra,
-  }) =>
-      SymbolButtonStyle(
-        label: context.textTheme.labelLarge,
-        dimension: context.buttonTheme.height,
-        radius: (context.buttonTheme.shape is RoundedRectangleBorder)
-            ? (context.buttonTheme.shape as RoundedRectangleBorder).borderRadius
-            : null,
-        padding: context.buttonTheme.padding,
-        foregroundColors: MultiColor.single(context.colorScheme.onPrimary),
-        backgroundColors: MultiColor.single(context.colorScheme.primary),
-      );
+  }) {
+    MultiColor backgroundColor = MultiColor.single(context.colorScheme.primary);
+    MultiColor foregroundColor =
+        MultiColor.single(context.colorScheme.onPrimary);
+
+    switch (extra?.state) {
+      case ControlState.disabled:
+        backgroundColor =
+            MultiColor.single(context.colorScheme.onSurface.withOpacity(0.12));
+        foregroundColor =
+            MultiColor.single(context.colorScheme.onSurface.withOpacity(0.38));
+        break;
+      case ControlState.hovered:
+        backgroundColor =
+            MultiColor.single(context.colorScheme.primary.withOpacity(0.92));
+        break;
+      case ControlState.tapped:
+        backgroundColor =
+            MultiColor.single(context.colorScheme.primary.withOpacity(0.92));
+        break;
+      case null:
+      case ControlState.normal:
+      case ControlState.focused:
+        break;
+    }
+
+    return SymbolButtonStyle(
+      label: context.textTheme.labelLarge,
+      dimension: context.buttonTheme.height,
+      radius: (context.buttonTheme.shape is RoundedRectangleBorder)
+          ? (context.buttonTheme.shape as RoundedRectangleBorder).borderRadius
+          : null,
+      padding: context.buttonTheme.padding,
+      foregroundColors: foregroundColor,
+      backgroundColors: backgroundColor,
+    );
+  }

  @override
  final SymbolButtonStyle? Function(