bachelor/wonders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set the min SDK to Dart 3.3, bump and fix lints, switch cleanup

Browse Source
This commit is contained in:
Kevin Moore 2024-02-20 13:56:39 -08:00
parent 596abc850c
commit e5f1c55993
126 changed files with 388 additions and 493 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
analysis_options.yaml
View File

@ -9,6 +9,11 @@
# packages, and plugins designed to encourage good coding practices.
include: package:flutter_lints/flutter.yaml
analyzer:
errors:
prefer_const_constructors: ignore
unused_element: ignore # mostly because of super.key
linter:
# The lint rules applied to this project can be customized in the
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
@ -22,9 +27,8 @@ linter:
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
# producing the lint.
rules:
always_declare_return_types: true
always_use_package_imports: true
prefer_const_constructors: false
prefer_single_quotes: true
- always_declare_return_types
- always_use_package_imports
- prefer_single_quotes
# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options

10
lib/_tools/artifact_search_helper.dart
View File

@ -16,7 +16,7 @@ final int maxYear = wondersLogic.timelineEndYear;
const int maxRequests = 32;
class ArtifactSearchHelper extends StatefulWidget {
const ArtifactSearchHelper({Key? key}) : super(key: key);
const ArtifactSearchHelper({super.key});
@override
State<ArtifactSearchHelper> createState() => _ArtifactSearchHelperState();
@ -161,10 +161,14 @@ class _ArtifactSearchHelperState extends State<ArtifactSearchHelper> {
//if (!json.containsKey('isPublicDomain') || !json['isPublicDomain']) return _logError(id, 'not public domain')
final int year = ((json['objectBeginDate'] as int) + (json['objectEndDate'] as int)) ~/ 2;
if (year < minYear || year > maxYear) return _logError(id, 'year is out of range');
if (year < minYear || year > maxYear) {
return _logError(id, 'year is out of range');
}
String? imageUrlSmall = json['primaryImageSmall'];
if (imageUrlSmall == null || imageUrlSmall.isEmpty) return _logError(id, 'no small image url');
if (imageUrlSmall == null || imageUrlSmall.isEmpty) {
return _logError(id, 'no small image url');
}
// if (!imageUrlSmall.startsWith(SearchData.baseImagePath)) {
// return _logError(id, 'unexpected image uri: "$imageUrlSmall"');
// }

28
lib/assets.dart
View File

@ -43,24 +43,16 @@ class SvgPaths {
/// For wonder specific assets, add an extension to [WonderType] for easy lookup
extension WonderAssetExtensions on WonderType {
String get assetPath {
switch (this) {
case WonderType.pyramidsGiza:
return '${ImagePaths.root}/pyramids';
case WonderType.greatWall:
return '${ImagePaths.root}/great_wall_of_china';
case WonderType.petra:
return '${ImagePaths.root}/petra';
case WonderType.colosseum:
return '${ImagePaths.root}/colosseum';
case WonderType.chichenItza:
return '${ImagePaths.root}/chichen_itza';
case WonderType.machuPicchu:
return '${ImagePaths.root}/machu_picchu';
case WonderType.tajMahal:
return '${ImagePaths.root}/taj_mahal';
case WonderType.christRedeemer:
return '${ImagePaths.root}/christ_the_redeemer';
}
return switch (this) {
WonderType.pyramidsGiza => '${ImagePaths.root}/pyramids',
WonderType.greatWall => '${ImagePaths.root}/great_wall_of_china',
WonderType.petra => '${ImagePaths.root}/petra',
WonderType.colosseum => '${ImagePaths.root}/colosseum',
WonderType.chichenItza => '${ImagePaths.root}/chichen_itza',
WonderType.machuPicchu => '${ImagePaths.root}/machu_picchu',
WonderType.tajMahal => '${ImagePaths.root}/taj_mahal',
WonderType.christRedeemer => '${ImagePaths.root}/christ_the_redeemer'
};
}
String get homeBtn => '$assetPath/wonder-button.png';

1
lib/common_libs.dart
View File

@ -1,4 +1,5 @@
/// Consolidate imports that are common across the app.
library;
export 'dart:math';

17
lib/logic/data/unsplash_photo_data.dart
View File

@ -14,18 +14,11 @@ class UnsplashPhotoData {
String getUnsplashUrl(int size) => '$url?q=90&fm=jpg&w=$size&fit=max';
static String getSelfHostedUrl(String id, UnsplashPhotoSize targetSize) {
late int size;
switch (targetSize) {
case UnsplashPhotoSize.med:
size = 400;
break;
case UnsplashPhotoSize.large:
size = 800;
break;
case UnsplashPhotoSize.xl:
size = 1200;
break;
}
int size = switch (targetSize) {
UnsplashPhotoSize.med => 400,
UnsplashPhotoSize.large => 800,
UnsplashPhotoSize.xl => 1200
};
if (PlatformInfo.pixelRatio >= 1.5 || PlatformInfo.isDesktop) {
size *= 2;
}

1
lib/logic/unsplash_logic.dart
View File

@ -8,5 +8,4 @@ class UnsplashLogic {
UnsplashService get service => GetIt.I.get<UnsplashService>();
List<String>? getCollectionPhotos(String collectionId) => _idsByCollection[collectionId];
}

2
lib/main.dart
View File

@ -30,7 +30,7 @@ void main() async {
/// Creates an app using the [MaterialApp.router] constructor and the global `appRouter`, an instance of [GoRouter].
class WondersApp extends StatelessWidget with GetItMixin {
WondersApp({Key? key}) : super(key: key);
WondersApp({super.key});
@override
Widget build(BuildContext context) {
final locale = watchX((SettingsLogic s) => s.currentLocale);

2
lib/styles/styles.dart
View File

@ -1,7 +1,5 @@
// ignore_for_file: library_private_types_in_public_api
import 'dart:ui';
import 'package:wonders/common_libs.dart';
export 'colors.dart';

56
lib/styles/wonders_color_extensions.dart
View File

@ -2,45 +2,29 @@ import 'package:wonders/common_libs.dart';
extension WonderColorExtensions on WonderType {
Color get bgColor {
switch (this) {
case WonderType.pyramidsGiza:
return const Color(0xFF16184D);
case WonderType.greatWall:
return const Color(0xFF642828);
case WonderType.petra:
return const Color(0xFF444B9B);
case WonderType.colosseum:
return const Color(0xFF1E736D);
case WonderType.chichenItza:
return const Color(0xFF164F2A);
case WonderType.machuPicchu:
return const Color(0xFF0E4064);
case WonderType.tajMahal:
return const Color(0xFFC96454);
case WonderType.christRedeemer:
return const Color(0xFF1C4D46);
}
return switch (this) {
WonderType.pyramidsGiza => const Color(0xFF16184D),
WonderType.greatWall => const Color(0xFF642828),
WonderType.petra => const Color(0xFF444B9B),
WonderType.colosseum => const Color(0xFF1E736D),
WonderType.chichenItza => const Color(0xFF164F2A),
WonderType.machuPicchu => const Color(0xFF0E4064),
WonderType.tajMahal => const Color(0xFFC96454),
WonderType.christRedeemer => const Color(0xFF1C4D46)
};
}
Color get fgColor {
switch (this) {
case WonderType.pyramidsGiza:
return const Color(0xFF444B9B);
case WonderType.greatWall:
return const Color(0xFF688750);
case WonderType.petra:
return const Color(0xFF1B1A65);
case WonderType.colosseum:
return const Color(0xFF4AA39D);
case WonderType.chichenItza:
return const Color(0xFFE2CFBB);
case WonderType.machuPicchu:
return const Color(0xFFC1D9D1);
case WonderType.tajMahal:
return const Color(0xFF642828);
case WonderType.christRedeemer:
return const Color(0xFFED7967);
}
return switch (this) {
WonderType.pyramidsGiza => const Color(0xFF444B9B),
WonderType.greatWall => const Color(0xFF688750),
WonderType.petra => const Color(0xFF1B1A65),
WonderType.colosseum => const Color(0xFF4AA39D),
WonderType.chichenItza => const Color(0xFFE2CFBB),
WonderType.machuPicchu => const Color(0xFFC1D9D1),
WonderType.tajMahal => const Color(0xFF642828),
WonderType.christRedeemer => const Color(0xFFED7967)
};
}
}

2
lib/ui/app_scaffold.dart
View File

@ -2,7 +2,7 @@ import 'package:wonders/common_libs.dart';
import 'package:wonders/ui/common/app_scroll_behavior.dart';
class WondersAppScaffold extends StatelessWidget {
const WondersAppScaffold({Key? key, required this.child}) : super(key: key);
const WondersAppScaffold({super.key, required this.child});
final Widget child;
static AppStyle get style => _style;
static AppStyle _style = AppStyle();

5
lib/ui/common/app_backdrop.dart
View File

@ -1,14 +1,13 @@
import 'dart:ui';
import 'package:flutter/foundation.dart';
import 'package:wonders/common_libs.dart';
class AppBackdrop extends StatelessWidget {
const AppBackdrop({
Key? key,
super.key,
this.strength = 1,
this.child,
}) : super(key: key);
});
final double strength;
final Widget? child;

2
lib/ui/common/app_icons.dart
View File

@ -2,7 +2,7 @@
import 'package:wonders/common_libs.dart';
class AppIcon extends StatelessWidget {
const AppIcon(this.icon, {Key? key, this.size = 22, this.color}) : super(key: key);
const AppIcon(this.icon, {super.key, this.size = 22, this.color});
final AppIcons icon;
final double size;
final Color? color;

11
lib/ui/common/app_shortcuts.dart
View File

@ -34,14 +34,11 @@ class AppShortcuts {
};
static Map<ShortcutActivator, Intent>? get defaults {
switch (defaultTargetPlatform) {
return switch (defaultTargetPlatform) {
// fall back to default shortcuts for ios and android
case TargetPlatform.iOS:
case TargetPlatform.android:
return null;
TargetPlatform.iOS || TargetPlatform.android => null,
// unify shortcuts for desktop/web
default:
return _defaultWebAndDesktopShortcuts;
}
_ => _defaultWebAndDesktopShortcuts
};
}
}

3
lib/ui/common/blend_mask.dart
View File

@ -5,8 +5,7 @@ class BlendMask extends SingleChildRenderObjectWidget {
final List<BlendMode> blendModes;
final double opacity;
const BlendMask({required this.blendModes, this.opacity = 1.0, Key? key, required Widget child})
: super(key: key, child: child);
const BlendMask({required this.blendModes, this.opacity = 1.0, super.key, required Widget super.child});
@override
RenderObject createRenderObject(context) => RenderBlendMask(blendModes, opacity);

2
lib/ui/common/centered_box.dart
View File

@ -1,7 +1,7 @@
import 'package:wonders/common_libs.dart';
class CenteredBox extends StatelessWidget {
const CenteredBox({Key? key, required this.child, this.width, this.height, this.padding}) : super(key: key);
const CenteredBox({super.key, required this.child, this.width, this.height, this.padding});
final Widget child;
final double? width;
final double? height;

2
lib/ui/common/collectible_item.dart
View File

@ -6,7 +6,7 @@ import 'package:wonders/ui/common/utils/app_haptics.dart';
import 'package:wonders/ui/screens/collectible_found/collectible_found_screen.dart';
class CollectibleItem extends StatelessWidget with GetItMixin {
CollectibleItem(this.collectible, {this.size = 64.0, Key? key, this.focus}) : super(key: key) {
CollectibleItem(this.collectible, {this.size = 64.0, super.key, this.focus}) {
// pre-fetch the image, so it's ready if we show the collectible found screen.
_imageProvider = NetworkImage(collectible.imageUrl);
_imageProvider.resolve(ImageConfiguration()).addListener(ImageStreamListener((_, __) {}));

3
lib/ui/common/compass_divider.dart
View File

@ -2,8 +2,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:wonders/common_libs.dart';
class CompassDivider extends StatelessWidget {
const CompassDivider({Key? key, required this.isExpanded, this.duration, this.linesColor, this.compassColor})
: super(key: key);
const CompassDivider({super.key, required this.isExpanded, this.duration, this.linesColor, this.compassColor});
final bool isExpanded;
final Duration? duration;
final Color? linesColor;

5
lib/ui/common/controls/app_header.dart
View File

@ -3,7 +3,7 @@ import 'package:wonders/ui/common/app_icons.dart';
class AppHeader extends StatelessWidget {
const AppHeader(
{Key? key,
{super.key,
this.title,
this.subtitle,
this.showBackBtn = true,
@ -11,8 +11,7 @@ class AppHeader extends StatelessWidget {
this.onBack,
this.trailing,
this.backIcon = AppIcons.prev,
this.backBtnSemantics})
: super(key: key);
this.backBtnSemantics});
final String? title;
final String? subtitle;
final bool showBackBtn;

8
lib/ui/common/controls/app_image.dart
View File

@ -6,7 +6,7 @@ import 'package:wonders/ui/common/controls/app_loading_indicator.dart';
class AppImage extends StatefulWidget {
const AppImage({
Key? key,
super.key,
required this.image,
this.fit = BoxFit.scaleDown,
this.alignment = Alignment.center,
@ -16,7 +16,7 @@ class AppImage extends StatefulWidget {
this.progress = false,
this.color,
this.scale,
}) : super(key: key);
});
final ImageProvider? image;
final BoxFit fit;
@ -88,7 +88,9 @@ class _AppImageState extends State<AppImage> {
ImageProvider? _capImageSize(ImageProvider? image) {
// Disable resizing for web as it is currently single-threaded and causes the UI to lock up when resizing large images
if (kIsWeb) return image; // TODO: Remove this when the web engine is updated to support non-blocking image resizing
if (kIsWeb) {
return image; // TODO: Remove this when the web engine is updated to support non-blocking image resizing
}
if (image == null || widget.scale == null) return image;
final MediaQueryData mq = MediaQuery.of(context);
final Size screenSize = mq.size * mq.devicePixelRatio * widget.scale!;

2
lib/ui/common/controls/app_loading_indicator.dart
View File

@ -1,7 +1,7 @@
import 'package:wonders/common_libs.dart';
class AppLoadingIndicator extends StatelessWidget {
const AppLoadingIndicator({Key? key, this.value, this.color}) : super(key: key);
const AppLoadingIndicator({super.key, this.value, this.color});
final Color? color;
final double? value;

5
lib/ui/common/controls/app_page_indicator.dart
View File

@ -3,15 +3,14 @@ import 'package:wonders/common_libs.dart';
class AppPageIndicator extends StatefulWidget {
AppPageIndicator({
Key? key,
super.key,
required this.count,
required this.controller,
this.onDotPressed,
this.color,
this.dotSize,
String? semanticPageTitle,
}) : semanticPageTitle = semanticPageTitle ?? $strings.appPageDefaultTitlePage,
super(key: key);
}) : semanticPageTitle = semanticPageTitle ?? $strings.appPageDefaultTitlePage;
final int count;
final PageController controller;
final void Function(int index)? onDotPressed;

23
lib/ui/common/controls/buttons.dart
View File

@ -9,7 +9,7 @@ Widget _buildIcon(BuildContext context, AppIcons icon, {required bool isSecondar
class AppBtn extends StatelessWidget {
// ignore: prefer_const_constructors_in_immutables
AppBtn({
Key? key,
super.key,
required this.onPressed,
required this.semanticLabel,
this.enableFeedback = true,
@ -24,11 +24,10 @@ class AppBtn extends StatelessWidget {
this.border,
this.focusNode,
this.onFocusChanged,
}) : _builder = null,
super(key: key);
}) : _builder = null;
AppBtn.from({
Key? key,
super.key,
required this.onPressed,
this.enableFeedback = true,
this.pressEffect = true,
@ -45,9 +44,10 @@ class AppBtn extends StatelessWidget {
AppIcons? icon,
double? iconSize,
}) : child = null,
circular = false,
super(key: key) {
if (semanticLabel == null && text == null) throw ('AppBtn.from must include either text or semanticLabel');
circular = false {
if (semanticLabel == null && text == null) {
throw ('AppBtn.from must include either text or semanticLabel');
}
this.semanticLabel = semanticLabel ?? text ?? '';
_builder = (context) {
if (text == null && icon == null) return SizedBox.shrink();
@ -70,7 +70,7 @@ class AppBtn extends StatelessWidget {
// ignore: prefer_const_constructors_in_immutables
AppBtn.basic({
Key? key,
super.key,
required this.onPressed,
required this.semanticLabel,
this.enableFeedback = true,
@ -85,8 +85,7 @@ class AppBtn extends StatelessWidget {
}) : expand = false,
bgColor = Colors.transparent,
border = null,
_builder = null,
super(key: key);
_builder = null;
// interaction:
final VoidCallback? onPressed;
@ -185,7 +184,7 @@ class AppBtn extends StatelessWidget {
/// Add a transparency-based press effect to buttons.
/// //////////////////////////////////////////////////
class _ButtonPressEffect extends StatefulWidget {
const _ButtonPressEffect(this.child, {Key? key}) : super(key: key);
const _ButtonPressEffect(this.child);
final Widget child;
@override
@ -212,7 +211,7 @@ class _ButtonPressEffectState extends State<_ButtonPressEffect> {
}
class _CustomFocusBuilder extends StatefulWidget {
const _CustomFocusBuilder({Key? key, required this.builder, this.focusNode, this.onFocusChanged}) : super(key: key);
const _CustomFocusBuilder({required this.builder, this.focusNode, this.onFocusChanged});
final Widget Function(BuildContext context, FocusNode focus) builder;
final void Function(bool hasFocus)? onFocusChanged;
final FocusNode? focusNode;

3
lib/ui/common/controls/checkbox.dart
View File

@ -2,8 +2,7 @@ import 'package:wonders/common_libs.dart';
import 'package:wonders/ui/common/utils/app_haptics.dart';
class SimpleCheckbox extends StatelessWidget {
const SimpleCheckbox({Key? key, required this.active, required this.onToggled, required this.label})
: super(key: key);
const SimpleCheckbox({super.key, required this.active, required this.onToggled, required this.label});
final bool active;
final String label;
final Function(bool? onToggle) onToggled;

23
lib/ui/common/controls/circle_buttons.dart
View File

@ -4,14 +4,14 @@ import 'package:wonders/ui/common/fullscreen_keyboard_listener.dart';
class CircleBtn extends StatelessWidget {
const CircleBtn({
Key? key,
super.key,
required this.child,
required this.onPressed,
this.border,
this.bgColor,
this.size,
required this.semanticLabel,
}) : super(key: key);
});
static double defaultSize = 48;
@ -40,7 +40,7 @@ class CircleBtn extends StatelessWidget {
class CircleIconBtn extends StatelessWidget {
const CircleIconBtn({
Key? key,
super.key,
required this.icon,
required this.onPressed,
this.border,
@ -50,7 +50,7 @@ class CircleIconBtn extends StatelessWidget {
this.iconSize,
this.flipIcon = false,
required this.semanticLabel,
}) : super(key: key);
});
//TODO: Reduce size if design re-exports icon-images without padding
static double defaultSize = 28;
@ -87,13 +87,13 @@ class CircleIconBtn extends StatelessWidget {
class BackBtn extends StatelessWidget {
const BackBtn({
Key? key,
super.key,
this.icon = AppIcons.prev,
this.onPressed,
this.semanticLabel,
this.bgColor,
this.iconColor,
}) : super(key: key);
});
final Color? bgColor;
final Color? iconColor;
@ -121,11 +121,13 @@ class BackBtn extends StatelessWidget {
@override
Widget build(BuildContext context) {
return FullscreenKeyboardListener(
onKeyDown: (event) => _handleKeyDown(context, event), child: CircleIconBtn(
onKeyDown: (event) => _handleKeyDown(context, event),
child: CircleIconBtn(
icon: icon,
bgColor: bgColor,
color: iconColor,
onPressed: onPressed ?? () {
onPressed: onPressed ??
() {
final nav = Navigator.of(context);
if (nav.canPop()) {
Navigator.pop(context);
@ -134,7 +136,8 @@ class BackBtn extends StatelessWidget {
}
},
semanticLabel: semanticLabel ?? $strings.circleButtonsSemanticBack,
),);
),
);
}
Widget safe() => _SafeAreaWithPadding(child: this);
@ -153,7 +156,7 @@ class BackBtn extends StatelessWidget {
}
class _SafeAreaWithPadding extends StatelessWidget {
const _SafeAreaWithPadding({Key? key, required this.child}) : super(key: key);
const _SafeAreaWithPadding({required this.child});
final Widget child;

2
lib/ui/common/controls/diagonal_text_page_indicator.dart
View File

@ -2,7 +2,7 @@ import 'package:wonders/common_libs.dart';
import 'package:wonders/ui/common/static_text_scale.dart';
class DiagonalTextPageIndicator extends StatelessWidget {
const DiagonalTextPageIndicator({Key? key, required this.current, required this.total}) : super(key: key);
const DiagonalTextPageIndicator({super.key, required this.current, required this.total});
final int current;
final int total;
static final _fontSize = 26 * $styles.scale;

3
lib/ui/common/controls/eight_way_swipe_detector.dart
View File

@ -1,8 +1,7 @@
import 'package:wonders/common_libs.dart';
class EightWaySwipeDetector extends StatefulWidget {
const EightWaySwipeDetector({Key? key, required this.child, this.threshold = 50, required this.onSwipe})
: super(key: key);
const EightWaySwipeDetector({super.key, required this.child, this.threshold = 50, required this.onSwipe});
final Widget child;
final double threshold;
final void Function(Offset dir)? onSwipe;

5
lib/ui/common/controls/locale_switcher.dart
View File

@ -1,7 +1,7 @@
import 'package:wonders/common_libs.dart';
class LocaleSwitcher extends StatelessWidget with GetItMixin {
LocaleSwitcher({Key? key}) : super(key: key);
LocaleSwitcher({super.key});
@override
Widget build(BuildContext context) {
@ -11,6 +11,7 @@ class LocaleSwitcher extends StatelessWidget with GetItMixin {
await settingsLogic.changeLocale(newLocale);
}
return AppBtn.from(text: $strings.localeSwapButton, onPressed: handleSwapLocale, padding: EdgeInsets.all($styles.insets.sm));
return AppBtn.from(
text: $strings.localeSwapButton, onPressed: handleSwapLocale, padding: EdgeInsets.all($styles.insets.sm));
}
}

12
lib/ui/common/controls/scroll_decorator.dart
View File

@ -6,19 +6,19 @@ class ScrollDecorator extends StatefulWidget {
/// its ScrollController.
// ignore: prefer_const_constructors_in_immutables
ScrollDecorator({
Key? key,
super.key,
required this.builder,
this.fgBuilder,
this.bgBuilder,
this.controller,
this.onInit,
}) : super(key: key);
});
/// Creates a ScrollDecorator that fades a widget in at the begin or end of the scrolling widget based on the scroll
/// position. For example on a vertical list, it would fade in the `begin` widget when the list is not scrolled to the
/// top.
ScrollDecorator.fade({
Key? key,
super.key,
required this.builder,
this.controller,
this.onInit,
@ -27,7 +27,7 @@ class ScrollDecorator extends StatefulWidget {
bool bg = false,
Axis direction = Axis.vertical,
Duration duration = const Duration(milliseconds: 150),
}) : super(key: key) {
}) {
Flex flexBuilder(controller) {
return Flex(
direction: direction,
@ -55,12 +55,12 @@ class ScrollDecorator extends StatefulWidget {
/// Creates an ScrollDecorator that adds a shadow to the top of a vertical list when it is scrolled down.
ScrollDecorator.shadow({
Key? key,
super.key,
required this.builder,
this.controller,
this.onInit,
Color color = Colors.black54,
}) : super(key: key) {
}) {
bgBuilder = null;
fgBuilder = (controller) {
final double ratio = controller.hasClients ? min(1, controller.position.extentBefore / 60) : 0;

29
lib/ui/common/curved_clippers.dart
View File

@ -40,33 +40,29 @@ class ArchPoint {
List<ArchPoint> _getArchPts(Size size, ArchType type) {
double distanceFromTop = size.width / 3;
switch (type) {
case ArchType.pyramid:
return [
return switch (type) {
ArchType.pyramid => [
ArchPoint(Offset(0, size.height)),
ArchPoint(Offset(0, distanceFromTop)),
ArchPoint(Offset(size.width / 2, 0)),
ArchPoint(Offset(size.width, distanceFromTop)),
ArchPoint(Offset(size.width, size.height)),
];
case ArchType.spade:
return [
],
ArchType.spade => [
ArchPoint(Offset(0, size.height)),
ArchPoint(Offset(0, distanceFromTop)),
ArchPoint(Offset(size.width / 2, 0), Offset(0, distanceFromTop * .66)),
ArchPoint(Offset(size.width, distanceFromTop), Offset(size.width, distanceFromTop * .66)),
ArchPoint(Offset(size.width, size.height)),
];
case ArchType.arch:
return [
],
ArchType.arch => [
ArchPoint(Offset(0, size.height)),
ArchPoint(Offset(0, size.width / 2)),
ArchPoint(Offset(size.width / 2, 0), Offset(0, 0)),
ArchPoint(Offset(size.width, size.width / 2), Offset(size.width, 0)),
ArchPoint(Offset(size.width, size.height)),
];
case ArchType.wideArch:
return [
],
ArchType.wideArch => [
ArchPoint(Offset(0, size.height)),
ArchPoint(Offset(0, size.width / 2)),
ArchPoint(Offset(0, distanceFromTop)),
@ -74,17 +70,16 @@ List<ArchPoint> _getArchPts(Size size, ArchType type) {
ArchPoint(Offset(size.width, distanceFromTop), Offset(size.width, 0)),
ArchPoint(Offset(size.width, size.width / 2)),
ArchPoint(Offset(size.width, size.height)),
];
case ArchType.flatPyramid:
return [
],
ArchType.flatPyramid => [
ArchPoint(Offset(0, size.height)),
ArchPoint(Offset(0, distanceFromTop)),
ArchPoint(Offset(size.width * 0.8 / 2, 0)),
ArchPoint(Offset(size.width * 1.2 / 2, 0)),
ArchPoint(Offset(size.width, distanceFromTop)),
ArchPoint(Offset(size.width, size.height)),
];
}
]
};
}
class CurvedTopClipper extends CustomClipper<Path> {

2
lib/ui/common/dashed_line.dart
View File

@ -1,7 +1,7 @@
import 'package:wonders/common_libs.dart';
class DashedLine extends StatelessWidget {
const DashedLine({Key? key, this.vertical = false}) : super(key: key);
const DashedLine({super.key, this.vertical = false});
final bool vertical;
@override

2
lib/ui/common/fade_color_transition.dart
View File

@ -3,7 +3,7 @@ import 'package:wonders/common_libs.dart';
/// Colored box that can fade in and out, should yield better performance than
/// fading with an additional Opacity layer.
class FadeColorTransition extends StatelessWidget {
const FadeColorTransition({Key? key, required this.animation, required this.color}) : super(key: key);
const FadeColorTransition({super.key, required this.animation, required this.color});
final Animation<double> animation;
final Color color;

44
lib/ui/common/gradient_container.dart
View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
class GradientContainer extends StatelessWidget {
const GradientContainer(this.colors, this.stops,
{Key? key,
{super.key,
this.child,
this.width,
this.height,
@ -10,8 +10,7 @@ class GradientContainer extends StatelessWidget {
this.begin,
this.end,
this.blendMode,
this.borderRadius})
: super(key: key);
this.borderRadius});
final List<Color> colors;
final List<double> stops;
final double? width;
@ -45,41 +44,12 @@ class GradientContainer extends StatelessWidget {
}
class HzGradient extends GradientContainer {
const HzGradient(List<Color> colors, List<double> stops,
{Key? key,
Widget? child,
double? width,
double? height,
Alignment? alignment,
BlendMode? blendMode,
BorderRadius? borderRadius})
: super(colors, stops,
key: key,
child: child,
width: width,
height: height,
alignment: alignment,
blendMode: blendMode,
borderRadius: borderRadius);
const HzGradient(super.colors, super.stops,
{super.key, super.child, super.width, super.height, super.alignment, super.blendMode, super.borderRadius});
}
class VtGradient extends GradientContainer {
const VtGradient(List<Color> colors, List<double> stops,
{Key? key,
Widget? child,
double? width,
double? height,
Alignment? alignment,
BlendMode? blendMode,
BorderRadius? borderRadius})
: super(colors, stops,
key: key,
child: child,
width: width,
height: height,
alignment: alignment,
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
blendMode: blendMode,
borderRadius: borderRadius);
const VtGradient(super.colors, super.stops,
{super.key, super.child, super.width, super.height, super.alignment, super.blendMode, super.borderRadius})
: super(begin: Alignment.topCenter, end: Alignment.bottomCenter);
}

5
lib/ui/common/hidden_collectible.dart
View File

@ -6,9 +6,8 @@ import 'package:wonders/ui/common/collectible_item.dart';
/// If `wonders` is empty, then the collectible is always shown.
class HiddenCollectible extends StatelessWidget with GetItMixin {
HiddenCollectible(this.currentWonder,
{Key? key, required this.index, this.matches = const [], this.size = 64, this.focus})
: assert(index <= 2, 'index should not exceed 2'),
super(key: key);
{super.key, required this.index, this.matches = const [], this.size = 64, this.focus})
: assert(index <= 2, 'index should not exceed 2');
final int index;
final double size;
final List<WonderType> matches;

2
lib/ui/common/keyboard_arrows_listener.dart
View File

@ -9,7 +9,7 @@ class ArrowDir {
}
class KeyboardArrowsListener extends StatefulWidget {
const KeyboardArrowsListener({Key? key, required this.child, required this.onArrow}) : super(key: key);
const KeyboardArrowsListener({super.key, required this.child, required this.onArrow});
final Widget child;
final void Function(ArrowDir dir) onArrow;
@override

4
lib/ui/common/lazy_indexed_stack.dart
View File

@ -3,13 +3,13 @@ import 'package:flutter/material.dart';
/// A lazy-loading [IndexedStack] that loads [children] accordingly.
class LazyIndexedStack extends StatefulWidget {
const LazyIndexedStack({
Key? key,
super.key,
this.alignment = AlignmentDirectional.topStart,
this.textDirection,
this.sizing = StackFit.loose,
this.index = 0,
this.children = const [],
}) : super(key: key);
});
final AlignmentGeometry alignment;
final TextDirection? textDirection;

2
lib/ui/common/list_gradient.dart
View File

@ -4,7 +4,7 @@ import 'package:wonders/ui/common/gradient_container.dart';
/// Used for situations where the list content should blend into a background color.
/// Can be placed at the top or bottom of a list, using the `flip' option when on the bottom
class ListOverscollGradient extends StatelessWidget {
const ListOverscollGradient({Key? key, this.size = 100, this.color, this.bottomUp = false}) : super(key: key);
const ListOverscollGradient({super.key, this.size = 100, this.color, this.bottomUp = false});
final bool bottomUp;
final double size;
final Color? color;

2
lib/ui/common/measurable_widget.dart
View File

@ -4,7 +4,7 @@ import 'package:flutter/rendering.dart';
import 'package:wonders/common_libs.dart';
class MeasurableWidget extends SingleChildRenderObjectWidget {
const MeasurableWidget({Key? key, required this.onChange, required Widget child}) : super(key: key, child: child);
const MeasurableWidget({super.key, required this.onChange, required Widget super.child});
final void Function(Size size) onChange;
@override
RenderObject createRenderObject(BuildContext context) => MeasureSizeRenderObject(onChange);

8
lib/ui/common/modals/app_modals.dart
View File

@ -11,7 +11,7 @@ Future<bool?> showModal(BuildContext context, {required Widget child}) async {
}
class LoadingModal extends StatelessWidget {
const LoadingModal({Key? key, this.title, this.msg, this.child}) : super(key: key);
const LoadingModal({super.key, this.title, this.msg, this.child});
final String? title;
final String? msg;
final Widget? child;
@ -28,7 +28,7 @@ class LoadingModal extends StatelessWidget {
}
class OkModal extends StatelessWidget {
const OkModal({Key? key, this.title, this.msg, this.child}) : super(key: key);
const OkModal({super.key, this.title, this.msg, this.child});
final String? title;
final String? msg;
final Widget? child;
@ -51,7 +51,7 @@ class OkModal extends StatelessWidget {
}
class OkCancelModal extends StatelessWidget {
const OkCancelModal({Key? key, this.title, this.msg, this.child}) : super(key: key);
const OkCancelModal({super.key, this.title, this.msg, this.child});
final String? title;
final String? msg;
final Widget? child;
@ -83,7 +83,7 @@ class _BaseContentModal extends StatelessWidget {
final Widget? child;
final List<Widget> buttons;
const _BaseContentModal({Key? key, this.title, this.msg, required this.buttons, this.child}) : super(key: key);
const _BaseContentModal({this.title, this.msg, required this.buttons, this.child});
@override
Widget build(BuildContext context) {

2
lib/ui/common/modals/fullscreen_maps_viewer.dart
View File

@ -5,7 +5,7 @@ import 'package:wonders/ui/common/controls/app_header.dart';
import 'package:wonders/ui/common/google_maps_marker.dart';
class FullscreenMapsViewer extends StatelessWidget {
FullscreenMapsViewer({Key? key, required this.type}) : super(key: key);
FullscreenMapsViewer({super.key, required this.type});
final WonderType type;
WonderData get data => wondersLogic.getData(type);

4
lib/ui/common/modals/fullscreen_url_img_viewer.dart
View File

@ -7,7 +7,7 @@ import 'package:wonders/ui/common/fullscreen_keyboard_listener.dart';
import 'package:wonders/ui/common/utils/app_haptics.dart';
class FullscreenUrlImgViewer extends StatefulWidget {
const FullscreenUrlImgViewer({Key? key, required this.urls, this.index = 0}) : super(key: key);
const FullscreenUrlImgViewer({super.key, required this.urls, this.index = 0});
final List<String> urls;
final int index;
@ -126,7 +126,7 @@ class _FullscreenUrlImgViewerState extends State<FullscreenUrlImgViewer> {
}
class _Viewer extends StatefulWidget {
const _Viewer(this.url, this.isZoomed, {Key? key}) : super(key: key);
const _Viewer(this.url, this.isZoomed);
final String url;
final ValueNotifier<bool> isZoomed;

2
lib/ui/common/modals/fullscreen_video_viewer.dart
View File

@ -5,7 +5,7 @@ import 'package:wonders/logic/common/platform_info.dart';
import 'package:youtube_player_iframe/youtube_player_iframe.dart';
class FullscreenVideoViewer extends StatefulWidget {
const FullscreenVideoViewer({Key? key, required this.id}) : super(key: key);
const FullscreenVideoViewer({super.key, required this.id});
final String id;
@override

2
lib/ui/common/modals/fullscreen_web_view.dart
View File

@ -2,7 +2,7 @@ import 'package:webview_flutter/webview_flutter.dart';
import 'package:wonders/common_libs.dart';
class FullscreenWebView extends StatelessWidget {
FullscreenWebView(this.url, {Key? key}) : super(key: key);
FullscreenWebView(this.url, {super.key});
final String url;
late final controller = WebViewController()

5
lib/ui/common/opening_card.dart
View File

@ -3,13 +3,12 @@ import 'package:wonders/ui/common/measurable_widget.dart';
class OpeningCard extends StatefulWidget {
const OpeningCard(
{Key? key,
{super.key,
required this.closedBuilder,
required this.openBuilder,
required this.isOpen,
this.background,
this.padding})
: super(key: key);
this.padding});
final Widget Function(BuildContext) closedBuilder;
final Widget Function(BuildContext) openBuilder;

2
lib/ui/common/pop_navigator_underlay.dart
View File

@ -1,7 +1,7 @@
import 'package:wonders/common_libs.dart';
class PopNavigatorUnderlay extends StatelessWidget {
const PopNavigatorUnderlay({Key? key}) : super(key: key);
const PopNavigatorUnderlay({super.key});
@override
Widget build(BuildContext context) {

2
lib/ui/common/pop_router_on_over_scroll.dart
View File

@ -1,7 +1,7 @@
import 'package:wonders/common_libs.dart';
class PopRouterOnOverScroll extends StatefulWidget {
const PopRouterOnOverScroll({Key? key, required this.child, required this.controller}) : super(key: key);
const PopRouterOnOverScroll({super.key, required this.child, required this.controller});
final ScrollController controller;
final Widget child;

4
lib/ui/common/scaling_list_item.dart
View File

@ -2,7 +2,7 @@ import 'package:wonders/common_libs.dart';
import 'package:wonders/ui/common/utils/context_utils.dart';
class AnimatedListItem extends StatelessWidget {
const AnimatedListItem({Key? key, required this.scrollPos, required this.builder}) : super(key: key);
const AnimatedListItem({super.key, required this.scrollPos, required this.builder});
final ValueNotifier<double> scrollPos;
final Widget Function(BuildContext context, double pctVisible) builder;
@ -35,7 +35,7 @@ class AnimatedListItem extends StatelessWidget {
/// Takes a scroll position notifier and a child.
/// Scales its child as it scrolls onto screen for a nice effect.
class ScalingListItem extends StatelessWidget {
const ScalingListItem({Key? key, required this.scrollPos, required this.child}) : super(key: key);
const ScalingListItem({super.key, required this.scrollPos, required this.child});
final ValueNotifier<double> scrollPos;
final Widget child;

4
lib/ui/common/stacked_page_view_builder.dart
View File

@ -11,12 +11,12 @@ import 'package:wonders/common_libs.dart';
///
class StackedPageViewBuilder extends StatefulWidget {
const StackedPageViewBuilder({
Key? key,
super.key,
this.initialIndex = 0,
required this.pageCount,
required this.builder,
this.onInit,
}) : super(key: key);
});
final int initialIndex;
final int pageCount;
final Widget Function(BuildContext builder, PageController controller, PageController follower) builder;

2
lib/ui/common/static_text_scale.dart
View File

@ -1,7 +1,7 @@
import 'package:wonders/common_libs.dart';
class StaticTextScale extends StatelessWidget {
const StaticTextScale({Key? key, required this.child, this.scale = 1}) : super(key: key);
const StaticTextScale({super.key, required this.child, this.scale = 1});
final Widget child;
final double scale;

6
lib/ui/common/themed_text.dart
View File

@ -1,7 +1,7 @@
import 'package:wonders/common_libs.dart';
class DefaultTextColor extends StatelessWidget {
const DefaultTextColor({Key? key, required this.color, required this.child}) : super(key: key);
const DefaultTextColor({super.key, required this.color, required this.child});
final Color color;
final Widget child;
@ -15,7 +15,7 @@ class DefaultTextColor extends StatelessWidget {
}
class LightText extends StatelessWidget {
const LightText({Key? key, required this.child}) : super(key: key);
const LightText({super.key, required this.child});
final Widget child;
@override
@ -26,7 +26,7 @@ class LightText extends StatelessWidget {
}
class DarkText extends StatelessWidget {
const DarkText({Key? key, required this.child}) : super(key: key);
const DarkText({super.key, required this.child});
final Widget child;
@override

2
lib/ui/common/timeline_event_card.dart
View File

@ -3,7 +3,7 @@ import 'package:wonders/logic/common/string_utils.dart';
import 'package:wonders/ui/common/themed_text.dart';
class TimelineEventCard extends StatelessWidget {
const TimelineEventCard({Key? key, required this.year, required this.text, this.darkMode = false}) : super(key: key);
const TimelineEventCard({super.key, required this.year, required this.text, this.darkMode = false});
final int year;
final String text;
final bool darkMode;

3
lib/ui/common/unsplash_photo.dart
View File

@ -2,8 +2,7 @@ import 'package:wonders/common_libs.dart';
import 'package:wonders/logic/data/unsplash_photo_data.dart';
class UnsplashPhoto extends StatelessWidget {
const UnsplashPhoto(this.id, {Key? key, this.fit = BoxFit.cover, required this.size, this.showCredits = false})
: super(key: key);
const UnsplashPhoto(this.id, {super.key, this.fit = BoxFit.cover, required this.size, this.showCredits = false});
final String id;
final BoxFit fit;
final UnsplashPhotoSize size;

6
lib/ui/common/wonders_timeline_builder.dart
View File

@ -6,13 +6,13 @@ import 'package:wonders/logic/data/wonder_data.dart';
/// Provides a builder, so the visual representation of each track entry can be customized
class WondersTimelineBuilder extends StatelessWidget {
const WondersTimelineBuilder({
Key? key,
super.key,
this.selectedWonders = const [],
this.timelineBuilder,
this.axis = Axis.horizontal,
this.crossAxisGap,
this.minSize = 10,
}) : super(key: key);
});
final List<WonderType> selectedWonders;
final Widget Function(BuildContext, WonderData type, bool isSelected)? timelineBuilder;
final Axis axis;
@ -96,7 +96,7 @@ class WondersTimelineBuilder extends StatelessWidget {
}
class _DefaultTrackEntry extends StatelessWidget {
const _DefaultTrackEntry({Key? key, required this.isSelected}) : super(key: key);
const _DefaultTrackEntry({required this.isSelected});
final bool isSelected;
@override

2
lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart
View File

@ -12,7 +12,7 @@ part 'widgets/_bottom_text_content.dart';
part 'widgets/_collapsing_carousel_item.dart';
class ArtifactCarouselScreen extends StatefulWidget {
const ArtifactCarouselScreen({Key? key, required this.type, this.contentPadding = EdgeInsets.zero}) : super(key: key);
const ArtifactCarouselScreen({super.key, required this.type, this.contentPadding = EdgeInsets.zero});
final WonderType type;
final EdgeInsets contentPadding;

2
lib/ui/screens/artifact/artifact_carousel/widgets/_blurred_image_bg.dart
View File

@ -2,7 +2,7 @@ part of '../artifact_carousel_screen.dart';
/// Blurry image background for the Artifact Highlights view. Contains horizontal and vertical gradients that stack overtop the blended image.
class _BlurredImageBg extends StatelessWidget {
const _BlurredImageBg({Key? key, this.url}) : super(key: key);
const _BlurredImageBg({super.key, this.url});
final String? url;
@override

3
lib/ui/screens/artifact/artifact_carousel/widgets/_bottom_text_content.dart
View File

@ -2,8 +2,7 @@ part of '../artifact_carousel_screen.dart';
class _BottomTextContent extends StatelessWidget {
const _BottomTextContent(
{Key? key, required this.artifact, required this.height, required this.state, required this.shortMode})
: super(key: key);
{super.key, required this.artifact, required this.height, required this.state, required this.shortMode});
final HighlightData artifact;
final double height;

11
lib/ui/screens/artifact/artifact_carousel/widgets/_collapsing_carousel_item.dart
View File

@ -4,13 +4,12 @@ part of '../artifact_carousel_screen.dart';
/// This lets the child simply render it's contents
class _CollapsingCarouselItem extends StatelessWidget {
const _CollapsingCarouselItem(
{Key? key,
{super.key,
required this.child,
required this.indexOffset,
required this.width,
required this.onPressed,
required this.title})
: super(key: key);
required this.title});
final Widget child;
final int indexOffset;
final double width;
@ -50,11 +49,11 @@ class _CollapsingCarouselItem extends StatelessWidget {
class _AnimatedTranslate extends StatelessWidget {
const _AnimatedTranslate({
Key? key,
super.key,
required this.duration,
required this.offset,
required this.child,
}) : super(key: key);
});
final Duration duration;
final Offset offset;
final Widget child;
@ -71,7 +70,7 @@ class _AnimatedTranslate extends StatelessWidget {
}
class _DoubleBorderImage extends StatelessWidget {
const _DoubleBorderImage(this.data, {Key? key}) : super(key: key);
const _DoubleBorderImage(this.data, {super.key});
final HighlightData data;
@override
Widget build(BuildContext context) => Container(

2
lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart
View File

@ -10,7 +10,7 @@ part 'widgets/_info_column.dart';
part 'widgets/_artifact_image_btn.dart';
class ArtifactDetailsScreen extends StatefulWidget {
const ArtifactDetailsScreen({Key? key, required this.artifactId}) : super(key: key);
const ArtifactDetailsScreen({super.key, required this.artifactId});
final String artifactId;
@override

2
lib/ui/screens/artifact/artifact_details/widgets/_artifact_image_btn.dart
View File

@ -1,7 +1,7 @@
part of '../artifact_details_screen.dart';
class _ArtifactImageBtn extends StatelessWidget {
const _ArtifactImageBtn({Key? key, required this.data}) : super(key: key);
const _ArtifactImageBtn({super.key, required this.data});
final ArtifactData data;
@override

4
lib/ui/screens/artifact/artifact_details/widgets/_info_column.dart
View File

@ -1,7 +1,7 @@
part of '../artifact_details_screen.dart';
class _InfoColumn extends StatelessWidget {
const _InfoColumn({Key? key, required this.data}) : super(key: key);
const _InfoColumn({super.key, required this.data});
final ArtifactData data;
@override
@ -67,7 +67,7 @@ class _InfoColumn extends StatelessWidget {
}
class _InfoRow extends StatelessWidget {
const _InfoRow(this.label, this.value, {Key? key}) : super(key: key);
const _InfoRow(this.label, this.value, {super.key});
final String label;
final String value;

4
lib/ui/screens/artifact/artifact_search/artifact_search_screen.dart
View File

@ -15,7 +15,7 @@ part 'widgets/_search_input.dart';
/// User can use this screen to search the MET server for an artifact by name or timeline. Artifacts results will
/// appear as images, which the user can click on to being up the details view for more information.
class ArtifactSearchScreen extends StatefulWidget with GetItStatefulWidgetMixin {
ArtifactSearchScreen({Key? key, required this.type}) : super(key: key);
ArtifactSearchScreen({super.key, required this.type});
final WonderType type;
@override
@ -203,7 +203,7 @@ class _ArtifactSearchScreenState extends State<ArtifactSearchScreen> with GetItS
}
class PanelController extends ValueNotifier<bool> {
PanelController(bool value) : super(value);
PanelController(super.value);
void toggle() => value = !value;
}

10
lib/ui/screens/artifact/artifact_search/time_range_selector/expanding_time_range_selector.dart
View File

@ -11,14 +11,14 @@ import 'package:wonders/ui/screens/artifact/artifact_search/time_range_selector/
// Expandable timerange selector component that further refines Artifact Search based on date range.
class ExpandingTimeRangeSelector extends StatefulWidget {
const ExpandingTimeRangeSelector({
Key? key,
super.key,
required this.wonder,
required this.startYear,
required this.endYear,
required this.onChanged,
required this.panelController,
required this.vizController,
}) : super(key: key);
});
final WonderData wonder;
final double startYear;
final double endYear;
@ -95,10 +95,9 @@ class _ExpandingTimeRangeSelectorState extends State<ExpandingTimeRangeSelector>
class _ClosedTimeRange extends StatelessWidget {
const _ClosedTimeRange({
Key? key,
required this.startYear,
required this.endYear,
}) : super(key: key);
});
final double startYear, endYear;
@override
@ -120,14 +119,13 @@ class _ClosedTimeRange extends StatelessWidget {
class _OpenedTimeRange extends StatelessWidget {
const _OpenedTimeRange({
Key? key,
required this.onChange,
required this.startYear,
required this.endYear,
required this.wonder,
required this.painter,
required this.onClose,
}) : super(key: key);
});
final double startYear;
final double endYear;
final void Function(double start, double end) onChange;

4
lib/ui/screens/artifact/artifact_search/time_range_selector/range_selector.dart
View File

@ -6,7 +6,7 @@ class RangeSelector extends StatefulWidget {
static const double handleWidth = 20;
const RangeSelector({
Key? key,
super.key,
required this.start,
required this.end,
required this.min,
@ -15,7 +15,7 @@ class RangeSelector extends StatefulWidget {
this.isLocked = false,
this.onUpdated,
this.onChanged,
}) : super(key: key);
});
final double start;
final double end;
final double min;

2
lib/ui/screens/artifact/artifact_search/widgets/_result_tile.dart
View File

@ -1,7 +1,7 @@
part of '../artifact_search_screen.dart';
class _ResultTile extends StatelessWidget {
const _ResultTile({Key? key, required this.onPressed, required this.data}) : super(key: key);
const _ResultTile({super.key, required this.onPressed, required this.data});
final void Function(SearchData data) onPressed;
final SearchData data;

2
lib/ui/screens/artifact/artifact_search/widgets/_results_grid.dart
View File

@ -2,7 +2,7 @@ part of '../artifact_search_screen.dart';
/// Staggered Masonry styled grid for displaying two columns of different aspect-ratio images.
class _ResultsGrid extends StatefulWidget {
const _ResultsGrid({Key? key, required this.searchResults, required this.onPressed}) : super(key: key);
const _ResultsGrid({super.key, required this.searchResults, required this.onPressed});
final void Function(SearchData) onPressed;
final List<SearchData> searchResults;

6
lib/ui/screens/artifact/artifact_search/widgets/_search_input.dart
View File

@ -2,7 +2,7 @@ part of '../artifact_search_screen.dart';
/// Autopopulating textfield used for searching for Artifacts by name.
class _SearchInput extends StatelessWidget {
const _SearchInput({Key? key, required this.onSubmit, required this.wonder}) : super(key: key);
const _SearchInput({super.key, required this.onSubmit, required this.wonder});
final void Function(String) onSubmit;
final WonderData wonder;
@ -23,7 +23,9 @@ class _SearchInput extends StatelessWidget {
}
Iterable<String> _getSuggestions(TextEditingValue textEditingValue) {
if (textEditingValue.text == '') return wonder.searchSuggestions.getRange(0, 10);
if (textEditingValue.text == '') {
return wonder.searchSuggestions.getRange(0, 10);
}
return wonder.searchSuggestions.where((str) {
return str.startsWith(textEditingValue.text.toLowerCase());

2
lib/ui/screens/collectible_found/collectible_found_screen.dart
View File

@ -12,7 +12,7 @@ part 'widgets/_celebration_particles.dart';
class CollectibleFoundScreen extends StatelessWidget {
// CollectibleItem passes in a (theoretically) pre-loaded imageProvider.
// we could check for load completion, and hold after introT, but that shouldn't be necessary in a real-world scenario.
const CollectibleFoundScreen({required this.collectible, required this.imageProvider, Key? key}) : super(key: key);
const CollectibleFoundScreen({required this.collectible, required this.imageProvider, super.key});
final CollectibleData collectible;
final ImageProvider imageProvider;

2
lib/ui/screens/collectible_found/widgets/_animated_ribbon.dart
View File

@ -1,7 +1,7 @@
part of '../collectible_found_screen.dart';
class _AnimatedRibbon extends StatelessWidget {
const _AnimatedRibbon(this.text, {Key? key}) : super(key: key);
const _AnimatedRibbon(this.text, {super.key});
final String text;
static const double height = 48;

2
lib/ui/screens/collectible_found/widgets/_celebration_particles.dart
View File

@ -1,7 +1,7 @@
part of '../collectible_found_screen.dart';
class _CelebrationParticles extends StatelessWidget {
const _CelebrationParticles({Key? key, this.fadeMs = 1000}) : super(key: key);
const _CelebrationParticles({super.key, this.fadeMs = 1000});
final int fadeMs;

2
lib/ui/screens/collection/collection_screen.dart
View File

@ -16,7 +16,7 @@ part 'widgets/_collection_list_card.dart';
part 'widgets/_newly_discovered_items_btn.dart';
class CollectionScreen extends StatefulWidget with GetItStatefulWidgetMixin {
CollectionScreen({required this.fromId, Key? key}) : super(key: key);
CollectionScreen({required this.fromId, super.key});
final String fromId;

4
lib/ui/screens/collection/widgets/_collectible_image.dart
View File

@ -2,12 +2,12 @@ part of '../collection_screen.dart';
class _CollectibleImage extends StatelessWidget {
const _CollectibleImage({
Key? key,
super.key,
required this.collectible,
required this.state,
required this.onPressed,
this.heroTag,
}) : super(key: key);
});
final CollectibleData collectible;
final ValueSetter<CollectibleData> onPressed;

2
lib/ui/screens/collection/widgets/_collection_footer.dart
View File

@ -2,7 +2,7 @@ part of '../collection_screen.dart';
@immutable
class _CollectionFooter extends StatelessWidget {
const _CollectionFooter({Key? key, required this.count, required this.total}) : super(key: key);
const _CollectionFooter({super.key, required this.count, required this.total});
final int count;
final int total;

6
lib/ui/screens/collection/widgets/_collection_list.dart
View File

@ -3,11 +3,11 @@ part of '../collection_screen.dart';
@immutable
class _CollectionList extends StatefulWidget with GetItStatefulWidgetMixin {
_CollectionList({
Key? key,
super.key,
this.onReset,
required this.fromId,
this.scrollKey,
}) : super(key: key);
});
static const double _vtCardExtent = 300;
static const double _hzCardExtent = 600;
@ -63,7 +63,7 @@ class _CollectionListState extends State<_CollectionList> with GetItStateMixin {
fromId: widget.fromId,
data: d,
);
}).toList()
})
];
// Scroll view adapts to scroll vertically or horizontally
return SingleChildScrollView(

4
lib/ui/screens/collection/widgets/_collection_list_card.dart
View File

@ -1,7 +1,7 @@
part of '../collection_screen.dart';
class _CollectionListCard extends StatelessWidget with GetItMixin {
_CollectionListCard({Key? key, this.width, this.height, required this.data, required this.fromId}) : super(key: key);
_CollectionListCard({super.key, this.width, this.height, required this.data, required this.fromId});
final double? width;
final double? height;
@ -48,7 +48,7 @@ class _CollectionListCard extends StatelessWidget with GetItMixin {
heroTag: e.id == fromId ? 'collectible_image_$fromId' : null,
),
);
}).toList()
})
]),
)
],

2
lib/ui/screens/collection/widgets/_newly_discovered_items_btn.dart
View File

@ -2,7 +2,7 @@ part of '../collection_screen.dart';
@immutable
class _NewlyDiscoveredItemsBtn extends StatelessWidget {
const _NewlyDiscoveredItemsBtn({Key? key, this.count = 0, required this.onPressed}) : super(key: key);
const _NewlyDiscoveredItemsBtn({super.key, this.count = 0, required this.onPressed});
final int count;
final VoidCallback onPressed;

2
lib/ui/screens/editorial/editorial_screen.dart
View File

@ -38,7 +38,7 @@ part 'widgets/_title_text.dart';
part 'widgets/_top_illustration.dart';
class WonderEditorialScreen extends StatefulWidget {
const WonderEditorialScreen(this.data, {Key? key, required this.contentPadding}) : super(key: key);
const WonderEditorialScreen(this.data, {super.key, required this.contentPadding});
final WonderData data;
//final void Function(double scrollPos) onScroll;
final EdgeInsets contentPadding;

30
lib/ui/screens/editorial/widgets/_app_bar.dart
View File

@ -1,7 +1,7 @@
part of '../editorial_screen.dart';
class _AppBar extends StatelessWidget {
_AppBar(this.wonderType, {Key? key, required this.sectionIndex, required this.scrollPos}) : super(key: key);
_AppBar(this.wonderType, {super.key, required this.sectionIndex, required this.scrollPos});
final WonderType wonderType;
final ValueNotifier<int> sectionIndex;
final ValueNotifier<double> scrollPos;
@ -18,24 +18,16 @@ class _AppBar extends StatelessWidget {
];
ArchType _getArchType() {
switch (wonderType) {
case WonderType.chichenItza:
return ArchType.flatPyramid;
case WonderType.christRedeemer:
return ArchType.wideArch;
case WonderType.colosseum:
return ArchType.arch;
case WonderType.greatWall:
return ArchType.arch;
case WonderType.machuPicchu:
return ArchType.pyramid;
case WonderType.petra:
return ArchType.wideArch;
case WonderType.pyramidsGiza:
return ArchType.pyramid;
case WonderType.tajMahal:
return ArchType.spade;
}
return switch (wonderType) {
WonderType.chichenItza => ArchType.flatPyramid,
WonderType.christRedeemer => ArchType.wideArch,
WonderType.colosseum => ArchType.arch,
WonderType.greatWall => ArchType.arch,
WonderType.machuPicchu => ArchType.pyramid,
WonderType.petra => ArchType.wideArch,
WonderType.pyramidsGiza => ArchType.pyramid,
WonderType.tajMahal => ArchType.spade
};
}
@override

2
lib/ui/screens/editorial/widgets/_callout.dart
View File

@ -3,7 +3,7 @@ part of '../editorial_screen.dart';
class _Callout extends StatelessWidget {
final String text;
const _Callout({Key? key, required this.text}) : super(key: key);
const _Callout({super.key, required this.text});
@override
Widget build(BuildContext context) {
return IntrinsicHeight(

9
lib/ui/screens/editorial/widgets/_circular_title_bar.dart
View File

@ -1,9 +1,8 @@
part of '../editorial_screen.dart';
class _CircularTitleBar extends StatelessWidget {
const _CircularTitleBar({Key? key, required this.titles, required this.icons, required this.index})
: assert(titles.length == icons.length, 'The number of titles and icons do not match.'),
super(key: key);
const _CircularTitleBar({super.key, required this.titles, required this.icons, required this.index})
: assert(titles.length == icons.length, 'The number of titles and icons do not match.');
final List<String> titles;
final List<String> icons;
final int index;
@ -48,10 +47,10 @@ class _CircularTitleBar extends StatelessWidget {
class _AnimatedCircleWithText extends StatefulWidget {
const _AnimatedCircleWithText({
Key? key,
super.key,
required this.titles,
required this.index,
}) : super(key: key);
});
final List<String> titles;
final int index;

2
lib/ui/screens/editorial/widgets/_collapsing_pull_quote_image.dart
View File

@ -1,7 +1,7 @@
part of '../editorial_screen.dart';
class _CollapsingPullQuoteImage extends StatelessWidget {
const _CollapsingPullQuoteImage({Key? key, required this.scrollPos, required this.data}) : super(key: key);
const _CollapsingPullQuoteImage({super.key, required this.scrollPos, required this.data});
final ValueNotifier<double> scrollPos;
final WonderData data;

2
lib/ui/screens/editorial/widgets/_large_simple_quote.dart
View File

@ -1,7 +1,7 @@
part of '../editorial_screen.dart';
class _LargeSimpleQuote extends StatelessWidget {
const _LargeSimpleQuote({Key? key, required this.text, required this.author}) : super(key: key);
const _LargeSimpleQuote({super.key, required this.text, required this.author});
final String text;
final String author;

27
lib/ui/screens/editorial/widgets/_scrolling_content.dart
View File

@ -1,8 +1,7 @@
part of '../editorial_screen.dart';
class _ScrollingContent extends StatelessWidget {
const _ScrollingContent(this.data, {Key? key, required this.scrollPos, required this.sectionNotifier})
: super(key: key);
const _ScrollingContent(this.data, {super.key, required this.scrollPos, required this.sectionNotifier});
final WonderData data;
final ValueNotifier<double> scrollPos;
final ValueNotifier<int> sectionNotifier;
@ -64,16 +63,12 @@ class _ScrollingContent extends StatelessWidget {
Widget buildHiddenCollectible({required int slot}) {
List<WonderType> getTypesForSlot(slot) {
switch (slot) {
case 0:
return [WonderType.chichenItza, WonderType.colosseum];
case 1:
return [WonderType.pyramidsGiza, WonderType.petra];
case 2:
return [WonderType.machuPicchu, WonderType.christRedeemer];
default:
return [WonderType.tajMahal, WonderType.greatWall];
}
return switch (slot) {
0 => [WonderType.chichenItza, WonderType.colosseum],
1 => [WonderType.pyramidsGiza, WonderType.petra],
2 => [WonderType.machuPicchu, WonderType.christRedeemer],
_ => [WonderType.tajMahal, WonderType.greatWall]
};
}
return HiddenCollectible(
@ -166,7 +161,7 @@ class _ScrollingContent extends StatelessWidget {
}
class _YouTubeThumbnail extends StatelessWidget {
const _YouTubeThumbnail({Key? key, required this.id, required this.caption}) : super(key: key);
const _YouTubeThumbnail({super.key, required this.id, required this.caption});
final String id;
final String caption;
@ -217,7 +212,7 @@ class _YouTubeThumbnail extends StatelessWidget {
}
class _MapsThumbnail extends StatefulWidget {
const _MapsThumbnail(this.data, {Key? key}) : super(key: key);
const _MapsThumbnail(this.data, {super.key});
final WonderData data;
@override
@ -279,10 +274,10 @@ class _MapsThumbnailState extends State<_MapsThumbnail> {
class SliverBackgroundColor extends SingleChildRenderObjectWidget {
const SliverBackgroundColor({
Key? key,
super.key,
required this.color,
Widget? sliver,
}) : super(key: key, child: sliver);
}) : super(child: sliver);
final Color color;

2
lib/ui/screens/editorial/widgets/_section_divider.dart
View File

@ -1,7 +1,7 @@
part of '../editorial_screen.dart';
class _SectionDivider extends StatefulWidget {
const _SectionDivider(this.scrollNotifier, this.sectionNotifier, {Key? key, required this.index}) : super(key: key);
const _SectionDivider(this.scrollNotifier, this.sectionNotifier, {super.key, required this.index});
final int index;
final ValueNotifier<double> scrollNotifier;
final ValueNotifier<int> sectionNotifier;

2
lib/ui/screens/editorial/widgets/_sliding_image_stack.dart
View File

@ -1,7 +1,7 @@
part of '../editorial_screen.dart';
class _SlidingImageStack extends StatelessWidget {
const _SlidingImageStack({Key? key, required this.scrollPos, required this.type}) : super(key: key);
const _SlidingImageStack({super.key, required this.scrollPos, required this.type});
final ValueNotifier<double> scrollPos;
final WonderType type;

2
lib/ui/screens/editorial/widgets/_title_text.dart
View File

@ -1,7 +1,7 @@
part of '../editorial_screen.dart';
class _TitleText extends StatelessWidget {
const _TitleText(this.data, {Key? key, required this.scroller}) : super(key: key);
const _TitleText(this.data, {super.key, required this.scroller});
final WonderData data;
final ScrollController scroller;

2
lib/ui/screens/editorial/widgets/_top_illustration.dart
View File

@ -1,7 +1,7 @@
part of '../editorial_screen.dart';
class _TopIllustration extends StatelessWidget {
const _TopIllustration(this.type, {Key? key, this.fgOffset = Offset.zero}) : super(key: key);
const _TopIllustration(this.type, {super.key, this.fgOffset = Offset.zero});
final WonderType type;
final Offset fgOffset;

2
lib/ui/screens/home/widgets/_animated_arrow_button.dart
View File

@ -2,7 +2,7 @@ part of '../wonders_home_screen.dart';
/// An arrow that fades out, then fades back in and slides down, ending in it's original position with full opacity.
class _AnimatedArrowButton extends StatelessWidget {
_AnimatedArrowButton({Key? key, required this.onTap, required this.semanticTitle}) : super(key: key);
_AnimatedArrowButton({required this.onTap, required this.semanticTitle});
final String semanticTitle;
final VoidCallback onTap;

10
lib/ui/screens/home/wonders_home_screen.dart
View File

@ -17,7 +17,7 @@ part '_vertical_swipe_controller.dart';
part 'widgets/_animated_arrow_button.dart';
class HomeScreen extends StatefulWidget with GetItStatefulWidgetMixin {
HomeScreen({Key? key}) : super(key: key);
HomeScreen({super.key});
@override
State<HomeScreen> createState() => _HomeScreenState();
@ -64,7 +64,9 @@ class _HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateM
void _handlePageChanged(value) {
final newIndex = value % _numWonders;
if (newIndex == _wonderIndex) return; // Exit early if we're already on this page
if (newIndex == _wonderIndex) {
return; // Exit early if we're already on this page
}
setState(() {
_wonderIndex = newIndex;
settingsLogic.prevWonderIndex.value = _wonderIndex;
@ -195,7 +197,7 @@ class _HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateM
..._wonders.map((e) {
final config = WonderIllustrationConfig.bg(isShowing: _isSelected(e.type));
return WonderIllustration(e.type, config: config);
}).toList(),
}),
// Clouds
FractionallySizedBox(
widthFactor: 1,
@ -248,7 +250,7 @@ class _HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateM
onPlay: _handleFadeAnimInit,
child: IgnorePointer(child: WonderIllustration(e.type, config: config)));
});
}).toList(),
}),
/// Foreground gradient-2, gets darker when swiping up
BottomCenter(

2
lib/ui/screens/home_menu/about_dialog_content.dart
View File

@ -6,7 +6,7 @@ import 'package:wonders/logic/common/platform_info.dart';
import 'package:wonders/ui/common/modals/fullscreen_web_view.dart';
class AboutDialogContent extends StatelessWidget {
const AboutDialogContent({Key? key}) : super(key: key);
const AboutDialogContent({super.key});
@override
Widget build(BuildContext context) {

4
lib/ui/screens/home_menu/home_menu.dart
View File

@ -11,7 +11,7 @@ import 'package:wonders/ui/common/wonderous_logo.dart';
import 'package:wonders/ui/screens/home_menu/about_dialog_content.dart';
class HomeMenu extends StatefulWidget {
const HomeMenu({Key? key, required this.data}) : super(key: key);
const HomeMenu({super.key, required this.data});
final WonderData data;
@override
@ -188,7 +188,7 @@ class _HomeMenuState extends State<HomeMenu> {
}
class _MenuTextBtn extends StatelessWidget {
const _MenuTextBtn({Key? key, required this.label, required this.onPressed, required this.icon}) : super(key: key);
const _MenuTextBtn({required this.label, required this.onPressed, required this.icon});
final String label;
final VoidCallback onPressed;
final AppIcons icon;

6
lib/ui/screens/intro/intro_screen.dart
View File

@ -10,7 +10,7 @@ import 'package:wonders/ui/common/themed_text.dart';
import 'package:wonders/ui/common/utils/app_haptics.dart';
class IntroScreen extends StatefulWidget {
const IntroScreen({Key? key}) : super(key: key);
const IntroScreen({super.key});
@override
State<IntroScreen> createState() => _IntroScreenState();
@ -257,7 +257,7 @@ class _PageData {
}
class _Page extends StatelessWidget {
const _Page({Key? key, required this.data}) : super(key: key);
const _Page({required this.data});
final _PageData data;
@ -314,7 +314,7 @@ class _WonderousLogo extends StatelessWidget {
}
class _PageImage extends StatelessWidget {
const _PageImage({Key? key, required this.data}) : super(key: key);
const _PageImage({required this.data});
final _PageData data;

35
lib/ui/screens/photo_gallery/photo_gallery.dart
View File

@ -14,8 +14,7 @@ import 'package:wonders/ui/common/utils/app_haptics.dart';
part 'widgets/_animated_cutout_overlay.dart';
class PhotoGallery extends StatefulWidget {
const PhotoGallery({Key? key, this.imageSize, required this.collectionId, required this.wonderType})
: super(key: key);
const PhotoGallery({super.key, this.imageSize, required this.collectionId, required this.wonderType});
final Size? imageSize;
final String collectionId;
final WonderType wonderType;
@ -82,20 +81,12 @@ class _PhotoGalleryState extends State<PhotoGallery> {
/// Used for hiding collectibles around the photo grid.
int _getCollectibleIndex() {
switch (widget.wonderType) {
case WonderType.chichenItza:
case WonderType.petra:
return 0;
case WonderType.colosseum:
case WonderType.pyramidsGiza:
return _gridSize - 1;
case WonderType.christRedeemer:
case WonderType.machuPicchu:
return _imgCount - 1;
case WonderType.greatWall:
case WonderType.tajMahal:
return _imgCount - _gridSize;
}
return switch (widget.wonderType) {
WonderType.chichenItza || WonderType.petra => 0,
WonderType.colosseum || WonderType.pyramidsGiza => _gridSize - 1,
WonderType.christRedeemer || WonderType.machuPicchu => _imgCount - 1,
WonderType.greatWall || WonderType.tajMahal => _imgCount - _gridSize
};
}
bool _handleKeyDown(KeyDownEvent event) {
@ -132,9 +123,15 @@ class _PhotoGalleryState extends State<PhotoGallery> {
if (dir.dy != 0) newIndex += _gridSize * (dir.dy > 0 ? -1 : 1);
if (dir.dx != 0) newIndex += (dir.dx > 0 ? -1 : 1);
// After calculating new index, exit early if we don't like it...
if (newIndex < 0 || newIndex > _imgCount - 1) return; // keep the index in range
if (dir.dx < 0 && newIndex % _gridSize == 0) return; // prevent right-swipe when at right side
if (dir.dx > 0 && newIndex % _gridSize == _gridSize - 1) return; // prevent left-swipe when at left side
if (newIndex < 0 || newIndex > _imgCount - 1) {
return; // keep the index in range
}
if (dir.dx < 0 && newIndex % _gridSize == 0) {
return; // prevent right-swipe when at right side
}
if (dir.dx > 0 && newIndex % _gridSize == _gridSize - 1) {
return; // prevent left-swipe when at left side
}
_lastSwipeDir = dir;
AppHaptics.lightImpact();
_setIndex(newIndex);

4
lib/ui/screens/photo_gallery/widgets/_animated_cutout_overlay.dart
View File

@ -5,7 +5,7 @@ part of '../photo_gallery.dart';
/// Uses[_CutoutClipper] to create the cutout.
class _AnimatedCutoutOverlay extends StatelessWidget {
const _AnimatedCutoutOverlay({
Key? key,
super.key,
required this.child,
required this.cutoutSize,
required this.animationKey,
@ -13,7 +13,7 @@ class _AnimatedCutoutOverlay extends StatelessWidget {
required this.swipeDir,
required this.opacity,
required this.enabled,
}) : super(key: key);
});
final Widget child;
final Size cutoutSize;
final Key animationKey;

2
lib/ui/screens/timeline/timeline_screen.dart
View File

@ -29,7 +29,7 @@ part 'widgets/_year_markers.dart';
class TimelineScreen extends StatefulWidget {
final WonderType? type;
const TimelineScreen({Key? key, required this.type}) : super(key: key);
const TimelineScreen({super.key, required this.type});
@override
State<TimelineScreen> createState() => _TimelineScreenState();

3
lib/ui/screens/timeline/widgets/_bottom_scrubber.dart
View File

@ -2,8 +2,7 @@ part of '../timeline_screen.dart';
class _BottomScrubber extends StatelessWidget {
const _BottomScrubber(this.scroller,
{Key? key, required this.timelineMinSize, required this.size, required this.selectedWonder})
: super(key: key);
{super.key, required this.timelineMinSize, required this.size, required this.selectedWonder});
final ScrollController? scroller;
final double timelineMinSize;
final double size;

2
lib/ui/screens/timeline/widgets/_dashed_divider_with_year.dart
View File

@ -1,7 +1,7 @@
part of '../timeline_screen.dart';
class _DashedDividerWithYear extends StatelessWidget {
const _DashedDividerWithYear(this.year, {Key? key}) : super(key: key);
const _DashedDividerWithYear(this.year, {super.key});
final int year;
@override

7
lib/ui/screens/timeline/widgets/_event_markers.dart
View File

@ -3,8 +3,7 @@ part of '../timeline_screen.dart';
/// A vertically aligned stack of dots that represent global events
/// The event closest to the [selectedYr] param will be visible selected
class _EventMarkers extends StatefulWidget {
const _EventMarkers(this.selectedYr, {Key? key, required this.onEventChanged, required this.onMarkerPressed})
: super(key: key);
const _EventMarkers(this.selectedYr, {super.key, required this.onEventChanged, required this.onMarkerPressed});
final void Function(TimelineEvent? event) onEventChanged;
final void Function(TimelineEvent event) onMarkerPressed;
@ -114,11 +113,11 @@ class _EventMarkersState extends State<_EventMarkers> {
class _EventMarker extends StatelessWidget {
const _EventMarker(
this.offset, {
Key? key,
super.key,
required this.isSelected,
required this.event,
required this.onPressed,
}) : super(key: key);
});
final double offset;
final TimelineEvent event;
final bool isSelected;

2
lib/ui/screens/timeline/widgets/_event_popups.dart
View File

@ -1,7 +1,7 @@
part of '../timeline_screen.dart';
class _EventPopups extends StatefulWidget {
const _EventPopups({Key? key, required this.currentEvent}) : super(key: key);
const _EventPopups({super.key, required this.currentEvent});
final TimelineEvent? currentEvent;
@override

4
lib/ui/screens/timeline/widgets/_scrolling_viewport.dart
View File

@ -2,7 +2,7 @@ part of '../timeline_screen.dart';
class _ScrollingViewport extends StatefulWidget {
const _ScrollingViewport({
Key? key,
super.key,
// ignore: unused_element
this.onInit,
required this.scroller,
@ -10,7 +10,7 @@ class _ScrollingViewport extends StatefulWidget {
required this.maxSize,
required this.selectedWonder,
this.onYearChanged,
}) : super(key: key);
});
final double minSize;
final double maxSize;
final ScrollController scroller;

2
lib/ui/screens/timeline/widgets/_timeline_section.dart
View File

@ -1,7 +1,7 @@
part of '../timeline_screen.dart';
class TimelineSection extends StatelessWidget {
const TimelineSection(this.data, this.selectedYr, {Key? key, required this.selectedWonder}) : super(key: key);
const TimelineSection(this.data, this.selectedYr, {super.key, required this.selectedWonder});
final WonderData data;
final int selectedYr;
final WonderType? selectedWonder;

4
lib/ui/screens/timeline/widgets/_year_markers.dart
View File

@ -1,7 +1,7 @@
part of '../timeline_screen.dart';
class _YearMarkers extends StatelessWidget {
_YearMarkers({Key? key}) : super(key: key);
_YearMarkers({super.key});
int get startYr => wondersLogic.timelineStartYear;
int get endYr => wondersLogic.timelineEndYear;
@ -48,7 +48,7 @@ class _YearMarkers extends StatelessWidget {
}
class _YearMarker extends StatelessWidget {
const _YearMarker(this.yr, this.offset, {Key? key}) : super(key: key);
const _YearMarker(this.yr, this.offset, {super.key});
final int yr;
final double offset;

Some files were not shown because too many files have changed in this diff Show More