Merge branch 'main' into feature/routing_fixes

# Conflicts:
#	lib/router.dart
#	pubspec.lock
#	pubspec.yaml
This commit is contained in:
Shawn
2024-01-18 12:04:11 -07:00
33 changed files with 674 additions and 1108 deletions

View File

@ -80,7 +80,7 @@ WondersLogic get wondersLogic => GetIt.I.get<WondersLogic>();
TimelineLogic get timelineLogic => GetIt.I.get<TimelineLogic>();
SettingsLogic get settingsLogic => GetIt.I.get<SettingsLogic>();
UnsplashLogic get unsplashLogic => GetIt.I.get<UnsplashLogic>();
ArtifactAPILogic get metAPILogic => GetIt.I.get<ArtifactAPILogic>();
ArtifactAPILogic get artifactLogic => GetIt.I.get<ArtifactAPILogic>();
CollectiblesLogic get collectiblesLogic => GetIt.I.get<CollectiblesLogic>();
LocaleLogic get localeLogic => GetIt.I.get<LocaleLogic>();