Skip to content

Commit

Permalink
Merge branch 'main' into beacon
Browse files Browse the repository at this point in the history
  • Loading branch information
RunTerror authored Feb 22, 2024
2 parents 4d7f627 + 712acae commit 9fdf963
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/components/hike_screen_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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.
Expand Down
11 changes: 11 additions & 0 deletions lib/services/local_notification.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ class LocalNotification {
}

Future<void> scheduleNotification(Beacon beacon) async {

tz.TZDateTime scheduledDate1 = await tz.TZDateTime.from(

var scheduledDate1 = await tz.TZDateTime.from(

DateTime.fromMillisecondsSinceEpoch(beacon.startsAt!), tz.local);
await flutterLocalNotificationsPlugin.zonedSchedule(
beacon.id.hashCode,
Expand Down Expand Up @@ -83,10 +87,17 @@ class LocalNotification {
tz.local,
).subtract(Duration(hours: 1));


// We will check if beacon start time is less than the 2nd notification scheduling time

if (scheduledDate2.compareTo(scheduledDate1) < 0) return;

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',
Expand Down

0 comments on commit 9fdf963

Please sign in to comment.