diff --git a/lib/explore/widgets/next_launch_card.dart b/lib/explore/widgets/next_launch_card.dart index 28a6461..43afd03 100644 --- a/lib/explore/widgets/next_launch_card.dart +++ b/lib/explore/widgets/next_launch_card.dart @@ -24,10 +24,7 @@ class NextLaunchCard extends StatelessWidget { @override Widget build(BuildContext context) { final doesExist = launch != null; - final launchDate = launch?.net; final timeLeft = launch?.net?.difference(DateTime.now()); - final launchName = launch?.name; - final launchStatus = launch?.status; final description = createShortDescription(launch?.mission?.description); return Column( @@ -39,7 +36,7 @@ class NextLaunchCard extends StatelessWidget { ), ExploreCard( title: const Text('Status'), - trailing: LaunchStatus(launchStatus), + trailing: LaunchStatus(launch?.status), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(kBorderRadius), ), @@ -51,9 +48,9 @@ class NextLaunchCard extends StatelessWidget { ), const Spacer(), CountdownTimer( - launchDate: launchDate, + launchDate: launch?.net, // TODO(ivirtex): use netPrecision instead - mode: launchStatus?.abbrev == StatusAbbrev.go && + mode: launch?.status?.abbrev == StatusAbbrev.go && timeLeft! < 24.hours ? CountdownTimerMode.hoursMinutesSeconds : CountdownTimerMode.daysHoursMinutes, @@ -64,7 +61,7 @@ class NextLaunchCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ Text( - launchName ?? 'Unknown', + launch?.name ?? 'Unknown', style: Theme.of(context).textTheme.titleLarge, ), const SizedBox(height: kListSpacing), diff --git a/lib/settings/view/settings_page.dart b/lib/settings/view/settings_page.dart index aca4c82..1e74ee5 100644 --- a/lib/settings/view/settings_page.dart +++ b/lib/settings/view/settings_page.dart @@ -99,10 +99,9 @@ class _SettingsViewState extends State { ), SwitchListTile( secondary: const Icon(Icons.star_rounded), - title: const Text('Notices and closures at Starbase'), + title: const Text('Notices and closures at Starbase (Beta)'), value: _areStarbaseNotificationsEnabled, onChanged: (isEnabled) { - // TODO(ivirtex): set up with Adapty setState(() { _areStarbaseNotificationsEnabled = isEnabled;