From b821a6129da171243dd87d00cce4982c6ca90823 Mon Sep 17 00:00:00 2001 From: Eimen2018 Date: Thu, 7 Aug 2025 02:30:17 +0400 Subject: [PATCH] fix: update stacked_generator version and adjust imports in generated files --- example/lib/app/app.locator.dart | 8 +- example/lib/app/app.router.dart | 72 ++++++- example/pubspec.yaml | 2 +- example/test/helpers/test_helpers.mocks.dart | 200 ++++++++++++------- pubspec.yaml | 2 +- 5 files changed, 202 insertions(+), 82 deletions(-) diff --git a/example/lib/app/app.locator.dart b/example/lib/app/app.locator.dart index 162263a..294a187 100644 --- a/example/lib/app/app.locator.dart +++ b/example/lib/app/app.locator.dart @@ -6,15 +6,17 @@ // ignore_for_file: public_member_api_docs, implementation_imports, depend_on_referenced_packages -import 'package:stacked_core/stacked_core.dart'; import 'package:stacked_services/src/bottom_sheet/bottom_sheet_service.dart'; import 'package:stacked_services/src/dialog/dialog_service.dart'; import 'package:stacked_services/src/navigation/navigation_service.dart'; +import 'package:stacked_shared/stacked_shared.dart'; final locator = StackedLocator.instance; -Future setupLocator( - {String? environment, EnvironmentFilter? environmentFilter}) async { +Future setupLocator({ + String? environment, + EnvironmentFilter? environmentFilter, +}) async { // Register environments locator.registerEnvironment( environment: environment, environmentFilter: environmentFilter); diff --git a/example/lib/app/app.router.dart b/example/lib/app/app.router.dart index 3f5d753..463b8db 100644 --- a/example/lib/app/app.router.dart +++ b/example/lib/app/app.router.dart @@ -1,10 +1,11 @@ // GENERATED CODE - DO NOT MODIFY BY HAND // ************************************************************************** -// StackedRouterGenerator +// StackedNavigatorGenerator // ************************************************************************** // ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:flutter/material.dart' as _i6; import 'package:flutter/material.dart'; import 'package:stacked/stacked.dart' as _i1; import 'package:stacked_hooks_example/ui/views/home/home_view.dart' as _i3; @@ -14,7 +15,7 @@ import 'package:stacked_hooks_example/ui/views/with_stacked_hook/with_stacked_ho as _i4; import 'package:stacked_hooks_example/ui/views/without_stacked_hook/without_stacked_hook_view.dart' as _i5; -import 'package:stacked_services/stacked_services.dart' as _i6; +import 'package:stacked_services/stacked_services.dart' as _i7; class Routes { static const startupView = '/startup-view'; @@ -55,25 +56,25 @@ class StackedRouter extends _i1.RouterBase { final _pagesMap = { _i2.StartupView: (data) { - return MaterialPageRoute( + return _i6.MaterialPageRoute( builder: (context) => const _i2.StartupView(), settings: data, ); }, _i3.HomeView: (data) { - return MaterialPageRoute( + return _i6.MaterialPageRoute( builder: (context) => const _i3.HomeView(), settings: data, ); }, _i4.WithStackedHookView: (data) { - return MaterialPageRoute( + return _i6.MaterialPageRoute( builder: (context) => const _i4.WithStackedHookView(), settings: data, ); }, _i5.WithoutStackedHookView: (data) { - return MaterialPageRoute( + return _i6.MaterialPageRoute( builder: (context) => const _i5.WithoutStackedHookView(), settings: data, ); @@ -82,11 +83,12 @@ class StackedRouter extends _i1.RouterBase { @override List<_i1.RouteDef> get routes => _routes; + @override Map get pagesMap => _pagesMap; } -extension NavigatorStateExtension on _i6.NavigationService { +extension NavigatorStateExtension on _i7.NavigationService { Future navigateToStartupView([ int? routerId, bool preventDuplicates = true, @@ -142,4 +144,60 @@ extension NavigatorStateExtension on _i6.NavigationService { parameters: parameters, transition: transition); } + + Future replaceWithStartupView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return replaceWith(Routes.startupView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } + + Future replaceWithHomeView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return replaceWith(Routes.homeView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } + + Future replaceWithWithStackedHookView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return replaceWith(Routes.withStackedHookView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } + + Future replaceWithWithoutStackedHookView([ + int? routerId, + bool preventDuplicates = true, + Map? parameters, + Widget Function(BuildContext, Animation, Animation, Widget)? + transition, + ]) async { + return replaceWith(Routes.withoutStackedHookView, + id: routerId, + preventDuplicates: preventDuplicates, + parameters: parameters, + transition: transition); + } } diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 9c56e6e..3ec42eb 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -51,7 +51,7 @@ dev_dependencies: flutter_lints: ^1.0.0 build_runner: ^2.2.0 - stacked_generator: ^0.8.1 + stacked_generator: ^1.6.1 mockito: ^5.1.0 # For information on the generic Dart part of this file, see the diff --git a/example/test/helpers/test_helpers.mocks.dart b/example/test/helpers/test_helpers.mocks.dart index cb11b44..97cfee4 100644 --- a/example/test/helpers/test_helpers.mocks.dart +++ b/example/test/helpers/test_helpers.mocks.dart @@ -1,19 +1,22 @@ -// Mocks generated by Mockito 5.3.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in stacked_hooks_example/test/helpers/test_helpers.dart. // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes -import 'dart:async' as _i4; -import 'dart:ui' as _i5; +import 'dart:async' as _i5; +import 'dart:ui' as _i6; -import 'package:flutter/material.dart' as _i3; +import 'package:flutter/material.dart' as _i4; import 'package:mockito/mockito.dart' as _i1; +import 'package:mockito/src/dummies.dart' as _i3; import 'package:stacked_services/stacked_services.dart' as _i2; // ignore_for_file: type=lint // 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 @@ -28,24 +31,39 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { @override String get previousRoute => (super.noSuchMethod( Invocation.getter(#previousRoute), - returnValue: '', - returnValueForMissingStub: '', + returnValue: _i3.dummyValue( + this, + Invocation.getter(#previousRoute), + ), + returnValueForMissingStub: _i3.dummyValue( + this, + Invocation.getter(#previousRoute), + ), ) as String); + @override String get currentRoute => (super.noSuchMethod( Invocation.getter(#currentRoute), - returnValue: '', - returnValueForMissingStub: '', + returnValue: _i3.dummyValue( + this, + Invocation.getter(#currentRoute), + ), + returnValueForMissingStub: _i3.dummyValue( + this, + Invocation.getter(#currentRoute), + ), ) as String); + @override - _i3.GlobalKey<_i3.NavigatorState>? nestedNavigationKey(int? index) => + _i4.GlobalKey<_i4.NavigatorState>? nestedNavigationKey(int? index) => (super.noSuchMethod( Invocation.method( #nestedNavigationKey, [index], ), returnValueForMissingStub: null, - ) as _i3.GlobalKey<_i3.NavigatorState>?); + ) as _i4.GlobalKey<_i4.NavigatorState>?); + @override void config({ bool? enableLog, @@ -72,15 +90,16 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { ), returnValueForMissingStub: null, ); + @override - _i4.Future? navigateWithTransition( - _i3.Widget? page, { + _i5.Future? navigateWithTransition( + _i4.Widget? page, { bool? opaque, String? transition = r'', Duration? duration, bool? popGesture, int? id, - _i3.Curve? curve, + _i4.Curve? curve, bool? fullscreenDialog = false, bool? preventDuplicates = true, _i2.Transition? transitionClass, @@ -106,16 +125,17 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); + @override - _i4.Future? replaceWithTransition( - _i3.Widget? page, { + _i5.Future? replaceWithTransition( + _i4.Widget? page, { bool? opaque, String? transition = r'', Duration? duration, bool? popGesture, int? id, - _i3.Curve? curve, + _i4.Curve? curve, bool? fullscreenDialog = false, bool? preventDuplicates = true, _i2.Transition? transitionClass, @@ -141,7 +161,8 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); + @override bool back({ dynamic result, @@ -159,9 +180,10 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { returnValue: false, returnValueForMissingStub: false, ) as bool); + @override void popUntil( - _i3.RoutePredicate? predicate, { + _i4.RoutePredicate? predicate, { int? id, }) => super.noSuchMethod( @@ -172,6 +194,7 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { ), returnValueForMissingStub: null, ); + @override void popRepeated(int? popTimes) => super.noSuchMethod( Invocation.method( @@ -180,14 +203,15 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { ), returnValueForMissingStub: null, ); + @override - _i4.Future? navigateTo( + _i5.Future? navigateTo( String? routeName, { dynamic arguments, int? id, bool? preventDuplicates = true, Map? parameters, - _i3.RouteTransitionsBuilder? transition, + _i4.RouteTransitionsBuilder? transition, }) => (super.noSuchMethod( Invocation.method( @@ -202,14 +226,15 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); + @override - _i4.Future? navigateToView( - _i3.Widget? view, { + _i5.Future? navigateToView( + _i4.Widget? view, { dynamic arguments, int? id, bool? opaque, - _i3.Curve? curve, + _i4.Curve? curve, Duration? duration, bool? fullscreenDialog = false, bool? popGesture, @@ -235,15 +260,16 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); + @override - _i4.Future? replaceWith( + _i5.Future? replaceWith( String? routeName, { dynamic arguments, int? id, bool? preventDuplicates = true, Map? parameters, - _i3.RouteTransitionsBuilder? transition, + _i4.RouteTransitionsBuilder? transition, }) => (super.noSuchMethod( Invocation.method( @@ -258,9 +284,10 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); + @override - _i4.Future? clearStackAndShow( + _i5.Future? clearStackAndShow( String? routeName, { dynamic arguments, int? id, @@ -277,10 +304,11 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); + @override - _i4.Future? clearStackAndShowView( - _i3.Widget? view, { + _i5.Future? clearStackAndShowView( + _i4.Widget? view, { dynamic arguments, int? id, }) => @@ -294,9 +322,10 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); + @override - _i4.Future? clearTillFirstAndShow( + _i5.Future? clearTillFirstAndShow( String? routeName, { dynamic arguments, int? id, @@ -315,10 +344,11 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); + @override - _i4.Future? clearTillFirstAndShowView( - _i3.Widget? view, { + _i5.Future? clearTillFirstAndShowView( + _i4.Widget? view, { dynamic arguments, int? id, }) => @@ -332,11 +362,12 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); + @override - _i4.Future? pushNamedAndRemoveUntil( + _i5.Future? pushNamedAndRemoveUntil( String? routeName, { - _i3.RoutePredicate? predicate, + _i4.RoutePredicate? predicate, dynamic arguments, int? id, }) => @@ -351,7 +382,7 @@ class MockNavigationService extends _i1.Mock implements _i2.NavigationService { }, ), returnValueForMissingStub: null, - ) as _i4.Future?); + ) as _i5.Future?); } /// A class which mocks [BottomSheetService]. @@ -368,8 +399,9 @@ class MockBottomSheetService extends _i1.Mock ), returnValueForMissingStub: null, ); + @override - _i4.Future<_i2.SheetResponse?> showBottomSheet({ + _i5.Future<_i2.SheetResponse?> showBottomSheet({ required String? title, String? description, String? confirmButtonTitle = r'Ok', @@ -381,6 +413,7 @@ class MockBottomSheetService extends _i1.Mock Duration? enterBottomSheetDuration, bool? ignoreSafeArea, bool? useRootNavigator = false, + double? elevation = 1.0, }) => (super.noSuchMethod( Invocation.method( @@ -398,14 +431,16 @@ class MockBottomSheetService extends _i1.Mock #enterBottomSheetDuration: enterBottomSheetDuration, #ignoreSafeArea: ignoreSafeArea, #useRootNavigator: useRootNavigator, + #elevation: elevation, }, ), - returnValue: _i4.Future<_i2.SheetResponse?>.value(), + returnValue: _i5.Future<_i2.SheetResponse?>.value(), returnValueForMissingStub: - _i4.Future<_i2.SheetResponse?>.value(), - ) as _i4.Future<_i2.SheetResponse?>); + _i5.Future<_i2.SheetResponse?>.value(), + ) as _i5.Future<_i2.SheetResponse?>); + @override - _i4.Future<_i2.SheetResponse?> showCustomSheet({ + _i5.Future<_i2.SheetResponse?> showCustomSheet({ dynamic variant, String? title, String? description, @@ -418,7 +453,8 @@ class MockBottomSheetService extends _i1.Mock bool? showIconInAdditionalButton = false, String? additionalButtonTitle, bool? takesInput = false, - _i5.Color? barrierColor = const _i5.Color(2315255808), + _i6.Color? barrierColor = const _i6.Color(2315255808), + double? elevation = 1.0, bool? barrierDismissible = true, bool? isScrollControlled = false, String? barrierLabel = r'', @@ -448,6 +484,7 @@ class MockBottomSheetService extends _i1.Mock #additionalButtonTitle: additionalButtonTitle, #takesInput: takesInput, #barrierColor: barrierColor, + #elevation: elevation, #barrierDismissible: barrierDismissible, #isScrollControlled: isScrollControlled, #barrierLabel: barrierLabel, @@ -460,9 +497,10 @@ class MockBottomSheetService extends _i1.Mock #useRootNavigator: useRootNavigator, }, ), - returnValue: _i4.Future<_i2.SheetResponse?>.value(), - returnValueForMissingStub: _i4.Future<_i2.SheetResponse?>.value(), - ) as _i4.Future<_i2.SheetResponse?>); + returnValue: _i5.Future<_i2.SheetResponse?>.value(), + returnValueForMissingStub: _i5.Future<_i2.SheetResponse?>.value(), + ) as _i5.Future<_i2.SheetResponse?>); + @override void completeSheet(_i2.SheetResponse? response) => super.noSuchMethod( @@ -488,15 +526,15 @@ class MockDialogService extends _i1.Mock implements _i2.DialogService { ), returnValueForMissingStub: null, ); + @override void registerCustomDialogBuilder({ required dynamic variant, - required _i3.Widget Function( - _i3.BuildContext, + required _i4.Widget Function( + _i4.BuildContext, _i2.DialogRequest, dynamic Function(_i2.DialogResponse), - )? - builder, + )? builder, }) => super.noSuchMethod( Invocation.method( @@ -509,15 +547,18 @@ class MockDialogService extends _i1.Mock implements _i2.DialogService { ), returnValueForMissingStub: null, ); + @override - _i4.Future<_i2.DialogResponse?> showDialog({ + _i5.Future<_i2.DialogResponse?> showDialog({ String? title, String? description, String? cancelTitle, - _i5.Color? cancelTitleColor, + _i6.Color? cancelTitleColor, String? buttonTitle = r'Ok', - _i5.Color? buttonTitleColor, + _i6.Color? buttonTitleColor, bool? barrierDismissible = false, + _i4.RouteSettings? routeSettings, + _i4.GlobalKey<_i4.NavigatorState>? navigatorKey, _i2.DialogPlatform? dialogPlatform, }) => (super.noSuchMethod( @@ -532,15 +573,18 @@ class MockDialogService extends _i1.Mock implements _i2.DialogService { #buttonTitle: buttonTitle, #buttonTitleColor: buttonTitleColor, #barrierDismissible: barrierDismissible, + #routeSettings: routeSettings, + #navigatorKey: navigatorKey, #dialogPlatform: dialogPlatform, }, ), - returnValue: _i4.Future<_i2.DialogResponse?>.value(), + returnValue: _i5.Future<_i2.DialogResponse?>.value(), returnValueForMissingStub: - _i4.Future<_i2.DialogResponse?>.value(), - ) as _i4.Future<_i2.DialogResponse?>); + _i5.Future<_i2.DialogResponse?>.value(), + ) as _i5.Future<_i2.DialogResponse?>); + @override - _i4.Future<_i2.DialogResponse?> showCustomDialog({ + _i5.Future<_i2.DialogResponse?> showCustomDialog({ dynamic variant, String? title, String? description, @@ -553,9 +597,13 @@ class MockDialogService extends _i1.Mock implements _i2.DialogService { bool? showIconInAdditionalButton = false, String? additionalButtonTitle, bool? takesInput = false, - _i5.Color? barrierColor = const _i5.Color(2315255808), + _i6.Color? barrierColor = const _i6.Color(2315255808), bool? barrierDismissible = false, String? barrierLabel = r'', + bool? useSafeArea = true, + _i4.RouteSettings? routeSettings, + _i4.GlobalKey<_i4.NavigatorState>? navigatorKey, + _i4.RouteTransitionsBuilder? transitionBuilder, dynamic customData, R? data, }) => @@ -579,20 +627,28 @@ class MockDialogService extends _i1.Mock implements _i2.DialogService { #barrierColor: barrierColor, #barrierDismissible: barrierDismissible, #barrierLabel: barrierLabel, + #useSafeArea: useSafeArea, + #routeSettings: routeSettings, + #navigatorKey: navigatorKey, + #transitionBuilder: transitionBuilder, #customData: customData, #data: data, }, ), - returnValue: _i4.Future<_i2.DialogResponse?>.value(), - returnValueForMissingStub: _i4.Future<_i2.DialogResponse?>.value(), - ) as _i4.Future<_i2.DialogResponse?>); + returnValue: _i5.Future<_i2.DialogResponse?>.value(), + returnValueForMissingStub: _i5.Future<_i2.DialogResponse?>.value(), + ) as _i5.Future<_i2.DialogResponse?>); + @override - _i4.Future<_i2.DialogResponse?> showConfirmationDialog({ + _i5.Future<_i2.DialogResponse?> showConfirmationDialog({ String? title, String? description, String? cancelTitle = r'Cancel', + _i6.Color? cancelTitleColor, String? confirmationTitle = r'Ok', + _i6.Color? confirmationTitleColor, bool? barrierDismissible = false, + _i4.RouteSettings? routeSettings, _i2.DialogPlatform? dialogPlatform, }) => (super.noSuchMethod( @@ -603,15 +659,19 @@ class MockDialogService extends _i1.Mock implements _i2.DialogService { #title: title, #description: description, #cancelTitle: cancelTitle, + #cancelTitleColor: cancelTitleColor, #confirmationTitle: confirmationTitle, + #confirmationTitleColor: confirmationTitleColor, #barrierDismissible: barrierDismissible, + #routeSettings: routeSettings, #dialogPlatform: dialogPlatform, }, ), - returnValue: _i4.Future<_i2.DialogResponse?>.value(), + returnValue: _i5.Future<_i2.DialogResponse?>.value(), returnValueForMissingStub: - _i4.Future<_i2.DialogResponse?>.value(), - ) as _i4.Future<_i2.DialogResponse?>); + _i5.Future<_i2.DialogResponse?>.value(), + ) as _i5.Future<_i2.DialogResponse?>); + @override void completeDialog(_i2.DialogResponse? response) => super.noSuchMethod( diff --git a/pubspec.yaml b/pubspec.yaml index df0097b..1ae4ea1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,7 @@ dev_dependencies: # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter. -flutter: +# flutter: # To add assets to your package, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg