pushing formatting

CCExtractor · May 8, 2024 · d525933 · d525933
2 parents 587a00b + 712acae
commit d525933
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/old/components/hike_screen_widget.dart b/lib/old/components/hike_screen_widget.dart
@@ -30,6 +30,8 @@ class HikeScreenWidget extends ChangeNotifier {
 
  static Widget shareButton(BuildContext context, String? passkey) {
  return FloatingActionButton(
+ heroTag:
+ 'shareRouteTag', //had to pass this tag else we would get error since there will be two FAB in the same subtree with the same tag.
  onPressed: () {
  showDialog(
  context: context,
@@ -104,7 +106,7 @@ class HikeScreenWidget extends ChangeNotifier {
  ) {
  return FloatingActionButton(
  heroTag:
- 'shareRouteTag', //had to pass this tag else we would get error since there will be two FAB in the same subtree with the same tag.
+ 'shareRouteTag1', //had to pass this tag else we would get error since there will be two FAB in the same subtree with the same tag.
  onPressed: () async {
  final mapController = await googleMapControllerCompleter.future;
  // sanity check.

diff --git a/lib/old/components/services/local_notification.dart b/lib/old/components/services/local_notification.dart
@@ -48,13 +48,13 @@ class LocalNotification {
  }
 
  Future<void> scheduleNotification(Beacon beacon) async {
- var scheduledDate = await tz.TZDateTime.from(
+ var scheduledDate1 = await tz.TZDateTime.from(
  DateTime.fromMillisecondsSinceEpoch(beacon.startsAt!), tz.local);
  await flutterLocalNotificationsPlugin.zonedSchedule(
  beacon.id.hashCode,
  'Hike ' + beacon.title! + ' has started',
  'Click here to join!',
- scheduledDate,
+ scheduledDate1,
  NotificationDetails(
  android: AndroidNotificationDetails(
  'channel id',
@@ -78,15 +78,21 @@ class LocalNotification {
  );
  // We have to check if the hike is after 1 hour or not
 
- scheduledDate = await tz.TZDateTime.from(
+ var scheduledDate2 = await tz.TZDateTime.from(
  DateTime.fromMillisecondsSinceEpoch(beacon.startsAt!),
  tz.local,
  ).subtract(Duration(hours: 1));
+
+ if (!scheduledDate2.isAfter(tz.TZDateTime.from(
+ DateTime.fromMillisecondsSinceEpoch(beacon.startsAt!), tz.local))) {
+ return;
+ }
+
  await flutterLocalNotificationsPlugin.zonedSchedule(
  beacon.id.hashCode,
  'Reminder: ' + beacon.title! + ' will start in an hour',
  'Get Ready!',
- scheduledDate,
+ scheduledDate2,
  NotificationDetails(
  android: AndroidNotificationDetails(
  'channel id',