Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create Hikes immediately #83

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Create Hikes immediately #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fbc9577
model changes
ItsAdityaKSingh Jan 21, 2022
e1b3fc8
reduced time by a minute
ItsAdityaKSingh Jan 21, 2022
ebfa19b
snackbar changes
ItsAdityaKSingh Jan 21, 2022
7dfecb6
punctuation
ItsAdityaKSingh Jan 21, 2022
41d6eb8
Merge branch 'main' into now_time
ItsAdityaKSingh Jan 24, 2022
efa0553
Merge branch 'CCExtractor:main' into now_time
ItsAdityaKSingh Jan 29, 2022
8e172fe
Merge branch 'main' into now_time
ItsAdityaKSingh Mar 7, 2022
fb8f388
fix: create hikes immediately
ItsAdityaKSingh Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/components/create_join_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,10 @@ class CreateJoinBeaconDialog {
model.startingTime.minute,
);
// localNotif.scheduleNotification();
if (model.startsAt.isBefore(DateTime.now())) {
if (model.startsAt.isBefore(DateTime.now()
.subtract(Duration(minutes: 1)))) {
navigationService.showSnackBar(
"Enter a valid date and time!!");
"Enter a valid date and time!");
return;
}
model.createHikeRoom();
Expand Down
21 changes: 12 additions & 9 deletions lib/view_model/home_view_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,18 @@ class HomeViewModel extends BaseModel {
hasStarted = DateTime.now()
.isAfter(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt));
if (hasStarted) {
navigationService.pushScreen('/hikeScreen',
arguments: HikeScreen(
beacon,
isLeader: true,
));
navigationService.pushScreen(
'/hikeScreen',
arguments: HikeScreen(
beacon,
isLeader: true,
),
);
} else {
localNotif.scheduleNotification(beacon);
setState(ViewState.idle);
navigationService.showSnackBar(
'Beacon has not yet started! \nPlease come back at ${DateFormat("hh:mm a, d/M/y").format(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt)).toString()}',
'Yay! New beacon created for ${DateFormat("hh:mm a, d/M/y").format(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt)).toString()}',
);
return;
}
Expand All @@ -74,10 +76,11 @@ class HomeViewModel extends BaseModel {
if (beacon != null) {
hasStarted = DateTime.now()
.isAfter(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt));

if (hasStarted) {
navigationService.pushScreen('/hikeScreen',
arguments: HikeScreen(beacon, isLeader: false));
navigationService.pushScreen(
'/hikeScreen',
arguments: HikeScreen(beacon, isLeader: false),
);
} else {
localNotif.scheduleNotification(beacon);
setState(ViewState.idle);
Expand Down