diff --git a/packages/widget_toolkit/example/ios/Flutter/AppFrameworkInfo.plist b/packages/widget_toolkit/example/ios/Flutter/AppFrameworkInfo.plist index 9625e105..7c569640 100644 --- a/packages/widget_toolkit/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/widget_toolkit/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/packages/widget_toolkit/example/ios/Podfile b/packages/widget_toolkit/example/ios/Podfile index 88359b22..279576f3 100644 --- a/packages/widget_toolkit/example/ios/Podfile +++ b/packages/widget_toolkit/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' diff --git a/packages/widget_toolkit/example/ios/Podfile.lock b/packages/widget_toolkit/example/ios/Podfile.lock index 187670cd..9971d871 100644 --- a/packages/widget_toolkit/example/ios/Podfile.lock +++ b/packages/widget_toolkit/example/ios/Podfile.lock @@ -14,9 +14,9 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 -PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 +PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011 -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.3 diff --git a/packages/widget_toolkit/example/ios/Runner.xcodeproj/project.pbxproj b/packages/widget_toolkit/example/ios/Runner.xcodeproj/project.pbxproj index a0eee105..52a56a2d 100644 --- a/packages/widget_toolkit/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/widget_toolkit/example/ios/Runner.xcodeproj/project.pbxproj @@ -156,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -343,7 +343,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; @@ -420,7 +420,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; @@ -469,7 +469,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; diff --git a/packages/widget_toolkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/widget_toolkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a3..5e31d3d3 100644 --- a/packages/widget_toolkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/widget_toolkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ titlePadding = [ - EdgeInsets.only( - bottom: WidgetToolkitDesignSystem.light().spacings.m, - left: WidgetToolkitDesignSystem.light().spacings.xs), - EdgeInsets.only( - bottom: WidgetToolkitDesignSystem.light().spacings.m, - left: WidgetToolkitDesignSystem.light().spacings.xs), - ]; - - static List titleStyle = [ - WidgetToolkitDesignSystem.light().typography.titleStyle, - WidgetToolkitDesignSystem.dark().typography.titleStyle, - ]; - - static List errorPadding = [ - EdgeInsets.zero, - EdgeInsets.zero, - ]; - - static List contentListPadding = [ - EdgeInsets.zero, - EdgeInsets.zero, - ]; - - static List footerPadding = [ - EdgeInsets.only(top: WidgetToolkitDesignSystem.light().spacings.m), - EdgeInsets.only(top: WidgetToolkitDesignSystem.light().spacings.m), - ]; - - /// endregion +@TailorMixinComponent() +class ItemPickerTheme extends ThemeExtension + with _$ItemPickerThemeTailorMixin { + const ItemPickerTheme({ + required this.titlePadding, + required this.titleStyle, + required this.errorPadding, + required this.contentListPadding, + required this.footerPadding, + }); + + @override + final EdgeInsets titlePadding; + @override + final TextStyle titleStyle; + @override + final EdgeInsets errorPadding; + @override + final EdgeInsets contentListPadding; + @override + final EdgeInsets footerPadding; + + ItemPickerTheme.light() + : titlePadding = EdgeInsets.only( + bottom: WidgetToolkitDesignSystem.light().spacings.m, + left: WidgetToolkitDesignSystem.light().spacings.xs), + titleStyle = WidgetToolkitDesignSystem.light().typography.titleStyle, + errorPadding = EdgeInsets.zero, + contentListPadding = EdgeInsets.zero, + footerPadding = + EdgeInsets.only(top: WidgetToolkitDesignSystem.light().spacings.m); + + ItemPickerTheme.dark() + : titlePadding = EdgeInsets.only( + bottom: WidgetToolkitDesignSystem.light().spacings.m, + left: WidgetToolkitDesignSystem.light().spacings.xs), + titleStyle = WidgetToolkitDesignSystem.dark().typography.titleStyle, + errorPadding = EdgeInsets.zero, + contentListPadding = EdgeInsets.zero, + footerPadding = + EdgeInsets.only(top: WidgetToolkitDesignSystem.dark().spacings.m); } extension ItemPickerThemeContextExtension on BuildContext { diff --git a/packages/widget_toolkit/lib/src/lib_item_picker/theme/item_picker_theme.tailor.dart b/packages/widget_toolkit/lib/src/lib_item_picker/theme/item_picker_theme.tailor.dart index bd7db3cf..96c44483 100644 --- a/packages/widget_toolkit/lib/src/lib_item_picker/theme/item_picker_theme.tailor.dart +++ b/packages/widget_toolkit/lib/src/lib_item_picker/theme/item_picker_theme.tailor.dart @@ -8,58 +8,27 @@ part of 'item_picker_theme.dart'; // TailorAnnotationsGenerator // ************************************************************************** -class ItemPickerTheme extends ThemeExtension { - const ItemPickerTheme({ - required this.contentListPadding, - required this.errorPadding, - required this.footerPadding, - required this.titlePadding, - required this.titleStyle, - }); - - final EdgeInsets contentListPadding; - final EdgeInsets errorPadding; - final EdgeInsets footerPadding; - - /// region ItemPickerPage - final EdgeInsets titlePadding; - final TextStyle titleStyle; - - static final ItemPickerTheme light = ItemPickerTheme( - contentListPadding: _$ItemPickerTheme.contentListPadding[0], - errorPadding: _$ItemPickerTheme.errorPadding[0], - footerPadding: _$ItemPickerTheme.footerPadding[0], - titlePadding: _$ItemPickerTheme.titlePadding[0], - titleStyle: _$ItemPickerTheme.titleStyle[0], - ); - - static final ItemPickerTheme dark = ItemPickerTheme( - contentListPadding: _$ItemPickerTheme.contentListPadding[1], - errorPadding: _$ItemPickerTheme.errorPadding[1], - footerPadding: _$ItemPickerTheme.footerPadding[1], - titlePadding: _$ItemPickerTheme.titlePadding[1], - titleStyle: _$ItemPickerTheme.titleStyle[1], - ); - - static final themes = [ - light, - dark, - ]; +mixin _$ItemPickerThemeTailorMixin on ThemeExtension { + EdgeInsets get titlePadding; + TextStyle get titleStyle; + EdgeInsets get errorPadding; + EdgeInsets get contentListPadding; + EdgeInsets get footerPadding; @override ItemPickerTheme copyWith({ - EdgeInsets? contentListPadding, - EdgeInsets? errorPadding, - EdgeInsets? footerPadding, EdgeInsets? titlePadding, TextStyle? titleStyle, + EdgeInsets? errorPadding, + EdgeInsets? contentListPadding, + EdgeInsets? footerPadding, }) { return ItemPickerTheme( - contentListPadding: contentListPadding ?? this.contentListPadding, - errorPadding: errorPadding ?? this.errorPadding, - footerPadding: footerPadding ?? this.footerPadding, titlePadding: titlePadding ?? this.titlePadding, titleStyle: titleStyle ?? this.titleStyle, + errorPadding: errorPadding ?? this.errorPadding, + contentListPadding: contentListPadding ?? this.contentListPadding, + footerPadding: footerPadding ?? this.footerPadding, ); } @@ -68,12 +37,12 @@ class ItemPickerTheme extends ThemeExtension { covariant ThemeExtension? other, double t) { if (other is! ItemPickerTheme) return this as ItemPickerTheme; return ItemPickerTheme( + titlePadding: t < 0.5 ? titlePadding : other.titlePadding, + titleStyle: TextStyle.lerp(titleStyle, other.titleStyle, t)!, + errorPadding: t < 0.5 ? errorPadding : other.errorPadding, contentListPadding: t < 0.5 ? contentListPadding : other.contentListPadding, - errorPadding: t < 0.5 ? errorPadding : other.errorPadding, footerPadding: t < 0.5 ? footerPadding : other.footerPadding, - titlePadding: t < 0.5 ? titlePadding : other.titlePadding, - titleStyle: TextStyle.lerp(titleStyle, other.titleStyle, t)!, ); } @@ -83,26 +52,26 @@ class ItemPickerTheme extends ThemeExtension { (other.runtimeType == runtimeType && other is ItemPickerTheme && const DeepCollectionEquality() - .equals(contentListPadding, other.contentListPadding) && + .equals(titlePadding, other.titlePadding) && const DeepCollectionEquality() - .equals(errorPadding, other.errorPadding) && + .equals(titleStyle, other.titleStyle) && const DeepCollectionEquality() - .equals(footerPadding, other.footerPadding) && + .equals(errorPadding, other.errorPadding) && const DeepCollectionEquality() - .equals(titlePadding, other.titlePadding) && + .equals(contentListPadding, other.contentListPadding) && const DeepCollectionEquality() - .equals(titleStyle, other.titleStyle)); + .equals(footerPadding, other.footerPadding)); } @override int get hashCode { return Object.hash( runtimeType.hashCode, - const DeepCollectionEquality().hash(contentListPadding), - const DeepCollectionEquality().hash(errorPadding), - const DeepCollectionEquality().hash(footerPadding), const DeepCollectionEquality().hash(titlePadding), const DeepCollectionEquality().hash(titleStyle), + const DeepCollectionEquality().hash(errorPadding), + const DeepCollectionEquality().hash(contentListPadding), + const DeepCollectionEquality().hash(footerPadding), ); } } diff --git a/packages/widget_toolkit/lib/src/lib_language_picker/theme/language_picker_theme.dart b/packages/widget_toolkit/lib/src/lib_language_picker/theme/language_picker_theme.dart index 2103becf..10dc13aa 100644 --- a/packages/widget_toolkit/lib/src/lib_language_picker/theme/language_picker_theme.dart +++ b/packages/widget_toolkit/lib/src/lib_language_picker/theme/language_picker_theme.dart @@ -6,154 +6,187 @@ import '../../base/theme/design_system/widget_toolkit_design_system.dart'; part 'language_picker_theme.tailor.dart'; -@Tailor(themeGetter: ThemeGetter.none) -class _$LanguagePickerTheme { - /// region EdgeInsets - static List changeLanguagePadding = [ - EdgeInsets.zero, - EdgeInsets.zero, - ]; - - static List chooseLanguagePadding = [ - const EdgeInsets.only(bottom: 8), - const EdgeInsets.only(bottom: 8) - ]; - - static List chooseLanguageActiveEdgeInsets = [ - const EdgeInsets.symmetric(horizontal: 16, vertical: 12), - const EdgeInsets.symmetric(horizontal: 16, vertical: 12), - ]; - - static List chooseLanguageInactiveEdgeInsets = [ - const EdgeInsets.symmetric(horizontal: 16, vertical: 12), - const EdgeInsets.symmetric(horizontal: 16, vertical: 12), - ]; - - /// endregion - - /// region TextStyle - static List descriptionThin = [ - WidgetToolkitDesignSystem.light().typography.descriptionThin, - WidgetToolkitDesignSystem.dark().typography.descriptionThin, - ]; - - static List titleBold = [ - WidgetToolkitDesignSystem.light().typography.titleBold, - WidgetToolkitDesignSystem.dark().typography.titleBold, - ]; - - static List languageCodeInLanguagePickerTitleBold = [ - WidgetToolkitDesignSystem.light().typography.titleBold, - WidgetToolkitDesignSystem.dark().typography.titleBold, - ]; +@TailorMixinComponent() +class LanguagePickerTheme extends ThemeExtension + with _$LanguagePickerThemeTailorMixin { + /// region Constructors + + const LanguagePickerTheme({ + required this.descriptionThin, + required this.titleBold, + required this.languageCodeInLanguagePickerTitleBold, + required this.spacingS, + required this.changeLanguageSizedBox, + required this.spacingM, + required this.spacingXXXXL1, + required this.activeButtonLanguageTextColor, + required this.disabledFilledButtonBackgroundColor, + required this.activeGradientEnd, + required this.languageGradientStart, + required this.languageGradientEnd, + required this.filledButtonBackgroundColorDisabled, + required this.buttonTextColor, + required this.filledButtonTextColorDisabled, + required this.textColorWhite, + required this.boxShadowColor, + required this.bodyTextColor2, + required this.buttonBlueGradientEnd, + required this.elevatedButtonBackgroundColor, + required this.outlineButtonBackgroundColor, + required this.checkIcon, + required this.changeLanguagePadding, + required this.chooseLanguagePadding, + required this.chooseLanguageActiveEdgeInsets, + required this.chooseLanguageInactiveEdgeInsets, + required this.messagePanelErrorEdgeInsets, + }); + + LanguagePickerTheme.light() + : changeLanguagePadding = EdgeInsets.zero, + chooseLanguagePadding = const EdgeInsets.only(bottom: 8), + chooseLanguageActiveEdgeInsets = + const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + chooseLanguageInactiveEdgeInsets = + const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + messagePanelErrorEdgeInsets = const EdgeInsets.only(bottom: 20), + descriptionThin = + WidgetToolkitDesignSystem.light().typography.descriptionThin, + titleBold = WidgetToolkitDesignSystem.light().typography.titleBold, + languageCodeInLanguagePickerTitleBold = + WidgetToolkitDesignSystem.light().typography.titleBold, + spacingS = WidgetToolkitDesignSystem.light().spacings.s, + changeLanguageSizedBox = WidgetToolkitDesignSystem.light().spacings.s, + spacingM = WidgetToolkitDesignSystem.light().spacings.m, + spacingXXXXL1 = WidgetToolkitDesignSystem.light().spacings.xxxxl1, + activeButtonLanguageTextColor = WidgetToolkitDesignSystem.light() + .colors + .activeButtonLanguageTextColor, + disabledFilledButtonBackgroundColor = + WidgetToolkitDesignSystem.light().colors.gray, + activeGradientEnd = WidgetToolkitDesignSystem.light().colors.blue, + languageGradientStart = WidgetToolkitDesignSystem.light().colors.blue, + languageGradientEnd = + WidgetToolkitDesignSystem.light().colors.lightBlue, + filledButtonBackgroundColorDisabled = + WidgetToolkitDesignSystem.light().colors.gray, + buttonTextColor = + WidgetToolkitDesignSystem.light().colors.textColorWhite, + filledButtonTextColorDisabled = + WidgetToolkitDesignSystem.light().colors.gray, + textColorWhite = + WidgetToolkitDesignSystem.light().colors.textColorWhite, + boxShadowColor = WidgetToolkitDesignSystem.light().colors.red, + bodyTextColor2 = WidgetToolkitDesignSystem.light().colors.black, + buttonBlueGradientEnd = + WidgetToolkitDesignSystem.light().colors.buttonBlueGradientEnd, + elevatedButtonBackgroundColor = + WidgetToolkitDesignSystem.light().colors.lightGray, + outlineButtonBackgroundColor = + WidgetToolkitDesignSystem.light().colors.white, + checkIcon = WidgetToolkitDesignSystem.dark().icons.checkIcon; + + LanguagePickerTheme.dark() + : changeLanguagePadding = EdgeInsets.zero, + chooseLanguagePadding = const EdgeInsets.only(bottom: 8), + chooseLanguageActiveEdgeInsets = + const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + chooseLanguageInactiveEdgeInsets = + const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + messagePanelErrorEdgeInsets = const EdgeInsets.only(bottom: 20), + descriptionThin = + WidgetToolkitDesignSystem.dark().typography.descriptionThin, + titleBold = WidgetToolkitDesignSystem.dark().typography.titleBold, + languageCodeInLanguagePickerTitleBold = + WidgetToolkitDesignSystem.dark().typography.titleBold, + spacingS = WidgetToolkitDesignSystem.dark().spacings.s, + changeLanguageSizedBox = WidgetToolkitDesignSystem.dark().spacings.s, + spacingM = WidgetToolkitDesignSystem.dark().spacings.m, + spacingXXXXL1 = WidgetToolkitDesignSystem.dark().spacings.xxxxl1, + activeButtonLanguageTextColor = WidgetToolkitDesignSystem.dark() + .colors + .activeButtonLanguageTextColor, + disabledFilledButtonBackgroundColor = + WidgetToolkitDesignSystem.dark().colors.gray, + activeGradientEnd = WidgetToolkitDesignSystem.dark().colors.blue, + languageGradientStart = WidgetToolkitDesignSystem.dark().colors.blue, + languageGradientEnd = WidgetToolkitDesignSystem.dark().colors.lightBlue, + filledButtonBackgroundColorDisabled = + WidgetToolkitDesignSystem.dark().colors.gray, + buttonTextColor = + WidgetToolkitDesignSystem.dark().colors.textColorWhite, + filledButtonTextColorDisabled = + WidgetToolkitDesignSystem.dark().colors.gray, + textColorWhite = WidgetToolkitDesignSystem.dark().colors.textColorWhite, + boxShadowColor = WidgetToolkitDesignSystem.dark().colors.red, + bodyTextColor2 = WidgetToolkitDesignSystem.dark().colors.black, + buttonBlueGradientEnd = + WidgetToolkitDesignSystem.dark().colors.buttonBlueGradientEnd, + elevatedButtonBackgroundColor = + WidgetToolkitDesignSystem.dark().colors.lightGray, + outlineButtonBackgroundColor = + WidgetToolkitDesignSystem.dark().colors.white, + checkIcon = WidgetToolkitDesignSystem.light().icons.checkIcon; /// endregion - /// region spacings - static List spacingS = [ - WidgetToolkitDesignSystem.light().spacings.s, - WidgetToolkitDesignSystem.dark().spacings.s, - ]; - - static List changeLanguageSizedBox = [ - WidgetToolkitDesignSystem.light().spacings.s, - WidgetToolkitDesignSystem.dark().spacings.s, - ]; - - static List spacingM = [ - WidgetToolkitDesignSystem.light().spacings.m, - WidgetToolkitDesignSystem.dark().spacings.m, - ]; - - static List spacingXXXXL1 = [ - WidgetToolkitDesignSystem.light().spacings.xxxxl1, - WidgetToolkitDesignSystem.dark().spacings.xxxxl1, - ]; - - static List messagePanelErrorEdgeInsets = [ - const EdgeInsets.only(bottom: 20), - const EdgeInsets.only(bottom: 20), - ]; - - /// endregion - - /// region Color - - static List activeButtonLanguageTextColor = [ - WidgetToolkitDesignSystem.light().colors.activeButtonLanguageTextColor, - WidgetToolkitDesignSystem.dark().colors.activeButtonLanguageTextColor, - ]; - static List disabledFilledButtonBackgroundColor = [ - WidgetToolkitDesignSystem.light().colors.gray, - WidgetToolkitDesignSystem.dark().colors.gray, - ]; - - static List activeGradientEnd = [ - WidgetToolkitDesignSystem.light().colors.blue, - WidgetToolkitDesignSystem.dark().colors.blue, - ]; - - static List languageGradientStart = [ - WidgetToolkitDesignSystem.light().colors.blue, - WidgetToolkitDesignSystem.dark().colors.darkBlue, - ]; - - static List languageGradientEnd = [ - WidgetToolkitDesignSystem.light().colors.lightBlue, - WidgetToolkitDesignSystem.dark().colors.blue, - ]; - - static List filledButtonBackgroundColorDisabled = [ - WidgetToolkitDesignSystem.light().colors.gray, - WidgetToolkitDesignSystem.dark().colors.gray, - ]; - - static List buttonTextColor = [ - WidgetToolkitDesignSystem.light().colors.textColorWhite, - WidgetToolkitDesignSystem.dark().colors.textColorWhite, - ]; - - static List filledButtonTextColorDisabled = [ - WidgetToolkitDesignSystem.light().colors.gray, - WidgetToolkitDesignSystem.dark().colors.gray, - ]; - - static List textColorWhite = [ - WidgetToolkitDesignSystem.light().colors.textColorWhite, - WidgetToolkitDesignSystem.dark().colors.textColorWhite, - ]; - - static List boxShadowColor = [ - WidgetToolkitDesignSystem.light().colors.red, - WidgetToolkitDesignSystem.dark().colors.red, - ]; - - static List bodyTextColor2 = [ - WidgetToolkitDesignSystem.light().colors.black, - WidgetToolkitDesignSystem.dark().colors.activeButtonTextColor, - ]; - - static List buttonBlueGradientEnd = [ - WidgetToolkitDesignSystem.light().colors.buttonBlueGradientEnd, - WidgetToolkitDesignSystem.dark().colors.buttonBlueGradientEnd, - ]; - - static List elevatedButtonBackgroundColor = [ - WidgetToolkitDesignSystem.light().colors.lightGray, - WidgetToolkitDesignSystem.dark().colors.gray, - ]; - - static List outlineButtonBackgroundColor = [ - WidgetToolkitDesignSystem.light().colors.white, - WidgetToolkitDesignSystem.dark().colors.white, - ]; - - static List checkIcon = [ - WidgetToolkitDesignSystem.dark().icons.checkIcon, - WidgetToolkitDesignSystem.light().icons.checkIcon, - ]; - - /// endregion + @override + final EdgeInsets changeLanguagePadding; + @override + final EdgeInsets chooseLanguagePadding; + @override + final EdgeInsets chooseLanguageActiveEdgeInsets; + @override + final EdgeInsets chooseLanguageInactiveEdgeInsets; + + @override + final TextStyle descriptionThin; + @override + final TextStyle titleBold; + @override + final TextStyle languageCodeInLanguagePickerTitleBold; + + @override + final double spacingS; + @override + final double changeLanguageSizedBox; + @override + final double spacingM; + @override + final double spacingXXXXL1; + @override + final EdgeInsets messagePanelErrorEdgeInsets; + + @override + final Color activeButtonLanguageTextColor; + @override + final Color disabledFilledButtonBackgroundColor; + @override + final Color activeGradientEnd; + @override + final Color languageGradientStart; + @override + final Color languageGradientEnd; + @override + final Color filledButtonBackgroundColorDisabled; + @override + final Color buttonTextColor; + @override + final Color filledButtonTextColorDisabled; + @override + final Color textColorWhite; + @override + final Color boxShadowColor; + @override + final Color bodyTextColor2; + @override + final Color buttonBlueGradientEnd; + @override + final Color elevatedButtonBackgroundColor; + @override + final Color outlineButtonBackgroundColor; + + @override + final SvgFile checkIcon; } extension LanguagePickerThemeContextExtension on BuildContext { diff --git a/packages/widget_toolkit/lib/src/lib_language_picker/theme/language_picker_theme.tailor.dart b/packages/widget_toolkit/lib/src/lib_language_picker/theme/language_picker_theme.tailor.dart index 487aad08..cdee6d04 100644 --- a/packages/widget_toolkit/lib/src/lib_language_picker/theme/language_picker_theme.tailor.dart +++ b/packages/widget_toolkit/lib/src/lib_language_picker/theme/language_picker_theme.tailor.dart @@ -8,236 +8,111 @@ part of 'language_picker_theme.dart'; // TailorAnnotationsGenerator // ************************************************************************** -class LanguagePickerTheme extends ThemeExtension { - const LanguagePickerTheme({ - required this.activeButtonLanguageTextColor, - required this.activeGradientEnd, - required this.bodyTextColor2, - required this.boxShadowColor, - required this.buttonBlueGradientEnd, - required this.buttonTextColor, - required this.changeLanguagePadding, - required this.changeLanguageSizedBox, - required this.checkIcon, - required this.chooseLanguageActiveEdgeInsets, - required this.chooseLanguageInactiveEdgeInsets, - required this.chooseLanguagePadding, - required this.descriptionThin, - required this.disabledFilledButtonBackgroundColor, - required this.elevatedButtonBackgroundColor, - required this.filledButtonBackgroundColorDisabled, - required this.filledButtonTextColorDisabled, - required this.languageCodeInLanguagePickerTitleBold, - required this.languageGradientEnd, - required this.languageGradientStart, - required this.messagePanelErrorEdgeInsets, - required this.outlineButtonBackgroundColor, - required this.spacingM, - required this.spacingS, - required this.spacingXXXXL1, - required this.textColorWhite, - required this.titleBold, - }); - - /// endregion - /// region Color - final Color activeButtonLanguageTextColor; - final Color activeGradientEnd; - final Color bodyTextColor2; - final Color boxShadowColor; - final Color buttonBlueGradientEnd; - final Color buttonTextColor; - - /// region EdgeInsets - final EdgeInsets changeLanguagePadding; - final double changeLanguageSizedBox; - final SvgFile checkIcon; - final EdgeInsets chooseLanguageActiveEdgeInsets; - final EdgeInsets chooseLanguageInactiveEdgeInsets; - final EdgeInsets chooseLanguagePadding; - - /// endregion - /// region TextStyle - final TextStyle descriptionThin; - final Color disabledFilledButtonBackgroundColor; - final Color elevatedButtonBackgroundColor; - final Color filledButtonBackgroundColorDisabled; - final Color filledButtonTextColorDisabled; - final TextStyle languageCodeInLanguagePickerTitleBold; - final Color languageGradientEnd; - final Color languageGradientStart; - final EdgeInsets messagePanelErrorEdgeInsets; - final Color outlineButtonBackgroundColor; - final double spacingM; - - /// endregion - /// region spacings - final double spacingS; - final double spacingXXXXL1; - final Color textColorWhite; - final TextStyle titleBold; - - static final LanguagePickerTheme light = LanguagePickerTheme( - activeButtonLanguageTextColor: - _$LanguagePickerTheme.activeButtonLanguageTextColor[0], - activeGradientEnd: _$LanguagePickerTheme.activeGradientEnd[0], - bodyTextColor2: _$LanguagePickerTheme.bodyTextColor2[0], - boxShadowColor: _$LanguagePickerTheme.boxShadowColor[0], - buttonBlueGradientEnd: _$LanguagePickerTheme.buttonBlueGradientEnd[0], - buttonTextColor: _$LanguagePickerTheme.buttonTextColor[0], - changeLanguagePadding: _$LanguagePickerTheme.changeLanguagePadding[0], - changeLanguageSizedBox: _$LanguagePickerTheme.changeLanguageSizedBox[0], - checkIcon: _$LanguagePickerTheme.checkIcon[0], - chooseLanguageActiveEdgeInsets: - _$LanguagePickerTheme.chooseLanguageActiveEdgeInsets[0], - chooseLanguageInactiveEdgeInsets: - _$LanguagePickerTheme.chooseLanguageInactiveEdgeInsets[0], - chooseLanguagePadding: _$LanguagePickerTheme.chooseLanguagePadding[0], - descriptionThin: _$LanguagePickerTheme.descriptionThin[0], - disabledFilledButtonBackgroundColor: - _$LanguagePickerTheme.disabledFilledButtonBackgroundColor[0], - elevatedButtonBackgroundColor: - _$LanguagePickerTheme.elevatedButtonBackgroundColor[0], - filledButtonBackgroundColorDisabled: - _$LanguagePickerTheme.filledButtonBackgroundColorDisabled[0], - filledButtonTextColorDisabled: - _$LanguagePickerTheme.filledButtonTextColorDisabled[0], - languageCodeInLanguagePickerTitleBold: - _$LanguagePickerTheme.languageCodeInLanguagePickerTitleBold[0], - languageGradientEnd: _$LanguagePickerTheme.languageGradientEnd[0], - languageGradientStart: _$LanguagePickerTheme.languageGradientStart[0], - messagePanelErrorEdgeInsets: - _$LanguagePickerTheme.messagePanelErrorEdgeInsets[0], - outlineButtonBackgroundColor: - _$LanguagePickerTheme.outlineButtonBackgroundColor[0], - spacingM: _$LanguagePickerTheme.spacingM[0], - spacingS: _$LanguagePickerTheme.spacingS[0], - spacingXXXXL1: _$LanguagePickerTheme.spacingXXXXL1[0], - textColorWhite: _$LanguagePickerTheme.textColorWhite[0], - titleBold: _$LanguagePickerTheme.titleBold[0], - ); - - static final LanguagePickerTheme dark = LanguagePickerTheme( - activeButtonLanguageTextColor: - _$LanguagePickerTheme.activeButtonLanguageTextColor[1], - activeGradientEnd: _$LanguagePickerTheme.activeGradientEnd[1], - bodyTextColor2: _$LanguagePickerTheme.bodyTextColor2[1], - boxShadowColor: _$LanguagePickerTheme.boxShadowColor[1], - buttonBlueGradientEnd: _$LanguagePickerTheme.buttonBlueGradientEnd[1], - buttonTextColor: _$LanguagePickerTheme.buttonTextColor[1], - changeLanguagePadding: _$LanguagePickerTheme.changeLanguagePadding[1], - changeLanguageSizedBox: _$LanguagePickerTheme.changeLanguageSizedBox[1], - checkIcon: _$LanguagePickerTheme.checkIcon[1], - chooseLanguageActiveEdgeInsets: - _$LanguagePickerTheme.chooseLanguageActiveEdgeInsets[1], - chooseLanguageInactiveEdgeInsets: - _$LanguagePickerTheme.chooseLanguageInactiveEdgeInsets[1], - chooseLanguagePadding: _$LanguagePickerTheme.chooseLanguagePadding[1], - descriptionThin: _$LanguagePickerTheme.descriptionThin[1], - disabledFilledButtonBackgroundColor: - _$LanguagePickerTheme.disabledFilledButtonBackgroundColor[1], - elevatedButtonBackgroundColor: - _$LanguagePickerTheme.elevatedButtonBackgroundColor[1], - filledButtonBackgroundColorDisabled: - _$LanguagePickerTheme.filledButtonBackgroundColorDisabled[1], - filledButtonTextColorDisabled: - _$LanguagePickerTheme.filledButtonTextColorDisabled[1], - languageCodeInLanguagePickerTitleBold: - _$LanguagePickerTheme.languageCodeInLanguagePickerTitleBold[1], - languageGradientEnd: _$LanguagePickerTheme.languageGradientEnd[1], - languageGradientStart: _$LanguagePickerTheme.languageGradientStart[1], - messagePanelErrorEdgeInsets: - _$LanguagePickerTheme.messagePanelErrorEdgeInsets[1], - outlineButtonBackgroundColor: - _$LanguagePickerTheme.outlineButtonBackgroundColor[1], - spacingM: _$LanguagePickerTheme.spacingM[1], - spacingS: _$LanguagePickerTheme.spacingS[1], - spacingXXXXL1: _$LanguagePickerTheme.spacingXXXXL1[1], - textColorWhite: _$LanguagePickerTheme.textColorWhite[1], - titleBold: _$LanguagePickerTheme.titleBold[1], - ); - - static final themes = [ - light, - dark, - ]; +mixin _$LanguagePickerThemeTailorMixin on ThemeExtension { + EdgeInsets get changeLanguagePadding; + EdgeInsets get chooseLanguagePadding; + EdgeInsets get chooseLanguageActiveEdgeInsets; + EdgeInsets get chooseLanguageInactiveEdgeInsets; + TextStyle get descriptionThin; + TextStyle get titleBold; + TextStyle get languageCodeInLanguagePickerTitleBold; + double get spacingS; + double get changeLanguageSizedBox; + double get spacingM; + double get spacingXXXXL1; + EdgeInsets get messagePanelErrorEdgeInsets; + Color get activeButtonLanguageTextColor; + Color get disabledFilledButtonBackgroundColor; + Color get activeGradientEnd; + Color get languageGradientStart; + Color get languageGradientEnd; + Color get filledButtonBackgroundColorDisabled; + Color get buttonTextColor; + Color get filledButtonTextColorDisabled; + Color get textColorWhite; + Color get boxShadowColor; + Color get bodyTextColor2; + Color get buttonBlueGradientEnd; + Color get elevatedButtonBackgroundColor; + Color get outlineButtonBackgroundColor; + SvgFile get checkIcon; @override LanguagePickerTheme copyWith({ - Color? activeButtonLanguageTextColor, - Color? activeGradientEnd, - Color? bodyTextColor2, - Color? boxShadowColor, - Color? buttonBlueGradientEnd, - Color? buttonTextColor, EdgeInsets? changeLanguagePadding, - double? changeLanguageSizedBox, - SvgFile? checkIcon, + EdgeInsets? chooseLanguagePadding, EdgeInsets? chooseLanguageActiveEdgeInsets, EdgeInsets? chooseLanguageInactiveEdgeInsets, - EdgeInsets? chooseLanguagePadding, TextStyle? descriptionThin, - Color? disabledFilledButtonBackgroundColor, - Color? elevatedButtonBackgroundColor, - Color? filledButtonBackgroundColorDisabled, - Color? filledButtonTextColorDisabled, + TextStyle? titleBold, TextStyle? languageCodeInLanguagePickerTitleBold, - Color? languageGradientEnd, - Color? languageGradientStart, - EdgeInsets? messagePanelErrorEdgeInsets, - Color? outlineButtonBackgroundColor, - double? spacingM, double? spacingS, + double? changeLanguageSizedBox, + double? spacingM, double? spacingXXXXL1, + EdgeInsets? messagePanelErrorEdgeInsets, + Color? activeButtonLanguageTextColor, + Color? disabledFilledButtonBackgroundColor, + Color? activeGradientEnd, + Color? languageGradientStart, + Color? languageGradientEnd, + Color? filledButtonBackgroundColorDisabled, + Color? buttonTextColor, + Color? filledButtonTextColorDisabled, Color? textColorWhite, - TextStyle? titleBold, + Color? boxShadowColor, + Color? bodyTextColor2, + Color? buttonBlueGradientEnd, + Color? elevatedButtonBackgroundColor, + Color? outlineButtonBackgroundColor, + SvgFile? checkIcon, }) { return LanguagePickerTheme( - activeButtonLanguageTextColor: - activeButtonLanguageTextColor ?? this.activeButtonLanguageTextColor, - activeGradientEnd: activeGradientEnd ?? this.activeGradientEnd, - bodyTextColor2: bodyTextColor2 ?? this.bodyTextColor2, - boxShadowColor: boxShadowColor ?? this.boxShadowColor, - buttonBlueGradientEnd: - buttonBlueGradientEnd ?? this.buttonBlueGradientEnd, - buttonTextColor: buttonTextColor ?? this.buttonTextColor, changeLanguagePadding: changeLanguagePadding ?? this.changeLanguagePadding, - changeLanguageSizedBox: - changeLanguageSizedBox ?? this.changeLanguageSizedBox, - checkIcon: checkIcon ?? this.checkIcon, + chooseLanguagePadding: + chooseLanguagePadding ?? this.chooseLanguagePadding, chooseLanguageActiveEdgeInsets: chooseLanguageActiveEdgeInsets ?? this.chooseLanguageActiveEdgeInsets, chooseLanguageInactiveEdgeInsets: chooseLanguageInactiveEdgeInsets ?? this.chooseLanguageInactiveEdgeInsets, - chooseLanguagePadding: - chooseLanguagePadding ?? this.chooseLanguagePadding, descriptionThin: descriptionThin ?? this.descriptionThin, + titleBold: titleBold ?? this.titleBold, + languageCodeInLanguagePickerTitleBold: + languageCodeInLanguagePickerTitleBold ?? + this.languageCodeInLanguagePickerTitleBold, + spacingS: spacingS ?? this.spacingS, + changeLanguageSizedBox: + changeLanguageSizedBox ?? this.changeLanguageSizedBox, + spacingM: spacingM ?? this.spacingM, + spacingXXXXL1: spacingXXXXL1 ?? this.spacingXXXXL1, + messagePanelErrorEdgeInsets: + messagePanelErrorEdgeInsets ?? this.messagePanelErrorEdgeInsets, + activeButtonLanguageTextColor: + activeButtonLanguageTextColor ?? this.activeButtonLanguageTextColor, disabledFilledButtonBackgroundColor: disabledFilledButtonBackgroundColor ?? this.disabledFilledButtonBackgroundColor, - elevatedButtonBackgroundColor: - elevatedButtonBackgroundColor ?? this.elevatedButtonBackgroundColor, + activeGradientEnd: activeGradientEnd ?? this.activeGradientEnd, + languageGradientStart: + languageGradientStart ?? this.languageGradientStart, + languageGradientEnd: languageGradientEnd ?? this.languageGradientEnd, filledButtonBackgroundColorDisabled: filledButtonBackgroundColorDisabled ?? this.filledButtonBackgroundColorDisabled, + buttonTextColor: buttonTextColor ?? this.buttonTextColor, filledButtonTextColorDisabled: filledButtonTextColorDisabled ?? this.filledButtonTextColorDisabled, - languageCodeInLanguagePickerTitleBold: - languageCodeInLanguagePickerTitleBold ?? - this.languageCodeInLanguagePickerTitleBold, - languageGradientEnd: languageGradientEnd ?? this.languageGradientEnd, - languageGradientStart: - languageGradientStart ?? this.languageGradientStart, - messagePanelErrorEdgeInsets: - messagePanelErrorEdgeInsets ?? this.messagePanelErrorEdgeInsets, + textColorWhite: textColorWhite ?? this.textColorWhite, + boxShadowColor: boxShadowColor ?? this.boxShadowColor, + bodyTextColor2: bodyTextColor2 ?? this.bodyTextColor2, + buttonBlueGradientEnd: + buttonBlueGradientEnd ?? this.buttonBlueGradientEnd, + elevatedButtonBackgroundColor: + elevatedButtonBackgroundColor ?? this.elevatedButtonBackgroundColor, outlineButtonBackgroundColor: outlineButtonBackgroundColor ?? this.outlineButtonBackgroundColor, - spacingM: spacingM ?? this.spacingM, - spacingS: spacingS ?? this.spacingS, - spacingXXXXL1: spacingXXXXL1 ?? this.spacingXXXXL1, - textColorWhite: textColorWhite ?? this.textColorWhite, - titleBold: titleBold ?? this.titleBold, + checkIcon: checkIcon ?? this.checkIcon, ); } @@ -246,60 +121,60 @@ class LanguagePickerTheme extends ThemeExtension { covariant ThemeExtension? other, double t) { if (other is! LanguagePickerTheme) return this as LanguagePickerTheme; return LanguagePickerTheme( - activeButtonLanguageTextColor: Color.lerp(activeButtonLanguageTextColor, - other.activeButtonLanguageTextColor, t)!, - activeGradientEnd: - Color.lerp(activeGradientEnd, other.activeGradientEnd, t)!, - bodyTextColor2: Color.lerp(bodyTextColor2, other.bodyTextColor2, t)!, - boxShadowColor: Color.lerp(boxShadowColor, other.boxShadowColor, t)!, - buttonBlueGradientEnd: - Color.lerp(buttonBlueGradientEnd, other.buttonBlueGradientEnd, t)!, - buttonTextColor: Color.lerp(buttonTextColor, other.buttonTextColor, t)!, changeLanguagePadding: t < 0.5 ? changeLanguagePadding : other.changeLanguagePadding, - changeLanguageSizedBox: - t < 0.5 ? changeLanguageSizedBox : other.changeLanguageSizedBox, - checkIcon: t < 0.5 ? checkIcon : other.checkIcon, + chooseLanguagePadding: + t < 0.5 ? chooseLanguagePadding : other.chooseLanguagePadding, chooseLanguageActiveEdgeInsets: t < 0.5 ? chooseLanguageActiveEdgeInsets : other.chooseLanguageActiveEdgeInsets, chooseLanguageInactiveEdgeInsets: t < 0.5 ? chooseLanguageInactiveEdgeInsets : other.chooseLanguageInactiveEdgeInsets, - chooseLanguagePadding: - t < 0.5 ? chooseLanguagePadding : other.chooseLanguagePadding, descriptionThin: TextStyle.lerp(descriptionThin, other.descriptionThin, t)!, + titleBold: TextStyle.lerp(titleBold, other.titleBold, t)!, + languageCodeInLanguagePickerTitleBold: TextStyle.lerp( + languageCodeInLanguagePickerTitleBold, + other.languageCodeInLanguagePickerTitleBold, + t)!, + spacingS: t < 0.5 ? spacingS : other.spacingS, + changeLanguageSizedBox: + t < 0.5 ? changeLanguageSizedBox : other.changeLanguageSizedBox, + spacingM: t < 0.5 ? spacingM : other.spacingM, + spacingXXXXL1: t < 0.5 ? spacingXXXXL1 : other.spacingXXXXL1, + messagePanelErrorEdgeInsets: t < 0.5 + ? messagePanelErrorEdgeInsets + : other.messagePanelErrorEdgeInsets, + activeButtonLanguageTextColor: Color.lerp(activeButtonLanguageTextColor, + other.activeButtonLanguageTextColor, t)!, disabledFilledButtonBackgroundColor: Color.lerp( disabledFilledButtonBackgroundColor, other.disabledFilledButtonBackgroundColor, t)!, - elevatedButtonBackgroundColor: Color.lerp(elevatedButtonBackgroundColor, - other.elevatedButtonBackgroundColor, t)!, + activeGradientEnd: + Color.lerp(activeGradientEnd, other.activeGradientEnd, t)!, + languageGradientStart: + Color.lerp(languageGradientStart, other.languageGradientStart, t)!, + languageGradientEnd: + Color.lerp(languageGradientEnd, other.languageGradientEnd, t)!, filledButtonBackgroundColorDisabled: Color.lerp( filledButtonBackgroundColorDisabled, other.filledButtonBackgroundColorDisabled, t)!, + buttonTextColor: Color.lerp(buttonTextColor, other.buttonTextColor, t)!, filledButtonTextColorDisabled: Color.lerp(filledButtonTextColorDisabled, other.filledButtonTextColorDisabled, t)!, - languageCodeInLanguagePickerTitleBold: TextStyle.lerp( - languageCodeInLanguagePickerTitleBold, - other.languageCodeInLanguagePickerTitleBold, - t)!, - languageGradientEnd: - Color.lerp(languageGradientEnd, other.languageGradientEnd, t)!, - languageGradientStart: - Color.lerp(languageGradientStart, other.languageGradientStart, t)!, - messagePanelErrorEdgeInsets: t < 0.5 - ? messagePanelErrorEdgeInsets - : other.messagePanelErrorEdgeInsets, + textColorWhite: Color.lerp(textColorWhite, other.textColorWhite, t)!, + boxShadowColor: Color.lerp(boxShadowColor, other.boxShadowColor, t)!, + bodyTextColor2: Color.lerp(bodyTextColor2, other.bodyTextColor2, t)!, + buttonBlueGradientEnd: + Color.lerp(buttonBlueGradientEnd, other.buttonBlueGradientEnd, t)!, + elevatedButtonBackgroundColor: Color.lerp(elevatedButtonBackgroundColor, + other.elevatedButtonBackgroundColor, t)!, outlineButtonBackgroundColor: Color.lerp( outlineButtonBackgroundColor, other.outlineButtonBackgroundColor, t)!, - spacingM: t < 0.5 ? spacingM : other.spacingM, - spacingS: t < 0.5 ? spacingS : other.spacingS, - spacingXXXXL1: t < 0.5 ? spacingXXXXL1 : other.spacingXXXXL1, - textColorWhite: Color.lerp(textColorWhite, other.textColorWhite, t)!, - titleBold: TextStyle.lerp(titleBold, other.titleBold, t)!, + checkIcon: t < 0.5 ? checkIcon : other.checkIcon, ); } @@ -308,91 +183,86 @@ class LanguagePickerTheme extends ThemeExtension { return identical(this, other) || (other.runtimeType == runtimeType && other is LanguagePickerTheme && - const DeepCollectionEquality().equals(activeButtonLanguageTextColor, - other.activeButtonLanguageTextColor) && - const DeepCollectionEquality() - .equals(activeGradientEnd, other.activeGradientEnd) && - const DeepCollectionEquality() - .equals(bodyTextColor2, other.bodyTextColor2) && - const DeepCollectionEquality() - .equals(boxShadowColor, other.boxShadowColor) && - const DeepCollectionEquality() - .equals(buttonBlueGradientEnd, other.buttonBlueGradientEnd) && - const DeepCollectionEquality() - .equals(buttonTextColor, other.buttonTextColor) && const DeepCollectionEquality() .equals(changeLanguagePadding, other.changeLanguagePadding) && const DeepCollectionEquality() - .equals(changeLanguageSizedBox, other.changeLanguageSizedBox) && - const DeepCollectionEquality().equals(checkIcon, other.checkIcon) && + .equals(chooseLanguagePadding, other.chooseLanguagePadding) && const DeepCollectionEquality().equals( chooseLanguageActiveEdgeInsets, other.chooseLanguageActiveEdgeInsets) && const DeepCollectionEquality().equals( chooseLanguageInactiveEdgeInsets, other.chooseLanguageInactiveEdgeInsets) && - const DeepCollectionEquality() - .equals(chooseLanguagePadding, other.chooseLanguagePadding) && const DeepCollectionEquality() .equals(descriptionThin, other.descriptionThin) && - const DeepCollectionEquality().equals( - disabledFilledButtonBackgroundColor, - other.disabledFilledButtonBackgroundColor) && - const DeepCollectionEquality().equals(elevatedButtonBackgroundColor, - other.elevatedButtonBackgroundColor) && - const DeepCollectionEquality().equals( - filledButtonBackgroundColorDisabled, - other.filledButtonBackgroundColorDisabled) && - const DeepCollectionEquality().equals(filledButtonTextColorDisabled, - other.filledButtonTextColorDisabled) && + const DeepCollectionEquality().equals(titleBold, other.titleBold) && const DeepCollectionEquality().equals( languageCodeInLanguagePickerTitleBold, other.languageCodeInLanguagePickerTitleBold) && + const DeepCollectionEquality().equals(spacingS, other.spacingS) && const DeepCollectionEquality() - .equals(languageGradientEnd, other.languageGradientEnd) && + .equals(changeLanguageSizedBox, other.changeLanguageSizedBox) && + const DeepCollectionEquality().equals(spacingM, other.spacingM) && + const DeepCollectionEquality() + .equals(spacingXXXXL1, other.spacingXXXXL1) && + const DeepCollectionEquality().equals(messagePanelErrorEdgeInsets, + other.messagePanelErrorEdgeInsets) && + const DeepCollectionEquality().equals(activeButtonLanguageTextColor, + other.activeButtonLanguageTextColor) && + const DeepCollectionEquality().equals( + disabledFilledButtonBackgroundColor, + other.disabledFilledButtonBackgroundColor) && + const DeepCollectionEquality() + .equals(activeGradientEnd, other.activeGradientEnd) && const DeepCollectionEquality() .equals(languageGradientStart, other.languageGradientStart) && - const DeepCollectionEquality().equals(messagePanelErrorEdgeInsets, other.messagePanelErrorEdgeInsets) && - const DeepCollectionEquality().equals(outlineButtonBackgroundColor, other.outlineButtonBackgroundColor) && - const DeepCollectionEquality().equals(spacingM, other.spacingM) && - const DeepCollectionEquality().equals(spacingS, other.spacingS) && - const DeepCollectionEquality().equals(spacingXXXXL1, other.spacingXXXXL1) && + const DeepCollectionEquality() + .equals(languageGradientEnd, other.languageGradientEnd) && + const DeepCollectionEquality().equals( + filledButtonBackgroundColorDisabled, other.filledButtonBackgroundColorDisabled) && + const DeepCollectionEquality().equals(buttonTextColor, other.buttonTextColor) && + const DeepCollectionEquality().equals(filledButtonTextColorDisabled, other.filledButtonTextColorDisabled) && const DeepCollectionEquality().equals(textColorWhite, other.textColorWhite) && - const DeepCollectionEquality().equals(titleBold, other.titleBold)); + const DeepCollectionEquality().equals(boxShadowColor, other.boxShadowColor) && + const DeepCollectionEquality().equals(bodyTextColor2, other.bodyTextColor2) && + const DeepCollectionEquality().equals(buttonBlueGradientEnd, other.buttonBlueGradientEnd) && + const DeepCollectionEquality().equals(elevatedButtonBackgroundColor, other.elevatedButtonBackgroundColor) && + const DeepCollectionEquality().equals(outlineButtonBackgroundColor, other.outlineButtonBackgroundColor) && + const DeepCollectionEquality().equals(checkIcon, other.checkIcon)); } @override int get hashCode { return Object.hashAll([ runtimeType.hashCode, - const DeepCollectionEquality().hash(activeButtonLanguageTextColor), - const DeepCollectionEquality().hash(activeGradientEnd), - const DeepCollectionEquality().hash(bodyTextColor2), - const DeepCollectionEquality().hash(boxShadowColor), - const DeepCollectionEquality().hash(buttonBlueGradientEnd), - const DeepCollectionEquality().hash(buttonTextColor), const DeepCollectionEquality().hash(changeLanguagePadding), - const DeepCollectionEquality().hash(changeLanguageSizedBox), - const DeepCollectionEquality().hash(checkIcon), + const DeepCollectionEquality().hash(chooseLanguagePadding), const DeepCollectionEquality().hash(chooseLanguageActiveEdgeInsets), const DeepCollectionEquality().hash(chooseLanguageInactiveEdgeInsets), - const DeepCollectionEquality().hash(chooseLanguagePadding), const DeepCollectionEquality().hash(descriptionThin), - const DeepCollectionEquality().hash(disabledFilledButtonBackgroundColor), - const DeepCollectionEquality().hash(elevatedButtonBackgroundColor), - const DeepCollectionEquality().hash(filledButtonBackgroundColorDisabled), - const DeepCollectionEquality().hash(filledButtonTextColorDisabled), + const DeepCollectionEquality().hash(titleBold), const DeepCollectionEquality() .hash(languageCodeInLanguagePickerTitleBold), - const DeepCollectionEquality().hash(languageGradientEnd), - const DeepCollectionEquality().hash(languageGradientStart), - const DeepCollectionEquality().hash(messagePanelErrorEdgeInsets), - const DeepCollectionEquality().hash(outlineButtonBackgroundColor), - const DeepCollectionEquality().hash(spacingM), const DeepCollectionEquality().hash(spacingS), + const DeepCollectionEquality().hash(changeLanguageSizedBox), + const DeepCollectionEquality().hash(spacingM), const DeepCollectionEquality().hash(spacingXXXXL1), + const DeepCollectionEquality().hash(messagePanelErrorEdgeInsets), + const DeepCollectionEquality().hash(activeButtonLanguageTextColor), + const DeepCollectionEquality().hash(disabledFilledButtonBackgroundColor), + const DeepCollectionEquality().hash(activeGradientEnd), + const DeepCollectionEquality().hash(languageGradientStart), + const DeepCollectionEquality().hash(languageGradientEnd), + const DeepCollectionEquality().hash(filledButtonBackgroundColorDisabled), + const DeepCollectionEquality().hash(buttonTextColor), + const DeepCollectionEquality().hash(filledButtonTextColorDisabled), const DeepCollectionEquality().hash(textColorWhite), - const DeepCollectionEquality().hash(titleBold), + const DeepCollectionEquality().hash(boxShadowColor), + const DeepCollectionEquality().hash(bodyTextColor2), + const DeepCollectionEquality().hash(buttonBlueGradientEnd), + const DeepCollectionEquality().hash(elevatedButtonBackgroundColor), + const DeepCollectionEquality().hash(outlineButtonBackgroundColor), + const DeepCollectionEquality().hash(checkIcon), ]); } } diff --git a/packages/widget_toolkit/test/helpers/golden_helper.dart b/packages/widget_toolkit/test/helpers/golden_helper.dart index 1683ba85..830a268e 100644 --- a/packages/widget_toolkit/test/helpers/golden_helper.dart +++ b/packages/widget_toolkit/test/helpers/golden_helper.dart @@ -99,8 +99,8 @@ ThemeData getThemeData(bool inLightMode) { inherit: true, ), ), - ItemPickerTheme.light, - LanguagePickerTheme.light.copyWith( + ItemPickerTheme.light(), + LanguagePickerTheme.light().copyWith( descriptionThin: const TextStyle( inherit: true, ), @@ -136,8 +136,8 @@ ThemeData getThemeData(bool inLightMode) { inherit: true, ), ), - ItemPickerTheme.dark, - LanguagePickerTheme.dark.copyWith( + ItemPickerTheme.dark(), + LanguagePickerTheme.dark().copyWith( descriptionThin: const TextStyle( inherit: true, ), diff --git a/packages/widget_toolkit/test/lib_edit_address/blocs/edit_address_test.mocks.dart b/packages/widget_toolkit/test/lib_edit_address/blocs/edit_address_test.mocks.dart index a081ce36..1e3bc7a0 100644 --- a/packages/widget_toolkit/test/lib_edit_address/blocs/edit_address_test.mocks.dart +++ b/packages/widget_toolkit/test/lib_edit_address/blocs/edit_address_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in widget_toolkit/test/lib_edit_address/blocs/edit_address_test.dart. // Do not manually edit this file. @@ -6,10 +6,11 @@ import 'dart:async' as _i5; import 'package:mockito/mockito.dart' as _i1; +import 'package:mockito/src/dummies.dart' as _i6; import 'package:widget_toolkit/src/lib_edit_address/models/address_model.dart' as _i2; import 'package:widget_toolkit/src/lib_edit_address/models/address_type_model.dart' - as _i6; + as _i7; import 'package:widget_toolkit/src/lib_edit_address/models/country_model.dart' as _i3; import 'package:widget_toolkit/src/lib_edit_address/services/edit_address_service.dart' @@ -19,6 +20,8 @@ import 'package:widget_toolkit/src/lib_edit_address/services/edit_address_servic // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors @@ -70,6 +73,7 @@ class MockEditAddressService extends _i1.Mock ), )), ) as _i5.Future<_i2.AddressModel>); + @override _i5.Future> getCountries() => (super.noSuchMethod( Invocation.method( @@ -78,6 +82,7 @@ class MockEditAddressService extends _i1.Mock ), returnValue: _i5.Future>.value([]), ) as _i5.Future>); + @override List getCountryPlaceholderList() => (super.noSuchMethod( Invocation.method( @@ -86,6 +91,7 @@ class MockEditAddressService extends _i1.Mock ), returnValue: [], ) as List); + @override _i5.Future> filteredCountriesByName( List? list, @@ -101,14 +107,22 @@ class MockEditAddressService extends _i1.Mock ), returnValue: _i5.Future>.value([]), ) as _i5.Future>); + @override _i5.Future validateCityOnSubmit(String? text) => (super.noSuchMethod( Invocation.method( #validateCityOnSubmit, [text], ), - returnValue: _i5.Future.value(''), + returnValue: _i5.Future.value(_i6.dummyValue( + this, + Invocation.method( + #validateCityOnSubmit, + [text], + ), + )), ) as _i5.Future); + @override _i5.Future validateStreetOnSubmit(String? text) => (super.noSuchMethod( @@ -116,8 +130,15 @@ class MockEditAddressService extends _i1.Mock #validateStreetOnSubmit, [text], ), - returnValue: _i5.Future.value(''), + returnValue: _i5.Future.value(_i6.dummyValue( + this, + Invocation.method( + #validateStreetOnSubmit, + [text], + ), + )), ) as _i5.Future); + @override void validateCityOnType(String? text) => super.noSuchMethod( Invocation.method( @@ -126,6 +147,7 @@ class MockEditAddressService extends _i1.Mock ), returnValueForMissingStub: null, ); + @override void validateStreetOnType(String? text) => super.noSuchMethod( Invocation.method( @@ -145,20 +167,29 @@ class MockAddressModel extends _i1.Mock implements _i2.AddressModel { } @override - _i6.AddressTypeModel get addressType => (super.noSuchMethod( + _i7.AddressTypeModel get addressType => (super.noSuchMethod( Invocation.getter(#addressType), - returnValue: _i6.AddressTypeModel.headquarters, - ) as _i6.AddressTypeModel); + returnValue: _i7.AddressTypeModel.headquarters, + ) as _i7.AddressTypeModel); + @override String get city => (super.noSuchMethod( Invocation.getter(#city), - returnValue: '', + returnValue: _i6.dummyValue( + this, + Invocation.getter(#city), + ), ) as String); + @override String get streetAddress => (super.noSuchMethod( Invocation.getter(#streetAddress), - returnValue: '', + returnValue: _i6.dummyValue( + this, + Invocation.getter(#streetAddress), + ), ) as String); + @override _i3.CountryModel get country => (super.noSuchMethod( Invocation.getter(#country), @@ -167,21 +198,31 @@ class MockAddressModel extends _i1.Mock implements _i2.AddressModel { Invocation.getter(#country), ), ) as _i3.CountryModel); + @override String get fullAddress => (super.noSuchMethod( Invocation.getter(#fullAddress), - returnValue: '', + returnValue: _i6.dummyValue( + this, + Invocation.getter(#fullAddress), + ), ) as String); + @override String get countryAndCity => (super.noSuchMethod( Invocation.getter(#countryAndCity), - returnValue: '', + returnValue: _i6.dummyValue( + this, + Invocation.getter(#countryAndCity), + ), ) as String); + @override List get props => (super.noSuchMethod( Invocation.getter(#props), returnValue: [], ) as List); + @override Map toJson() => (super.noSuchMethod( Invocation.method( @@ -190,6 +231,7 @@ class MockAddressModel extends _i1.Mock implements _i2.AddressModel { ), returnValue: {}, ) as Map); + @override bool isEmpty() => (super.noSuchMethod( Invocation.method( diff --git a/packages/widget_toolkit/test/lib_edit_address/mock/edit_address_mock.mocks.dart b/packages/widget_toolkit/test/lib_edit_address/mock/edit_address_mock.mocks.dart index e2c635fd..4a80b57f 100644 --- a/packages/widget_toolkit/test/lib_edit_address/mock/edit_address_mock.mocks.dart +++ b/packages/widget_toolkit/test/lib_edit_address/mock/edit_address_mock.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in widget_toolkit/test/lib_edit_address/mock/edit_address_mock.dart. // Do not manually edit this file. @@ -19,6 +19,8 @@ import 'package:widget_toolkit/src/lib_edit_address/models/country_model.dart' // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors @@ -73,11 +75,13 @@ class MockEditAddressBlocStates extends _i1.Mock Invocation.getter(#onAddressSet), returnValue: _i4.Stream<_i5.AddressModel>.empty(), ) as _i4.Stream<_i5.AddressModel>); + @override _i4.Stream get isLoading => (super.noSuchMethod( Invocation.getter(#isLoading), returnValue: _i4.Stream.empty(), ) as _i4.Stream); + @override _i2.ConnectableStream<_i6.ErrorModel?> get errors => (super.noSuchMethod( Invocation.getter(#errors), @@ -86,6 +90,7 @@ class MockEditAddressBlocStates extends _i1.Mock Invocation.getter(#errors), ), ) as _i2.ConnectableStream<_i6.ErrorModel?>); + @override _i2.ConnectableStream<_i5.AddressModel> get onAddressSaved => (super.noSuchMethod( @@ -95,6 +100,7 @@ class MockEditAddressBlocStates extends _i1.Mock Invocation.getter(#onAddressSaved), ), ) as _i2.ConnectableStream<_i5.AddressModel>); + @override _i2.ConnectableStream get street => (super.noSuchMethod( Invocation.getter(#street), @@ -103,6 +109,7 @@ class MockEditAddressBlocStates extends _i1.Mock Invocation.getter(#street), ), ) as _i2.ConnectableStream); + @override _i2.ConnectableStream get city => (super.noSuchMethod( Invocation.getter(#city), @@ -111,6 +118,7 @@ class MockEditAddressBlocStates extends _i1.Mock Invocation.getter(#city), ), ) as _i2.ConnectableStream); + @override _i2.ConnectableStream get isCountryEdited => (super.noSuchMethod( Invocation.getter(#isCountryEdited), @@ -119,6 +127,7 @@ class MockEditAddressBlocStates extends _i1.Mock Invocation.getter(#isCountryEdited), ), ) as _i2.ConnectableStream); + @override _i2.ConnectableStream<_i7.CountryModel> get country => (super.noSuchMethod( Invocation.getter(#country), @@ -127,6 +136,7 @@ class MockEditAddressBlocStates extends _i1.Mock Invocation.getter(#country), ), ) as _i2.ConnectableStream<_i7.CountryModel>); + @override _i2.ConnectableStream<_i5.AddressModel> get address => (super.noSuchMethod( Invocation.getter(#address), @@ -154,6 +164,7 @@ class MockEditAddressBlocEvents extends _i1.Mock ), returnValueForMissingStub: null, ); + @override void saveAddress() => super.noSuchMethod( Invocation.method( @@ -162,6 +173,7 @@ class MockEditAddressBlocEvents extends _i1.Mock ), returnValueForMissingStub: null, ); + @override void setStreet(String? newStreet) => super.noSuchMethod( Invocation.method( @@ -170,6 +182,7 @@ class MockEditAddressBlocEvents extends _i1.Mock ), returnValueForMissingStub: null, ); + @override void setCity(String? newCity) => super.noSuchMethod( Invocation.method( @@ -178,6 +191,7 @@ class MockEditAddressBlocEvents extends _i1.Mock ), returnValueForMissingStub: null, ); + @override void setCountry(_i7.CountryModel? newCountry) => super.noSuchMethod( Invocation.method( @@ -186,6 +200,7 @@ class MockEditAddressBlocEvents extends _i1.Mock ), returnValueForMissingStub: null, ); + @override void saveCountry() => super.noSuchMethod( Invocation.method( @@ -213,6 +228,7 @@ class MockEditAddressBlocType extends _i1.Mock Invocation.getter(#events), ), ) as _i3.EditAddressBlocEvents); + @override _i3.EditAddressBlocStates get states => (super.noSuchMethod( Invocation.getter(#states), @@ -221,6 +237,7 @@ class MockEditAddressBlocType extends _i1.Mock Invocation.getter(#states), ), ) as _i3.EditAddressBlocStates); + @override void dispose() => super.noSuchMethod( Invocation.method( diff --git a/packages/widget_toolkit/test/lib_language_picker/blocs/language_picker_test.mocks.dart b/packages/widget_toolkit/test/lib_language_picker/blocs/language_picker_test.mocks.dart index c46fe9e6..6be5302c 100644 --- a/packages/widget_toolkit/test/lib_language_picker/blocs/language_picker_test.mocks.dart +++ b/packages/widget_toolkit/test/lib_language_picker/blocs/language_picker_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in widget_toolkit/test/lib_language_picker/blocs/language_picker_test.dart. // Do not manually edit this file. @@ -12,6 +12,8 @@ import 'package:widget_toolkit/language_picker.dart' as _i2; // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors @@ -51,6 +53,7 @@ class MockLanguageService extends _i1.Mock implements _i2.LanguageService { ), )), ) as _i3.Future<_i2.LanguageModel>); + @override _i3.Future> getLanguageList() => (super.noSuchMethod( @@ -61,6 +64,7 @@ class MockLanguageService extends _i1.Mock implements _i2.LanguageService { returnValue: _i3.Future>.value( <_i2.SelectedLanguageModel>[]), ) as _i3.Future>); + @override _i3.Future> getAll() => (super.noSuchMethod( Invocation.method( @@ -70,6 +74,7 @@ class MockLanguageService extends _i1.Mock implements _i2.LanguageService { returnValue: _i3.Future>.value(<_i2.LanguageModel>[]), ) as _i3.Future>); + @override _i3.Future setCurrent(_i2.LanguageModel? language) => (super.noSuchMethod( diff --git a/packages/widget_toolkit/test/lib_language_picker/mock/language_picker_mock.mocks.dart b/packages/widget_toolkit/test/lib_language_picker/mock/language_picker_mock.mocks.dart index 2061bef3..9c2f22fe 100644 --- a/packages/widget_toolkit/test/lib_language_picker/mock/language_picker_mock.mocks.dart +++ b/packages/widget_toolkit/test/lib_language_picker/mock/language_picker_mock.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in widget_toolkit/test/lib_language_picker/mock/language_picker_mock.dart. // Do not manually edit this file. @@ -17,6 +17,8 @@ import 'package:widget_toolkit/src/lib_language_picker/models/selected_language_ // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors @@ -75,6 +77,7 @@ class MockLanguagePickerBlocStates extends _i1.Mock Invocation.getter(#currentLanguage), ), ) as _i2.ConnectableStream<_i4.LanguageModel>); + @override _i2.ConnectableStream<_i5.ErrorModel?> get errors => (super.noSuchMethod( Invocation.getter(#errors), @@ -83,6 +86,7 @@ class MockLanguagePickerBlocStates extends _i1.Mock Invocation.getter(#errors), ), ) as _i2.ConnectableStream<_i5.ErrorModel?>); + @override _i2.ConnectableStream> get languages => (super.noSuchMethod( @@ -92,6 +96,7 @@ class MockLanguagePickerBlocStates extends _i1.Mock Invocation.getter(#languages), ), ) as _i2.ConnectableStream>); + @override _i2.ConnectableStream<_i7.LoadingWithTag> get loading => (super.noSuchMethod( Invocation.getter(#loading), @@ -138,6 +143,7 @@ class MockLanguagePickerBlocType extends _i1.Mock Invocation.getter(#events), ), ) as _i3.LanguagePickerBlocEvents); + @override _i3.LanguagePickerBlocStates get states => (super.noSuchMethod( Invocation.getter(#states), @@ -146,6 +152,7 @@ class MockLanguagePickerBlocType extends _i1.Mock Invocation.getter(#states), ), ) as _i3.LanguagePickerBlocStates); + @override void dispose() => super.noSuchMethod( Invocation.method( diff --git a/packages/widget_toolkit/test/lib_search_picker/blocs/search_picker_test.mocks.dart b/packages/widget_toolkit/test/lib_search_picker/blocs/search_picker_test.mocks.dart index 3fca3cc4..4064413e 100644 --- a/packages/widget_toolkit/test/lib_search_picker/blocs/search_picker_test.mocks.dart +++ b/packages/widget_toolkit/test/lib_search_picker/blocs/search_picker_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in widget_toolkit/test/lib_search_picker/blocs/search_picker_test.dart. // Do not manually edit this file. @@ -14,6 +14,8 @@ import '../repositories/search_repository_mock.dart' as _i2; // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors diff --git a/packages/widget_toolkit/test/lib_search_picker/mock/search_picker_mock.mocks.dart b/packages/widget_toolkit/test/lib_search_picker/mock/search_picker_mock.mocks.dart index 3787e5fe..da953142 100644 --- a/packages/widget_toolkit/test/lib_search_picker/mock/search_picker_mock.mocks.dart +++ b/packages/widget_toolkit/test/lib_search_picker/mock/search_picker_mock.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in widget_toolkit/test/lib_search_picker/mock/search_picker_mock.dart. // Do not manually edit this file. @@ -14,6 +14,8 @@ import 'package:widget_toolkit/src/lib_search_picker/blocs/search_picker_bloc.da // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors @@ -57,6 +59,7 @@ class MockSearchPickerBlocStates extends _i1.Mock Invocation.getter(#itemsList), returnValue: _i3.Stream<_i4.Result>>.empty(), ) as _i3.Stream<_i4.Result>>); + @override _i3.Stream get queryFilter => (super.noSuchMethod( Invocation.getter(#queryFilter), @@ -81,6 +84,7 @@ class MockSearchPickerBlocEvents extends _i1.Mock ), returnValueForMissingStub: null, ); + @override void filterByQuery({String? query}) => super.noSuchMethod( Invocation.method( @@ -109,6 +113,7 @@ class MockSearchPickerBlocType extends _i1.Mock Invocation.getter(#events), ), ) as _i2.SearchPickerBlocEvents); + @override _i2.SearchPickerBlocStates get states => (super.noSuchMethod( Invocation.getter(#states), @@ -117,6 +122,7 @@ class MockSearchPickerBlocType extends _i1.Mock Invocation.getter(#states), ), ) as _i2.SearchPickerBlocStates); + @override void dispose() => super.noSuchMethod( Invocation.method( diff --git a/packages/widget_toolkit/test/lib_search_picker/view/search_picker_golden_test.mocks.dart b/packages/widget_toolkit/test/lib_search_picker/view/search_picker_golden_test.mocks.dart index b1702c3a..5211734e 100644 --- a/packages/widget_toolkit/test/lib_search_picker/view/search_picker_golden_test.mocks.dart +++ b/packages/widget_toolkit/test/lib_search_picker/view/search_picker_golden_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in widget_toolkit/test/lib_search_picker/view/search_picker_golden_test.dart. // Do not manually edit this file. @@ -14,6 +14,8 @@ import '../repositories/search_repository_mock.dart' as _i2; // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors diff --git a/packages/widget_toolkit/test/lib_text_field_dialog/blocs/text_field_dialog_test.mocks.dart b/packages/widget_toolkit/test/lib_text_field_dialog/blocs/text_field_dialog_test.mocks.dart index 97481c2c..9e00995b 100644 --- a/packages/widget_toolkit/test/lib_text_field_dialog/blocs/text_field_dialog_test.mocks.dart +++ b/packages/widget_toolkit/test/lib_text_field_dialog/blocs/text_field_dialog_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in widget_toolkit/test/lib_text_field_dialog/blocs/text_field_dialog_test.dart. // Do not manually edit this file. @@ -6,6 +6,7 @@ import 'dart:async' as _i3; import 'package:mockito/mockito.dart' as _i1; +import 'package:mockito/src/dummies.dart' as _i4; import '../services/text_field_service_mock.dart' as _i2; @@ -13,6 +14,8 @@ import '../services/text_field_service_mock.dart' as _i2; // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors @@ -35,8 +38,15 @@ class MockTextFieldDialogServiceMock extends _i1.Mock #validateOnSubmit, [text], ), - returnValue: _i3.Future.value(''), + returnValue: _i3.Future.value(_i4.dummyValue( + this, + Invocation.method( + #validateOnSubmit, + [text], + ), + )), ) as _i3.Future); + @override void validateOnType(String? text) => super.noSuchMethod( Invocation.method( diff --git a/packages/widget_toolkit/test/lib_text_field_dialog/mock/text_field_dialog_mock.mocks.dart b/packages/widget_toolkit/test/lib_text_field_dialog/mock/text_field_dialog_mock.mocks.dart index d988dd75..897b922d 100644 --- a/packages/widget_toolkit/test/lib_text_field_dialog/mock/text_field_dialog_mock.mocks.dart +++ b/packages/widget_toolkit/test/lib_text_field_dialog/mock/text_field_dialog_mock.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.4.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in widget_toolkit/test/lib_text_field_dialog/mock/text_field_dialog_mock.dart. // Do not manually edit this file. @@ -14,6 +14,8 @@ import 'package:widget_toolkit/src/lib_text_field_dialog/blocs/text_field_dialog // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors @@ -57,11 +59,13 @@ class MockTextFieldDialogBlocStates extends _i1.Mock Invocation.getter(#submittedValue), returnValue: _i3.Stream<_i4.Result>.empty(), ) as _i3.Stream<_i4.Result>); + @override _i3.Stream get isErrorVisible => (super.noSuchMethod( Invocation.getter(#isErrorVisible), returnValue: _i3.Stream.empty(), ) as _i3.Stream); + @override _i3.Stream get text => (super.noSuchMethod( Invocation.getter(#text), @@ -86,6 +90,7 @@ class MockTextFieldDialogBlocEvents extends _i1.Mock ), returnValueForMissingStub: null, ); + @override void submit() => super.noSuchMethod( Invocation.method( @@ -113,6 +118,7 @@ class MockTextFieldDialogBlocType extends _i1.Mock Invocation.getter(#events), ), ) as _i2.TextFieldDialogBlocEvents); + @override _i2.TextFieldDialogBlocStates get states => (super.noSuchMethod( Invocation.getter(#states), @@ -121,6 +127,7 @@ class MockTextFieldDialogBlocType extends _i1.Mock Invocation.getter(#states), ), ) as _i2.TextFieldDialogBlocStates); + @override void dispose() => super.noSuchMethod( Invocation.method(