From d8ccafa8a3d851ee56d825635ff90741dc21dc5a Mon Sep 17 00:00:00 2001 From: Aasim Khan Date: Thu, 29 Feb 2024 17:37:12 +0400 Subject: [PATCH 1/5] feat: [#258]Added app theme text styles to the text-style parser --- examples/mirai_gallery/macos/Podfile.lock | 2 +- .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- examples/mirai_gallery/pubspec.lock | 56 ++++++------------- .../mirai_dialog_action.g.dart | 1 - .../mirai_alert_dialog.g.dart | 6 +- .../mirai_app_bar/mirai_app_bar.g.dart | 6 +- .../mirai_app_bar_theme.g.dart | 6 +- .../mirai_bottom_nav_bar_theme.g.dart | 6 +- .../mirai_bottom_navigation_bar.g.dart | 6 +- .../mirai_button_style.g.dart | 2 +- .../src/parsers/mirai_chip/mirai_chip.g.dart | 2 +- .../mirai_dialog_theme.g.dart | 6 +- .../mirai_floating_action_button.g.dart | 5 +- ...i_floating_action_button_theme_data.g.dart | 3 +- .../mirai_input_decoration.g.dart | 21 +++---- .../mirai_input_decoration_theme.g.dart | 21 +++---- .../mirai_list_tile_theme_data.g.dart | 9 +-- .../mirai_navigation_bar_theme_data.g.dart | 3 +- .../mirai_tab_bar/mirai_tab_bar.g.dart | 5 +- .../mirai_tab_bar_theme_data.g.dart | 5 +- .../src/parsers/mirai_text/mirai_text.g.dart | 10 ++-- .../mirai_text_field/mirai_text_field.g.dart | 5 +- .../mirai_text_form_field.g.dart | 5 +- .../mirai_text_style/mirai_text_style.dart | 49 +++++++++++++++- .../mirai_text_style.freezed.dart | 24 +++++++- .../mirai_text_style/mirai_text_style.g.dart | 2 + 27 files changed, 140 insertions(+), 130 deletions(-) diff --git a/examples/mirai_gallery/macos/Podfile.lock b/examples/mirai_gallery/macos/Podfile.lock index 1f6779f9..79862f06 100644 --- a/examples/mirai_gallery/macos/Podfile.lock +++ b/examples/mirai_gallery/macos/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 -COCOAPODS: 1.14.3 +COCOAPODS: 1.12.1 diff --git a/examples/mirai_gallery/macos/Runner.xcodeproj/project.pbxproj b/examples/mirai_gallery/macos/Runner.xcodeproj/project.pbxproj index 110378e8..39f233b6 100644 --- a/examples/mirai_gallery/macos/Runner.xcodeproj/project.pbxproj +++ b/examples/mirai_gallery/macos/Runner.xcodeproj/project.pbxproj @@ -258,7 +258,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1510; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { diff --git a/examples/mirai_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/examples/mirai_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8d1ec463..ca25b4d5 100644 --- a/examples/mirai_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/examples/mirai_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ _$$MiraiDialogActionImplToJson( const _$TraversalEdgeBehaviorEnumMap = { TraversalEdgeBehavior.closedLoop: 'closedLoop', TraversalEdgeBehavior.leaveFlutterView: 'leaveFlutterView', - TraversalEdgeBehavior.parentScope: 'parentScope', }; diff --git a/packages/mirai/lib/src/parsers/mirai_alert_dialog/mirai_alert_dialog.g.dart b/packages/mirai/lib/src/parsers/mirai_alert_dialog/mirai_alert_dialog.g.dart index ef26ef8e..f71dbf46 100644 --- a/packages/mirai/lib/src/parsers/mirai_alert_dialog/mirai_alert_dialog.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_alert_dialog/mirai_alert_dialog.g.dart @@ -22,8 +22,7 @@ _$MiraiAlertDialogImpl _$$MiraiAlertDialogImplFromJson( json['titlePadding'] as Map), titleTextStyle: json['titleTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['titleTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['titleTextStyle']), content: json['content'] as Map?, contentPadding: json['contentPadding'] == null ? null @@ -31,8 +30,7 @@ _$MiraiAlertDialogImpl _$$MiraiAlertDialogImplFromJson( json['contentPadding'] as Map), contentTextStyle: json['contentTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['contentTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['contentTextStyle']), actions: (json['actions'] as List?) ?.map((e) => e as Map) .toList(), diff --git a/packages/mirai/lib/src/parsers/mirai_app_bar/mirai_app_bar.g.dart b/packages/mirai/lib/src/parsers/mirai_app_bar/mirai_app_bar.g.dart index 3c42b58c..b0635d98 100644 --- a/packages/mirai/lib/src/parsers/mirai_app_bar/mirai_app_bar.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_app_bar/mirai_app_bar.g.dart @@ -12,12 +12,10 @@ _$MiraiAppBarImpl _$$MiraiAppBarImplFromJson(Map json) => title: json['title'] as Map?, titleTextStyle: json['titleTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['titleTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['titleTextStyle']), toolbarTextStyle: json['toolbarTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['toolbarTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['toolbarTextStyle']), shadowColor: json['shadowColor'] as String?, backgroundColor: json['backgroundColor'] as String?, foregroundColor: json['foregroundColor'] as String?, diff --git a/packages/mirai/lib/src/parsers/mirai_app_bar_theme/mirai_app_bar_theme.g.dart b/packages/mirai/lib/src/parsers/mirai_app_bar_theme/mirai_app_bar_theme.g.dart index 9ec60359..35db8b40 100644 --- a/packages/mirai/lib/src/parsers/mirai_app_bar_theme/mirai_app_bar_theme.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_app_bar_theme/mirai_app_bar_theme.g.dart @@ -29,12 +29,10 @@ _$MiraiAppBarThemeImpl _$$MiraiAppBarThemeImplFromJson( toolbarHeight: (json['toolbarHeight'] as num?)?.toDouble(), toolbarTextStyle: json['toolbarTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['toolbarTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['toolbarTextStyle']), titleTextStyle: json['titleTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['titleTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['titleTextStyle']), systemOverlayStyle: json['systemOverlayStyle'] == null ? null : MiraiSystemUIOverlayStyle.fromJson( diff --git a/packages/mirai/lib/src/parsers/mirai_bottom_nav_bar_theme/mirai_bottom_nav_bar_theme.g.dart b/packages/mirai/lib/src/parsers/mirai_bottom_nav_bar_theme/mirai_bottom_nav_bar_theme.g.dart index c5bfb6eb..40313a96 100644 --- a/packages/mirai/lib/src/parsers/mirai_bottom_nav_bar_theme/mirai_bottom_nav_bar_theme.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_bottom_nav_bar_theme/mirai_bottom_nav_bar_theme.g.dart @@ -23,12 +23,10 @@ _$MiraiBottomNavBarThemeDataImpl _$$MiraiBottomNavBarThemeDataImplFromJson( unselectedItemColor: json['unselectedItemColor'] as String?, selectedLabelStyle: json['selectedLabelStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['selectedLabelStyle'] as Map), + : MiraiTextStyle.fromJson(json['selectedLabelStyle']), unselectedLabelStyle: json['unselectedLabelStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['unselectedLabelStyle'] as Map), + : MiraiTextStyle.fromJson(json['unselectedLabelStyle']), showSelectedLabels: json['showSelectedLabels'] as bool?, showUnselectedLabels: json['showUnselectedLabels'] as bool?, type: $enumDecodeNullable(_$BottomNavigationBarTypeEnumMap, json['type']), diff --git a/packages/mirai/lib/src/parsers/mirai_bottom_navigation_bar/mirai_bottom_navigation_bar.g.dart b/packages/mirai/lib/src/parsers/mirai_bottom_navigation_bar/mirai_bottom_navigation_bar.g.dart index 1f6da58e..85513c1d 100644 --- a/packages/mirai/lib/src/parsers/mirai_bottom_navigation_bar/mirai_bottom_navigation_bar.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_bottom_navigation_bar/mirai_bottom_navigation_bar.g.dart @@ -27,12 +27,10 @@ _$MiraiBottomNavigationBarImpl _$$MiraiBottomNavigationBarImplFromJson( (json['unselectedFontSize'] as num?)?.toDouble() ?? 12.0, selectedLabelStyle: json['selectedLabelStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['selectedLabelStyle'] as Map), + : MiraiTextStyle.fromJson(json['selectedLabelStyle']), unselectedLabelStyle: json['unselectedLabelStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['unselectedLabelStyle'] as Map), + : MiraiTextStyle.fromJson(json['unselectedLabelStyle']), showSelectedLabels: json['showSelectedLabels'] as bool?, showUnselectedLabels: json['showUnselectedLabels'] as bool?, enableFeedback: json['enableFeedback'] as bool?, diff --git a/packages/mirai/lib/src/parsers/mirai_button_style/mirai_button_style.g.dart b/packages/mirai/lib/src/parsers/mirai_button_style/mirai_button_style.g.dart index e1f6534d..ec7c50fe 100644 --- a/packages/mirai/lib/src/parsers/mirai_button_style/mirai_button_style.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_button_style/mirai_button_style.g.dart @@ -20,7 +20,7 @@ _$MiraiButtonStyleImpl _$$MiraiButtonStyleImplFromJson( elevation: (json['elevation'] as num?)?.toDouble(), textStyle: json['textStyle'] == null ? null - : MiraiTextStyle.fromJson(json['textStyle'] as Map), + : MiraiTextStyle.fromJson(json['textStyle']), padding: json['padding'] == null ? null : MiraiEdgeInsets.fromJson(json['padding'] as Map), diff --git a/packages/mirai/lib/src/parsers/mirai_chip/mirai_chip.g.dart b/packages/mirai/lib/src/parsers/mirai_chip/mirai_chip.g.dart index 329d1988..20a8c622 100644 --- a/packages/mirai/lib/src/parsers/mirai_chip/mirai_chip.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_chip/mirai_chip.g.dart @@ -12,7 +12,7 @@ _$MiraiChipImpl _$$MiraiChipImplFromJson(Map json) => avatar: json['avatar'] as Map?, labelStyle: json['labelStyle'] == null ? null - : MiraiTextStyle.fromJson(json['labelStyle'] as Map), + : MiraiTextStyle.fromJson(json['labelStyle']), labelPadding: json['labelPadding'] == null ? null : MiraiEdgeInsets.fromJson( diff --git a/packages/mirai/lib/src/parsers/mirai_dialog_theme/mirai_dialog_theme.g.dart b/packages/mirai/lib/src/parsers/mirai_dialog_theme/mirai_dialog_theme.g.dart index cbf05f63..5d77b1b7 100644 --- a/packages/mirai/lib/src/parsers/mirai_dialog_theme/mirai_dialog_theme.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_dialog_theme/mirai_dialog_theme.g.dart @@ -22,12 +22,10 @@ _$MiraiDialogThemeImpl _$$MiraiDialogThemeImplFromJson( json['alignment'] as Map), titleTextStyle: json['titleTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['titleTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['titleTextStyle']), contentTextStyle: json['contentTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['contentTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['contentTextStyle']), actionsPadding: json['actionsPadding'] == null ? null : MiraiEdgeInsets.fromJson( diff --git a/packages/mirai/lib/src/parsers/mirai_floating_action_button/mirai_floating_action_button.g.dart b/packages/mirai/lib/src/parsers/mirai_floating_action_button/mirai_floating_action_button.g.dart index ec1078c8..595205a4 100644 --- a/packages/mirai/lib/src/parsers/mirai_floating_action_button/mirai_floating_action_button.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_floating_action_button/mirai_floating_action_button.g.dart @@ -12,7 +12,7 @@ _$MiraiFloatingActionButtonImpl _$$MiraiFloatingActionButtonImplFromJson( onPressed: json['onPressed'] as Map?, textStyle: json['textStyle'] == null ? null - : MiraiTextStyle.fromJson(json['textStyle'] as Map), + : MiraiTextStyle.fromJson(json['textStyle']), buttonType: $enumDecodeNullable( _$FloatingActionButtonTypeEnumMap, json['buttonType']) ?? FloatingActionButtonType.small, @@ -25,8 +25,7 @@ _$MiraiFloatingActionButtonImpl _$$MiraiFloatingActionButtonImplFromJson( splashColor: json['splashColor'] as String?, extendedTextStyle: json['extendedTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['extendedTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['extendedTextStyle']), elevation: (json['elevation'] as num?)?.toDouble(), focusElevation: (json['focusElevation'] as num?)?.toDouble(), hoverElevation: (json['hoverElevation'] as num?)?.toDouble(), diff --git a/packages/mirai/lib/src/parsers/mirai_floating_action_button_theme_data/mirai_floating_action_button_theme_data.g.dart b/packages/mirai/lib/src/parsers/mirai_floating_action_button_theme_data/mirai_floating_action_button_theme_data.g.dart index e3c1629a..1448d8f3 100644 --- a/packages/mirai/lib/src/parsers/mirai_floating_action_button_theme_data/mirai_floating_action_button_theme_data.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_floating_action_button_theme_data/mirai_floating_action_button_theme_data.g.dart @@ -30,8 +30,7 @@ _$MiraiFloatingActionButtonThemeDataImpl json['extendedPadding'] as Map), extendedTextStyle: json['extendedTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['extendedTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['extendedTextStyle']), ); Map _$$MiraiFloatingActionButtonThemeDataImplToJson( diff --git a/packages/mirai/lib/src/parsers/mirai_input_decoration/mirai_input_decoration.g.dart b/packages/mirai/lib/src/parsers/mirai_input_decoration/mirai_input_decoration.g.dart index 5da180c7..5a451bcf 100644 --- a/packages/mirai/lib/src/parsers/mirai_input_decoration/mirai_input_decoration.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_input_decoration/mirai_input_decoration.g.dart @@ -15,20 +15,18 @@ _$MiraiInputDecorationImpl _$$MiraiInputDecorationImplFromJson( labelText: json['labelText'] as String?, labelStyle: json['labelStyle'] == null ? null - : MiraiTextStyle.fromJson(json['labelStyle'] as Map), + : MiraiTextStyle.fromJson(json['labelStyle']), floatingLabelStyle: json['floatingLabelStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['floatingLabelStyle'] as Map), + : MiraiTextStyle.fromJson(json['floatingLabelStyle']), helperText: json['helperText'] as String?, helperStyle: json['helperStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['helperStyle'] as Map), + : MiraiTextStyle.fromJson(json['helperStyle']), hintText: json['hintText'] as String?, hintStyle: json['hintStyle'] == null ? null - : MiraiTextStyle.fromJson(json['hintStyle'] as Map), + : MiraiTextStyle.fromJson(json['hintStyle']), helperMaxLines: json['helperMaxLines'] as int?, hintTextDirection: $enumDecodeNullable( _$TextDirectionEnumMap, json['hintTextDirection']), @@ -36,7 +34,7 @@ _$MiraiInputDecorationImpl _$$MiraiInputDecorationImplFromJson( errorText: json['errorText'] as String?, errorStyle: json['errorStyle'] == null ? null - : MiraiTextStyle.fromJson(json['errorStyle'] as Map), + : MiraiTextStyle.fromJson(json['errorStyle']), errorMaxLines: json['errorMaxLines'] as int?, floatingLabelBehavior: $enumDecodeNullable( _$FloatingLabelBehaviorEnumMap, json['floatingLabelBehavior']), @@ -57,8 +55,7 @@ _$MiraiInputDecorationImpl _$$MiraiInputDecorationImplFromJson( prefixText: json['prefixText'] as String?, prefixStyle: json['prefixStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['prefixStyle'] as Map), + : MiraiTextStyle.fromJson(json['prefixStyle']), prefixIconColor: json['prefixIconColor'] as String?, suffix: json['suffix'] as Map?, suffixIcon: json['suffixIcon'] as Map?, @@ -69,15 +66,13 @@ _$MiraiInputDecorationImpl _$$MiraiInputDecorationImplFromJson( suffixText: json['suffixText'] as String?, suffixStyle: json['suffixStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['suffixStyle'] as Map), + : MiraiTextStyle.fromJson(json['suffixStyle']), suffixIconColor: json['suffixIconColor'] as String?, counter: json['counter'] as Map?, counterText: json['counterText'] as String?, counterStyle: json['counterStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['counterStyle'] as Map), + : MiraiTextStyle.fromJson(json['counterStyle']), filled: json['filled'] as bool?, fillColor: json['fillColor'] as String?, hoverColor: json['hoverColor'] as String?, diff --git a/packages/mirai/lib/src/parsers/mirai_input_decoration_theme/mirai_input_decoration_theme.g.dart b/packages/mirai/lib/src/parsers/mirai_input_decoration_theme/mirai_input_decoration_theme.g.dart index 3a97f20c..c6eb82a8 100644 --- a/packages/mirai/lib/src/parsers/mirai_input_decoration_theme/mirai_input_decoration_theme.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_input_decoration_theme/mirai_input_decoration_theme.g.dart @@ -11,22 +11,20 @@ _$MiraiInputDecorationThemeImpl _$$MiraiInputDecorationThemeImplFromJson( _$MiraiInputDecorationThemeImpl( labelStyle: json['labelStyle'] == null ? null - : MiraiTextStyle.fromJson(json['labelStyle'] as Map), + : MiraiTextStyle.fromJson(json['labelStyle']), floatingLabelStyle: json['floatingLabelStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['floatingLabelStyle'] as Map), + : MiraiTextStyle.fromJson(json['floatingLabelStyle']), helperStyle: json['helperStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['helperStyle'] as Map), + : MiraiTextStyle.fromJson(json['helperStyle']), helperMaxLines: json['helperMaxLines'] as int?, hintStyle: json['hintStyle'] == null ? null - : MiraiTextStyle.fromJson(json['hintStyle'] as Map), + : MiraiTextStyle.fromJson(json['hintStyle']), errorStyle: json['errorStyle'] == null ? null - : MiraiTextStyle.fromJson(json['errorStyle'] as Map), + : MiraiTextStyle.fromJson(json['errorStyle']), errorMaxLines: json['errorMaxLines'] as int?, floatingLabelBehavior: $enumDecodeNullable( _$FloatingLabelBehaviorEnumMap, json['floatingLabelBehavior']), @@ -41,18 +39,15 @@ _$MiraiInputDecorationThemeImpl _$$MiraiInputDecorationThemeImplFromJson( iconColor: json['iconColor'] as String?, prefixStyle: json['prefixStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['prefixStyle'] as Map), + : MiraiTextStyle.fromJson(json['prefixStyle']), prefixIconColor: json['prefixIconColor'] as String?, suffixStyle: json['suffixStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['suffixStyle'] as Map), + : MiraiTextStyle.fromJson(json['suffixStyle']), suffixIconColor: json['suffixIconColor'] as String?, counterStyle: json['counterStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['counterStyle'] as Map), + : MiraiTextStyle.fromJson(json['counterStyle']), filled: json['filled'] as bool? ?? false, fillColor: json['fillColor'] as String?, activeIndicatorBorder: json['activeIndicatorBorder'] == null diff --git a/packages/mirai/lib/src/parsers/mirai_list_tile_theme_data/mirai_list_tile_theme_data.g.dart b/packages/mirai/lib/src/parsers/mirai_list_tile_theme_data/mirai_list_tile_theme_data.g.dart index 8564c0cc..84e79686 100644 --- a/packages/mirai/lib/src/parsers/mirai_list_tile_theme_data/mirai_list_tile_theme_data.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_list_tile_theme_data/mirai_list_tile_theme_data.g.dart @@ -19,16 +19,13 @@ _$MiraiListTileThemeDataImpl _$$MiraiListTileThemeDataImplFromJson( textColor: json['textColor'] as String?, titleTextStyle: json['titleTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['titleTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['titleTextStyle']), subtitleTextStyle: json['subtitleTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['subtitleTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['subtitleTextStyle']), leadingAndTrailingTextStyle: json['leadingAndTrailingTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['leadingAndTrailingTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['leadingAndTrailingTextStyle']), contentPadding: json['contentPadding'] == null ? null : MiraiEdgeInsets.fromJson( diff --git a/packages/mirai/lib/src/parsers/mirai_navigation_bar_theme_data/mirai_navigation_bar_theme_data.g.dart b/packages/mirai/lib/src/parsers/mirai_navigation_bar_theme_data/mirai_navigation_bar_theme_data.g.dart index 677a064a..e7ea23cc 100644 --- a/packages/mirai/lib/src/parsers/mirai_navigation_bar_theme_data/mirai_navigation_bar_theme_data.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_navigation_bar_theme_data/mirai_navigation_bar_theme_data.g.dart @@ -21,8 +21,7 @@ _$MiraiNavigationBarThemeDataImpl _$$MiraiNavigationBarThemeDataImplFromJson( json['indicatorShape'] as Map), labelTextStyle: json['labelTextStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['labelTextStyle'] as Map), + : MiraiTextStyle.fromJson(json['labelTextStyle']), iconTheme: json['iconTheme'] == null ? null : MiraiIconThemeData.fromJson( diff --git a/packages/mirai/lib/src/parsers/mirai_tab_bar/mirai_tab_bar.g.dart b/packages/mirai/lib/src/parsers/mirai_tab_bar/mirai_tab_bar.g.dart index 2bb48464..95429789 100644 --- a/packages/mirai/lib/src/parsers/mirai_tab_bar/mirai_tab_bar.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_tab_bar/mirai_tab_bar.g.dart @@ -29,7 +29,7 @@ _$MiraiTabBarImpl _$$MiraiTabBarImplFromJson(Map json) => labelColor: json['labelColor'] as String?, labelStyle: json['labelStyle'] == null ? null - : MiraiTextStyle.fromJson(json['labelStyle'] as Map), + : MiraiTextStyle.fromJson(json['labelStyle']), labelPadding: json['labelPadding'] == null ? null : MiraiEdgeInsets.fromJson( @@ -37,8 +37,7 @@ _$MiraiTabBarImpl _$$MiraiTabBarImplFromJson(Map json) => unselectedLabelColor: json['unselectedLabelColor'] as String?, unselectedLabelStyle: json['unselectedLabelStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['unselectedLabelStyle'] as Map), + : MiraiTextStyle.fromJson(json['unselectedLabelStyle']), dragStartBehavior: $enumDecodeNullable( _$DragStartBehaviorEnumMap, json['dragStartBehavior']) ?? DragStartBehavior.start, diff --git a/packages/mirai/lib/src/parsers/mirai_tab_bar_theme_data/mirai_tab_bar_theme_data.g.dart b/packages/mirai/lib/src/parsers/mirai_tab_bar_theme_data/mirai_tab_bar_theme_data.g.dart index acf15809..e9a2c6ff 100644 --- a/packages/mirai/lib/src/parsers/mirai_tab_bar_theme_data/mirai_tab_bar_theme_data.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_tab_bar_theme_data/mirai_tab_bar_theme_data.g.dart @@ -24,12 +24,11 @@ _$MiraiTabBarThemeDataImpl _$$MiraiTabBarThemeDataImplFromJson( json['labelPadding'] as Map), labelStyle: json['labelStyle'] == null ? null - : MiraiTextStyle.fromJson(json['labelStyle'] as Map), + : MiraiTextStyle.fromJson(json['labelStyle']), unselectedLabelColor: json['unselectedLabelColor'] as String?, unselectedLabelStyle: json['unselectedLabelStyle'] == null ? null - : MiraiTextStyle.fromJson( - json['unselectedLabelStyle'] as Map), + : MiraiTextStyle.fromJson(json['unselectedLabelStyle']), overlayColor: json['overlayColor'] as String?, ); diff --git a/packages/mirai/lib/src/parsers/mirai_text/mirai_text.g.dart b/packages/mirai/lib/src/parsers/mirai_text/mirai_text.g.dart index e12d4ec7..ab3c2d8e 100644 --- a/packages/mirai/lib/src/parsers/mirai_text/mirai_text.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_text/mirai_text.g.dart @@ -13,9 +13,8 @@ _$MiraiTextImpl _$$MiraiTextImplFromJson(Map json) => ?.map((e) => MiraiTextSpan.fromJson(e as Map)) .toList() ?? const [], - style: json['style'] == null - ? null - : MiraiTextStyle.fromJson(json['style'] as Map), + style: + json['style'] == null ? null : MiraiTextStyle.fromJson(json['style']), textAlign: $enumDecodeNullable(_$TextAlignEnumMap, json['textAlign']), textDirection: $enumDecodeNullable(_$TextDirectionEnumMap, json['textDirection']), @@ -74,9 +73,8 @@ const _$TextWidthBasisEnumMap = { _$MiraiTextSpanImpl _$$MiraiTextSpanImplFromJson(Map json) => _$MiraiTextSpanImpl( data: json['data'] as String?, - style: json['style'] == null - ? null - : MiraiTextStyle.fromJson(json['style'] as Map), + style: + json['style'] == null ? null : MiraiTextStyle.fromJson(json['style']), onTap: json['onTap'] as Map?, ); diff --git a/packages/mirai/lib/src/parsers/mirai_text_field/mirai_text_field.g.dart b/packages/mirai/lib/src/parsers/mirai_text_field/mirai_text_field.g.dart index 7812ef42..16a08147 100644 --- a/packages/mirai/lib/src/parsers/mirai_text_field/mirai_text_field.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_text_field/mirai_text_field.g.dart @@ -20,9 +20,8 @@ _$MiraiTextFieldImpl _$$MiraiTextFieldImplFromJson(Map json) => textCapitalization: $enumDecodeNullable( _$TextCapitalizationEnumMap, json['textCapitalization']) ?? TextCapitalization.none, - style: json['style'] == null - ? null - : MiraiTextStyle.fromJson(json['style'] as Map), + style: + json['style'] == null ? null : MiraiTextStyle.fromJson(json['style']), textAlign: $enumDecodeNullable(_$TextAlignEnumMap, json['textAlign']) ?? TextAlign.start, textAlignVertical: $enumDecodeNullable( diff --git a/packages/mirai/lib/src/parsers/mirai_text_form_field/mirai_text_form_field.g.dart b/packages/mirai/lib/src/parsers/mirai_text_form_field/mirai_text_form_field.g.dart index 77d45108..7afac555 100644 --- a/packages/mirai/lib/src/parsers/mirai_text_form_field/mirai_text_form_field.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_text_form_field/mirai_text_form_field.g.dart @@ -23,9 +23,8 @@ _$MiraiTextFormFieldImpl _$$MiraiTextFormFieldImplFromJson( textCapitalization: $enumDecodeNullable( _$TextCapitalizationEnumMap, json['textCapitalization']) ?? TextCapitalization.none, - style: json['style'] == null - ? null - : MiraiTextStyle.fromJson(json['style'] as Map), + style: + json['style'] == null ? null : MiraiTextStyle.fromJson(json['style']), textAlign: $enumDecodeNullable(_$TextAlignEnumMap, json['textAlign']) ?? TextAlign.start, textAlignVertical: $enumDecodeNullable( diff --git a/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.dart b/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.dart index 62e0d3f0..a4716023 100644 --- a/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.dart +++ b/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.dart @@ -12,6 +12,7 @@ class MiraiTextStyle with _$MiraiTextStyle { @Default(true) bool inherit, String? color, String? backgroundColor, + String? styleFromTheme, double? fontSize, MiraiFontWeight? fontWeight, FontStyle? fontStyle, @@ -23,12 +24,56 @@ class MiraiTextStyle with _$MiraiTextStyle { double? height, }) = _MiraiTextStyle; - factory MiraiTextStyle.fromJson(Map json) => - _$MiraiTextStyleFromJson(json); + factory MiraiTextStyle.fromJson(dynamic json) => _fromJson(json); + + static MiraiTextStyle _fromJson(dynamic json) { + if (json is String) { + return _$MiraiTextStyleFromJson({"styleFromTheme": json}); + } else if (json is Map) { + return _$MiraiTextStyleFromJson(json); + } + + return _$MiraiTextStyleFromJson({}); + } } extension MiraiTextStyleParser on MiraiTextStyle { TextStyle? parse(BuildContext context) { + if (styleFromTheme != null) { + switch (styleFromTheme) { + case 'displayLarge': + return Theme.of(context).textTheme.displayLarge; + case 'displayMedium': + return Theme.of(context).textTheme.displayMedium; + case 'displaySmall': + return Theme.of(context).textTheme.displaySmall; + case 'headlineLarge': + return Theme.of(context).textTheme.headlineLarge; + case 'headlineMedium': + return Theme.of(context).textTheme.headlineMedium; + case 'headlineSmall': + return Theme.of(context).textTheme.headlineSmall; + case 'titleLarge': + return Theme.of(context).textTheme.titleLarge; + case 'titleMedium': + return Theme.of(context).textTheme.titleMedium; + case 'titleSmall': + return Theme.of(context).textTheme.titleSmall; + case 'bodyLarge': + return Theme.of(context).textTheme.bodyLarge; + case 'bodyMedium': + return Theme.of(context).textTheme.bodyMedium; + case 'bodySmall': + return Theme.of(context).textTheme.bodySmall; + case 'labelLarge': + return Theme.of(context).textTheme.labelLarge; + case 'labelMedium': + return Theme.of(context).textTheme.labelMedium; + case 'labelSmall': + return Theme.of(context).textTheme.labelSmall; + } + } + return TextStyle( inherit: inherit, color: color?.toColor(context), diff --git a/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.freezed.dart b/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.freezed.dart index eb871750..8cfc8dcc 100644 --- a/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.freezed.dart +++ b/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.freezed.dart @@ -23,6 +23,7 @@ mixin _$MiraiTextStyle { bool get inherit => throw _privateConstructorUsedError; String? get color => throw _privateConstructorUsedError; String? get backgroundColor => throw _privateConstructorUsedError; + String? get styleFromTheme => throw _privateConstructorUsedError; double? get fontSize => throw _privateConstructorUsedError; MiraiFontWeight? get fontWeight => throw _privateConstructorUsedError; FontStyle? get fontStyle => throw _privateConstructorUsedError; @@ -49,6 +50,7 @@ abstract class $MiraiTextStyleCopyWith<$Res> { {bool inherit, String? color, String? backgroundColor, + String? styleFromTheme, double? fontSize, MiraiFontWeight? fontWeight, FontStyle? fontStyle, @@ -76,6 +78,7 @@ class _$MiraiTextStyleCopyWithImpl<$Res, $Val extends MiraiTextStyle> Object? inherit = null, Object? color = freezed, Object? backgroundColor = freezed, + Object? styleFromTheme = freezed, Object? fontSize = freezed, Object? fontWeight = freezed, Object? fontStyle = freezed, @@ -99,6 +102,10 @@ class _$MiraiTextStyleCopyWithImpl<$Res, $Val extends MiraiTextStyle> ? _value.backgroundColor : backgroundColor // ignore: cast_nullable_to_non_nullable as String?, + styleFromTheme: freezed == styleFromTheme + ? _value.styleFromTheme + : styleFromTheme // ignore: cast_nullable_to_non_nullable + as String?, fontSize: freezed == fontSize ? _value.fontSize : fontSize // ignore: cast_nullable_to_non_nullable @@ -151,6 +158,7 @@ abstract class _$$MiraiTextStyleImplCopyWith<$Res> {bool inherit, String? color, String? backgroundColor, + String? styleFromTheme, double? fontSize, MiraiFontWeight? fontWeight, FontStyle? fontStyle, @@ -176,6 +184,7 @@ class __$$MiraiTextStyleImplCopyWithImpl<$Res> Object? inherit = null, Object? color = freezed, Object? backgroundColor = freezed, + Object? styleFromTheme = freezed, Object? fontSize = freezed, Object? fontWeight = freezed, Object? fontStyle = freezed, @@ -199,6 +208,10 @@ class __$$MiraiTextStyleImplCopyWithImpl<$Res> ? _value.backgroundColor : backgroundColor // ignore: cast_nullable_to_non_nullable as String?, + styleFromTheme: freezed == styleFromTheme + ? _value.styleFromTheme + : styleFromTheme // ignore: cast_nullable_to_non_nullable + as String?, fontSize: freezed == fontSize ? _value.fontSize : fontSize // ignore: cast_nullable_to_non_nullable @@ -246,6 +259,7 @@ class _$MiraiTextStyleImpl implements _MiraiTextStyle { {this.inherit = true, this.color, this.backgroundColor, + this.styleFromTheme, this.fontSize, this.fontWeight, this.fontStyle, @@ -268,6 +282,8 @@ class _$MiraiTextStyleImpl implements _MiraiTextStyle { @override final String? backgroundColor; @override + final String? styleFromTheme; + @override final double? fontSize; @override final MiraiFontWeight? fontWeight; @@ -297,7 +313,7 @@ class _$MiraiTextStyleImpl implements _MiraiTextStyle { @override String toString() { - return 'MiraiTextStyle(inherit: $inherit, color: $color, backgroundColor: $backgroundColor, fontSize: $fontSize, fontWeight: $fontWeight, fontStyle: $fontStyle, fontFamily: $fontFamily, fontFamilyFallback: $fontFamilyFallback, letterSpacing: $letterSpacing, wordSpacing: $wordSpacing, textBaseline: $textBaseline, height: $height)'; + return 'MiraiTextStyle(inherit: $inherit, color: $color, backgroundColor: $backgroundColor, styleFromTheme: $styleFromTheme, fontSize: $fontSize, fontWeight: $fontWeight, fontStyle: $fontStyle, fontFamily: $fontFamily, fontFamilyFallback: $fontFamilyFallback, letterSpacing: $letterSpacing, wordSpacing: $wordSpacing, textBaseline: $textBaseline, height: $height)'; } @override @@ -309,6 +325,8 @@ class _$MiraiTextStyleImpl implements _MiraiTextStyle { (identical(other.color, color) || other.color == color) && (identical(other.backgroundColor, backgroundColor) || other.backgroundColor == backgroundColor) && + (identical(other.styleFromTheme, styleFromTheme) || + other.styleFromTheme == styleFromTheme) && (identical(other.fontSize, fontSize) || other.fontSize == fontSize) && (identical(other.fontWeight, fontWeight) || @@ -335,6 +353,7 @@ class _$MiraiTextStyleImpl implements _MiraiTextStyle { inherit, color, backgroundColor, + styleFromTheme, fontSize, fontWeight, fontStyle, @@ -365,6 +384,7 @@ abstract class _MiraiTextStyle implements MiraiTextStyle { {final bool inherit, final String? color, final String? backgroundColor, + final String? styleFromTheme, final double? fontSize, final MiraiFontWeight? fontWeight, final FontStyle? fontStyle, @@ -385,6 +405,8 @@ abstract class _MiraiTextStyle implements MiraiTextStyle { @override String? get backgroundColor; @override + String? get styleFromTheme; + @override double? get fontSize; @override MiraiFontWeight? get fontWeight; diff --git a/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.g.dart b/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.g.dart index f67e62ea..19d0d60b 100644 --- a/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.g.dart +++ b/packages/mirai/lib/src/parsers/mirai_text_style/mirai_text_style.g.dart @@ -11,6 +11,7 @@ _$MiraiTextStyleImpl _$$MiraiTextStyleImplFromJson(Map json) => inherit: json['inherit'] as bool? ?? true, color: json['color'] as String?, backgroundColor: json['backgroundColor'] as String?, + styleFromTheme: json['styleFromTheme'] as String?, fontSize: (json['fontSize'] as num?)?.toDouble(), fontWeight: $enumDecodeNullable(_$MiraiFontWeightEnumMap, json['fontWeight']), @@ -32,6 +33,7 @@ Map _$$MiraiTextStyleImplToJson( 'inherit': instance.inherit, 'color': instance.color, 'backgroundColor': instance.backgroundColor, + 'styleFromTheme': instance.styleFromTheme, 'fontSize': instance.fontSize, 'fontWeight': _$MiraiFontWeightEnumMap[instance.fontWeight], 'fontStyle': _$FontStyleEnumMap[instance.fontStyle], From 6415ed7149592326c9c02425eb3e788eca9b730d Mon Sep 17 00:00:00 2001 From: Aasim Khan Date: Thu, 29 Feb 2024 18:33:01 +0400 Subject: [PATCH 2/5] fix: Cocoa pods version upgraded and fixed pubspec --- examples/mirai_gallery/macos/Podfile.lock | 2 +- .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- examples/mirai_gallery/pubspec.lock | 32 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/mirai_gallery/macos/Podfile.lock b/examples/mirai_gallery/macos/Podfile.lock index 79862f06..9133c7d7 100644 --- a/examples/mirai_gallery/macos/Podfile.lock +++ b/examples/mirai_gallery/macos/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.3 \ No newline at end of file diff --git a/examples/mirai_gallery/macos/Runner.xcodeproj/project.pbxproj b/examples/mirai_gallery/macos/Runner.xcodeproj/project.pbxproj index 39f233b6..110378e8 100644 --- a/examples/mirai_gallery/macos/Runner.xcodeproj/project.pbxproj +++ b/examples/mirai_gallery/macos/Runner.xcodeproj/project.pbxproj @@ -258,7 +258,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { diff --git a/examples/mirai_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/examples/mirai_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index ca25b4d5..8d1ec463 100644 --- a/examples/mirai_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/examples/mirai_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 29 Feb 2024 18:39:32 +0400 Subject: [PATCH 3/5] fix: Updated pubspec in mirai/mirai_gallery --- examples/mirai_gallery/pubspec.lock | 90 ++++++++++++++++++----------- 1 file changed, 57 insertions(+), 33 deletions(-) diff --git a/examples/mirai_gallery/pubspec.lock b/examples/mirai_gallery/pubspec.lock index f80e02f5..8f5cf719 100644 --- a/examples/mirai_gallery/pubspec.lock +++ b/examples/mirai_gallery/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: bloc - sha256: f53a110e3b48dcd78136c10daa5d51512443cea5e1348c9d80a320095fa2db9e + sha256: "3820f15f502372d979121de1f6b97bfcf1630ebff8fe1d52fb2b0bfa49be5b49" url: "https://pub.dev" source: hosted - version: "8.1.3" + version: "8.1.2" boolean_selector: dependency: transitive description: @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: built_value - sha256: fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e + sha256: a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6 url: "https://pub.dev" source: hosted - version: "8.9.1" + version: "8.9.0" characters: dependency: transitive description: @@ -181,18 +181,18 @@ packages: dependency: transitive description: name: dart_style - sha256: "25b4624c231844a7a70a3817a729a6190a751ef1c07ded256e126a3b72261444" + sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.3.4" dio: dependency: transitive description: name: dio - sha256: "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8" + sha256: "797e1e341c3dd2f69f2dad42564a6feff3bfb87187d05abb93b9609e6f1645c3" url: "https://pub.dev" source: hosted - version: "5.4.1" + version: "5.4.0" fake_async: dependency: transitive description: @@ -226,10 +226,10 @@ packages: dependency: "direct main" description: name: flutter_bloc - sha256: "87325da1ac757fcc4813e6b34ed5dd61169973871fdf181d6c2109dd6935ece1" + sha256: e74efb89ee6945bcbce74a5b3a5a3376b088e5f21f55c263fc38cbdc6237faae url: "https://pub.dev" source: hosted - version: "8.1.4" + version: "8.1.3" flutter_lints: dependency: "direct dev" description: @@ -311,10 +311,10 @@ packages: dependency: transitive description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: "4186c61b32f99e60f011f7160e32c89a758ae9b1d0c6d28e2c02ef0382300e2b" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.0" json_annotation: dependency: "direct main" description: @@ -331,6 +331,30 @@ packages: url: "https://pub.dev" source: hosted version: "6.7.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -359,26 +383,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" mime: dependency: transitive description: @@ -428,10 +452,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" plugin_platform_interface: dependency: transitive description: @@ -452,10 +476,10 @@ packages: dependency: transitive description: name: provider - sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.1" pub_semver: dependency: transitive description: @@ -589,22 +613,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - watcher: + vm_service: dependency: transitive description: - name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "1.1.0" - web: + version: "13.0.0" + watcher: dependency: transitive description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "1.1.0" web_socket_channel: dependency: transitive description: @@ -617,10 +641,10 @@ packages: dependency: transitive description: name: webview_flutter - sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932" + sha256: d81b68e88cc353e546afb93fb38958e3717282c5ac6e5d3be4a4aef9fc3c1413 url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "4.5.0" webview_flutter_android: dependency: transitive description: @@ -655,4 +679,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.2.3 <4.0.0" - flutter: ">=3.16.6" + flutter: ">=3.16.6" \ No newline at end of file From 4e880f9e6874270773878f4a0c17a013c54c8085 Mon Sep 17 00:00:00 2001 From: Aasim Khan Date: Thu, 29 Feb 2024 18:46:06 +0400 Subject: [PATCH 4/5] fix: Updated podfile in mirai_gallery/macos and pubspec in example --- examples/mirai_gallery/macos/Podfile.lock | 2 +- examples/mirai_gallery/pubspec.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/mirai_gallery/macos/Podfile.lock b/examples/mirai_gallery/macos/Podfile.lock index 9133c7d7..1f6779f9 100644 --- a/examples/mirai_gallery/macos/Podfile.lock +++ b/examples/mirai_gallery/macos/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 -COCOAPODS: 1.14.3 \ No newline at end of file +COCOAPODS: 1.14.3 diff --git a/examples/mirai_gallery/pubspec.lock b/examples/mirai_gallery/pubspec.lock index 8f5cf719..d1e81e2c 100644 --- a/examples/mirai_gallery/pubspec.lock +++ b/examples/mirai_gallery/pubspec.lock @@ -679,4 +679,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.2.3 <4.0.0" - flutter: ">=3.16.6" \ No newline at end of file + flutter: ">=3.16.6" From 7a77957b72550636f966bd7aef5245e288425e44 Mon Sep 17 00:00:00 2001 From: Aasim Khan Date: Thu, 29 Feb 2024 18:55:24 +0400 Subject: [PATCH 5/5] fix: Run melos build in packages/mirai --- .../mirai_dialog_action/mirai_dialog_action.g.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mirai/lib/src/action_parsers/mirai_dialog_action/mirai_dialog_action.g.dart b/packages/mirai/lib/src/action_parsers/mirai_dialog_action/mirai_dialog_action.g.dart index d67fc766..949d3f10 100644 --- a/packages/mirai/lib/src/action_parsers/mirai_dialog_action/mirai_dialog_action.g.dart +++ b/packages/mirai/lib/src/action_parsers/mirai_dialog_action/mirai_dialog_action.g.dart @@ -40,4 +40,5 @@ Map _$$MiraiDialogActionImplToJson( const _$TraversalEdgeBehaviorEnumMap = { TraversalEdgeBehavior.closedLoop: 'closedLoop', TraversalEdgeBehavior.leaveFlutterView: 'leaveFlutterView', + TraversalEdgeBehavior.parentScope: 'parentScope', };