Skip to content

Commit

Permalink
Pulled Changes From CCExtractor#211
Browse files Browse the repository at this point in the history
  • Loading branch information
afjal1 committed Feb 10, 2024
1 parent f55ff72 commit ea82e58
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 32 deletions.
3 changes: 1 addition & 2 deletions lib/components/beacon_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ class BeaconCustomWidgets {
));
} else {
await databaseFunctions.init();
final Beacon? _beacon =
await databaseFunctions.joinBeacon(beacon.shortcode!);
await databaseFunctions.joinBeacon(beacon.shortcode!);
if (!hasStarted) {
navigationService.showSnackBar(
'Beacon has not yet started! \nPlease come back at ${DateFormat("hh:mm a, d/M/y").format(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt!)).toString()}',
Expand Down
3 changes: 1 addition & 2 deletions lib/components/group_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ class GroupCustomWidgets {
));
} else {
await databaseFunctions.init();
final Group? _group =
await databaseFunctions.joinGroup(group.shortcode!);
await databaseFunctions.joinGroup(group.shortcode!);
navigationService.pushScreen('/groupScreen',
arguments: GroupScreen(group));
//Snackbar is displayed by joinBeacon itself on any error or trying to join expired beacon.
Expand Down
2 changes: 1 addition & 1 deletion lib/services/shared_preference_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class SharedPreferenceService {
Future<bool> getSharedPreferencesInstance() async {
_prefs = await SharedPreferences.getInstance().catchError((e) {
print("shared preferences error : $e");
//return false;
// return false;
});
return true;
}
Expand Down
4 changes: 3 additions & 1 deletion lib/view_model/auth_screen_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ class AuthViewModel extends BaseModel {
signupValidate = AutovalidateMode.disabled;
databaseFunctions.init();
final String signUpSuccess = await databaseFunctions.signup(
name: signupNameController.text ?? "Anonymous",
name: signupNameController.text.isEmpty
? "Anonymous"
: signupNameController.text,
email: signupEmailController.text,
password: signupPasswordController.text);
if (signUpSuccess == logSuccess) {
Expand Down
3 changes: 1 addition & 2 deletions lib/view_model/hike_screen_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ class HikeScreenViewModel extends BaseModel {
else {
if (beacon!.leader!.id == userConfig.currentUser.id) {
await databaseFunctions.init();
final changedLeader =
databaseFunctions.changeLeader(beacon!.id!, newLeaderID);
await databaseFunctions.changeLeader(beacon!.id!, newLeaderID);
beacon!.leader!.id = newLeaderID;
Fluttertoast.showToast(msg: 'Beacon handed over to $newLeaderName');
notifyListeners();
Expand Down
2 changes: 1 addition & 1 deletion pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1399,5 +1399,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.2.0 <4.0.0"
dart: ">=3.2.3 <4.0.0"
flutter: ">=3.16.0"
46 changes: 23 additions & 23 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,42 @@ publish_to: "none"
version: 1.0.0+1

environment:
sdk: ">=3.1.2 <4.0.0"
sdk: ">=3.2.3 <4.0.0"

dependencies:
connectivity_plus: ^3.0.2
cupertino_icons: ^1.0.2
data_connection_checker: ^0.3.4
connectivity_plus: ^5.0.2
cupertino_icons: ^1.0.6
data_connection_checker_nulls: ^0.0.2
date_time_picker: ^2.1.0
duration_picker: ^1.1.1
duration_picker: ^1.1.0+1
flutter:
sdk: flutter
flutter_animarker: ^3.2.0
flutter_config: ^2.0.2
flutter_countdown_timer: ^4.1.0
flutter_local_notifications: ^13.0.0
flutter_polyline_points: ^1.0.0
flutter_spinkit: ^5.1.0
fluttertoast: ^8.0.8
flutter_local_notifications: ^16.3.2
flutter_polyline_points: ^2.0.0
flutter_spinkit: ^5.2.0
fluttertoast: ^8.2.4
geocoder:
git:
url: https://github.com/nguyenxdat/flutter_geocoder.git
ref: 443b875d8ec80ce525cc6e8f17dfbbbbe7fa3028
geolocator: ^9.0.2
get_it: ^7.2.0
google_maps_flutter: ^2.0.5
graphql_flutter: ^5.1.0
hive: ^2.0.4
geolocator: ^10.1.0
get_it: ^7.6.7
google_maps_flutter: ^2.5.3
graphql_flutter: ^5.1.2
hive: ^2.2.3
intl: ^0.17.0
location: ^4.3.0
mockito: ^5.3.2
modal_progress_hud: ^0.1.3
overlay_support: ^2.0.1
path_provider: ^2.0.9
provider: ^6.0.3
rxdart: ^0.27.3
share_plus: ^6.3.0
shared_preferences: ^2.0.13
location: ^5.0.3
mockito: ^5.4.4
modal_progress_hud_nsn: ^0.5.1
overlay_support: ^2.1.0
path_provider: ^2.1.2
provider: ^6.1.1
rxdart: ^0.27.7
share_plus: ^7.2.2
shared_preferences: ^2.2.2
sizer: ^2.0.15
skeleton_text: ^3.0.1
sliding_up_panel: ^2.0.0+1
Expand Down

0 comments on commit ea82e58

Please sign in to comment.