diff --git a/lib/ui/screens/home_menu/home_menu.dart b/lib/ui/screens/home_menu/home_menu.dart index 43410a5c..603b33b4 100644 --- a/lib/ui/screens/home_menu/home_menu.dart +++ b/lib/ui/screens/home_menu/home_menu.dart @@ -8,14 +8,18 @@ import 'package:wonders/ui/common/controls/locale_switcher.dart'; import 'package:wonders/ui/common/pop_navigator_underlay.dart'; import 'package:wonders/ui/screens/home_menu/about_dialog_content.dart'; -class HomeMenu extends StatelessWidget { +class HomeMenu extends StatefulWidget { const HomeMenu({Key? key, required this.data}) : super(key: key); final WonderData data; + @override + State createState() => _HomeMenuState(); +} + +class _HomeMenuState extends State { void _handleAboutPressed(BuildContext context) async { PackageInfo packageInfo = await PackageInfo.fromPlatform(); - // ignore: use_build_context_synchronously - if (!context.mounted) return; + if (!mounted) return; showAboutDialog( context: context, applicationName: $strings.appName, @@ -37,7 +41,7 @@ class HomeMenu extends StatelessWidget { void _handleCollectionPressed(BuildContext context) => context.push(ScreenPaths.collection('')); - void _handleTimelinePressed(BuildContext context) => context.push(ScreenPaths.timeline(data.type)); + void _handleTimelinePressed(BuildContext context) => context.push(ScreenPaths.timeline(widget.data.type)); void _handleWonderPressed(BuildContext context, WonderData data) => Navigator.pop(context, data.type); @@ -162,7 +166,7 @@ class HomeMenu extends StatelessWidget { } Widget _buildGridBtn(BuildContext context, WonderData btnData) { - bool isSelected = btnData == data; + bool isSelected = btnData == widget.data; return AspectRatio( aspectRatio: 1, child: Container( diff --git a/lib/ui/screens/wonder_events/widgets/_events_list.dart b/lib/ui/screens/wonder_events/widgets/_events_list.dart index c0d606d3..417b80c2 100644 --- a/lib/ui/screens/wonder_events/widgets/_events_list.dart +++ b/lib/ui/screens/wonder_events/widgets/_events_list.dart @@ -1,19 +1,17 @@ part of '../wonder_events.dart'; class _EventsList extends StatefulWidget { - const _EventsList( - {Key? key, - required this.data, - this.topHeight = 0, - this.blurOnScroll = false, - this.showTopGradient = true, - this.showBottomGradient = true}) - : super(key: key); + const _EventsList({ + Key? key, + required this.data, + this.topHeight = 0, + this.blurOnScroll = false, + this.showTopGradient = true, + }) : super(key: key); final WonderData data; final double topHeight; final bool blurOnScroll; final bool showTopGradient; - final bool showBottomGradient; @override State<_EventsList> createState() => _EventsListState(); @@ -82,14 +80,6 @@ class _EventsListState extends State<_EventsList> { ], ), ), - - /// Vertical gradient on btm - if (widget.showBottomGradient) - Positioned.fill( - child: BottomCenter( - child: ListOverscollGradient(bottomUp: true, size: 100), - ), - ), if (widget.showTopGradient) Positioned.fill( child: TopCenter(