Skip to content

fix(tab-view): onGenerateRoute was ignored #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JT501 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix(tab-view): onGenerateRoute was ignored #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1529018
fix(tab-view): onGenerateRoute is ignored
JT501 Oct 30, 2021
3877c78
feat: Support Flutter 3
JT501 Aug 9, 2022
24dd244
Update neumorphic-card.dart
JT501 Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.0"
version: "2.8.2"
boolean_selector:
dependency: transitive
description:
Expand All @@ -21,14 +21,14 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.1"
clock:
dependency: transitive
description:
Expand All @@ -42,14 +42,14 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -66,21 +66,28 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10"
version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.7.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
persistent_bottom_nav_bar:
dependency: "direct dev"
description:
Expand All @@ -99,7 +106,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -134,20 +141,13 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.19"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "0.4.9"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.2"
sdks:
dart: ">=2.12.0 <3.0.0"
dart: ">=2.17.0-0 <3.0.0"
2 changes: 1 addition & 1 deletion lib/animations/animations.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class _OffsetAnimationState extends State<OffsetAnimation>
}

_hideAnimation() {
WidgetsBinding.instance!.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (_hideNavigationBar!) {
_navBarHideAnimationController.forward();
} else {
Expand Down
4 changes: 2 additions & 2 deletions lib/models/tab-view.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ class _CustomTabViewState extends State<CustomTabView> {
} else if (widget.routeAndNavigatorSettings!.routes != null) {
routeBuilder = widget.routeAndNavigatorSettings!.routes![name!];
}
if (widget.routeAndNavigatorSettings!.onGenerateRoute != null)
return widget.routeAndNavigatorSettings!.onGenerateRoute!(settings);
if (routeBuilder != null) {
return PageRouteBuilder(
pageBuilder: (context, animation, secondaryAnimation) =>
Expand All @@ -74,8 +76,6 @@ class _CustomTabViewState extends State<CustomTabView> {
'/9f580fc5-c252-45d0-af25-9429992db112'),
);
}
if (widget.routeAndNavigatorSettings!.onGenerateRoute != null)
return widget.routeAndNavigatorSettings!.onGenerateRoute!(settings);
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/nav-bar-styles/style-11-bottom-nav-bar.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class _BottomNavStyle11State extends State<BottomNavStyle11>
.animate(_animationControllerList[i]));
}

WidgetsBinding.instance!.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
_animationControllerList[_selectedIndex!].forward();
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/nav-bar-styles/style-12-bottom-nav-bar.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class _BottomNavStyle12State extends State<BottomNavStyle12>
.animate(_animationControllerList[i]));
}

WidgetsBinding.instance!.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
_animationControllerList[_selectedIndex!].forward();
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/nav-bar-styles/style-13-bottom-nav-bar.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class _BottomNavStyle13State extends State<BottomNavStyle13>
.animate(_animationControllerList[i]));
}

WidgetsBinding.instance!.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
_animationControllerList[_selectedIndex!].forward();
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/nav-bar-styles/style-14-bottom-nav-bar.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class _BottomNavStyle14State extends State<BottomNavStyle14>
.animate(_animationControllerList[i]));
}

WidgetsBinding.instance!.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
_animationControllerList[_selectedIndex!].forward();
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/nav-bar-styles/style-6-bottom-nav-bar.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class _BottomNavStyle6State extends State<BottomNavStyle6>
.animate(_animationControllerList[i]));
}

WidgetsBinding.instance!.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
_animationControllerList[_selectedIndex!].forward();
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/nav-bar-styles/style-8-bottom-nav-bar.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class _BottomNavStyle8State extends State<BottomNavStyle8>
.animate(_animationControllerList[i]));
}

WidgetsBinding.instance!.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
_animationControllerList[_selectedIndex!].forward();
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/neumorphic-package-by-serge-software/neumorphic-card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class NeumorphicContainer extends StatelessWidget {

@override
Widget build(BuildContext context) {
final color = decoration.color ?? Theme.of(context).backgroundColor;
final color = decoration.color ?? Theme.of(context).scaffoldBackgroundColor;
final emboss = curveType == CurveType.emboss;

Color colorValue = color;
Expand Down
2 changes: 1 addition & 1 deletion lib/persistent-tab-view.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ class _PersistentTabViewState extends State<PersistentTabView> {
}
});
if (widget.selectedTabScreenContext != null) {
WidgetsBinding.instance!.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
widget.selectedTabScreenContext!(_contextList[_controller!.index]);
});
}
Expand Down
38 changes: 19 additions & 19 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.0"
version: "2.8.2"
boolean_selector:
dependency: transitive
description:
Expand All @@ -21,14 +21,14 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.1"
clock:
dependency: transitive
description:
Expand All @@ -42,14 +42,14 @@ packages:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0"
version: "1.16.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -66,21 +66,28 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10"
version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.7.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -92,7 +99,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.2"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -127,20 +134,13 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.19"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "0.4.9"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.2"
sdks:
dart: ">=2.12.0 <3.0.0"
dart: ">=2.17.0-0 <3.0.0"