diff --git a/lib/ui/screens/wonder_details/wonders_details_screen.dart b/lib/ui/screens/wonder_details/wonders_details_screen.dart index d885bb99..41739f8e 100644 --- a/lib/ui/screens/wonder_details/wonders_details_screen.dart +++ b/lib/ui/screens/wonder_details/wonders_details_screen.dart @@ -5,7 +5,7 @@ import 'package:wonders/ui/screens/artifact/artifact_carousel/artifact_carousel_ import 'package:wonders/ui/screens/editorial/editorial_screen.dart'; import 'package:wonders/ui/screens/photo_gallery/photo_gallery.dart'; import 'package:wonders/ui/screens/wonder_details/wonder_details_tab_menu.dart'; -import 'package:wonders/ui/screens/wonder_events/wonder_events.dart'; +import 'package:wonders/ui/screens/wonder_events/wonder_events_screen.dart'; class WonderDetailsScreen extends StatefulWidget with GetItStatefulWidgetMixin { WonderDetailsScreen({Key? key, required this.type, this.tabIndex = 0}) : super(key: key); @@ -80,7 +80,7 @@ class _WonderDetailsScreenState extends State WonderEditorialScreen(wonder, contentPadding: menuPadding), PhotoGallery(collectionId: wonder.unsplashCollectionId, wonderType: wonder.type), ArtifactCarouselScreen(type: wonder.type, contentPadding: menuPadding), - WonderEvents(type: widget.type, contentPadding: menuPadding), + WonderEventsScreen(type: widget.type, contentPadding: menuPadding), ], ), diff --git a/lib/ui/screens/wonder_events/widgets/_wonder_image_with_timeline.dart b/lib/ui/screens/wonder_events/widgets/_wonder_image_with_timeline.dart index e7c49fb0..6d906fd4 100644 --- a/lib/ui/screens/wonder_events/widgets/_wonder_image_with_timeline.dart +++ b/lib/ui/screens/wonder_events/widgets/_wonder_image_with_timeline.dart @@ -1,4 +1,4 @@ -part of '../wonder_events.dart'; +part of '../wonder_events_screen.dart'; class _WonderImageWithTimeline extends StatelessWidget { const _WonderImageWithTimeline({Key? key, required this.data, required this.height}) : super(key: key); @@ -47,7 +47,9 @@ class _WonderImageWithTimeline extends StatelessWidget { return Container( decoration: BoxDecoration( color: isSelected ? _fixLuminance(data.type.fgColor) : Colors.transparent, - border: isSelected ? Border.all(color: Colors.transparent) : Border.all(color: $styles.colors.greyMedium), + border: isSelected + ? Border.all(color: Colors.transparent) + : Border.all(color: $styles.colors.greyMedium), borderRadius: BorderRadius.circular($styles.corners.md), ), ); diff --git a/lib/ui/screens/wonder_events/wonder_events.dart b/lib/ui/screens/wonder_events/wonder_events_screen.dart similarity index 94% rename from lib/ui/screens/wonder_events/wonder_events.dart rename to lib/ui/screens/wonder_events/wonder_events_screen.dart index 960bd0ea..d2aaa917 100644 --- a/lib/ui/screens/wonder_events/wonder_events.dart +++ b/lib/ui/screens/wonder_events/wonder_events_screen.dart @@ -18,15 +18,15 @@ part 'widgets/_events_list.dart'; part 'widgets/_timeline_btn.dart'; part 'widgets/_wonder_image_with_timeline.dart'; -class WonderEvents extends StatefulWidget { - const WonderEvents({Key? key, required this.type, this.contentPadding = EdgeInsets.zero}) : super(key: key); +class WonderEventsScreen extends StatefulWidget { + const WonderEventsScreen({Key? key, required this.type, this.contentPadding = EdgeInsets.zero}) : super(key: key); final WonderType type; final EdgeInsets contentPadding; @override - State createState() => _WonderEventsState(); + State createState() => _WonderEventsScreenState(); } -class _WonderEventsState extends State { +class _WonderEventsScreenState extends State { late final _data = wondersLogic.getData(widget.type); final _eventsListKey = GlobalKey<_EventsListState>(); double _scrollPos = 0;