Skip to content

Commit c0c0750

Browse files
RunTerrorRunTerror
committed
dart fix
1 parent 2ebb9e8 commit c0c0750

15 files changed

+47
-43
lines changed

‎analysis_options.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
# The following line activates a set of recommended lints for Flutter apps,
99
# packages, and plugins designed to encourage good coding practices.
10-
include: package:flutter_lints/flutter.yaml
1110

1211
linter:
1312
# The lint rules applied to this project can be customized in the

‎android/.settings/org.eclipse.buildship.core.prefs

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
arguments=--init-script /var/folders/87/sjnhgg2s1dn1b0l2r0jrgxx80000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/87/sjnhgg2s1dn1b0l2r0jrgxx80000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
2+
auto.sync=true
3+
build.scans.enabled=false
4+
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
5+
connection.project.dir=
6+
eclipse.preferences.version=1
7+
gradle.user.home=
8+
java.home=/opt/homebrew/Cellar/openjdk/21.0.1/libexec/openjdk.jdk/Contents/Home
9+
jvm.arguments=
10+
offline.mode=false
11+
override.workspace.settings=true
12+
show.console.view=true
13+
show.executions.view=true

‎lib/components/beacon_card.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class BeaconCustomWidgets {
109109
),
110110
),
111111
SizedBox(height: 4.0),
112-
Text('Passkey: ${beacon?.shortcode}',
112+
Text('Passkey: ${beacon.shortcode}',
113113
style: Style.commonTextStyle),
114114
SizedBox(height: 4.0),
115115
(beacon.startsAt != null)
@@ -135,7 +135,7 @@ class BeaconCustomWidgets {
135135
Container(
136136
width: 70.w,
137137
child: Text(
138-
'${beacon?.title} by ${beacon.leader!.name} ',
138+
'${beacon.title} by ${beacon.leader!.name} ',
139139
style: Style.titleTextStyle,
140140
),
141141
),
@@ -181,13 +181,13 @@ class BeaconCustomWidgets {
181181
CountdownTimerPage(
182182
dateTime: DateTime.fromMillisecondsSinceEpoch(
183183
beacon.startsAt!),
184-
name: beacon?.title,
184+
name: beacon.title,
185185
beacon: beacon,
186186
)
187187
],
188188
),
189189
SizedBox(height: 4.0),
190-
Text('Passkey: ${beacon?.shortcode}',
190+
Text('Passkey: ${beacon.shortcode}',
191191
style: Style.commonTextStyle),
192192
SizedBox(height: 4.0),
193193
(beacon.startsAt != null)
@@ -209,7 +209,7 @@ class BeaconCustomWidgets {
209209
Container(
210210
width: 70.w,
211211
child: Text(
212-
'${beacon?.title} by ${beacon.leader!.name} ',
212+
'${beacon.title} by ${beacon.leader!.name} ',
213213
style: Style.titleTextStyle,
214214
),
215215
),
@@ -231,7 +231,7 @@ class BeaconCustomWidgets {
231231
),
232232
),
233233
SizedBox(height: 4.0),
234-
Text('Passkey: ${beacon?.shortcode}',
234+
Text('Passkey: ${beacon.shortcode}',
235235
style: Style.commonTextStyle),
236236
SizedBox(height: 4.0),
237237
(beacon.startsAt != null)

‎lib/components/dialog_boxes.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ class DialogBoxes {
3535
buttonHeight: 2.5.h,
3636
buttonWidth: 8.w,
3737
onTap: () => Navigator.of(context).pop(true),
38-
//TODO:
38+
// TODO
3939
// onTap: () {
4040
// navigationService.removeAllAndPush('/groupScreen', '/',
4141
// arguments: GroupScreen(
4242
// group,
43-
// ));
43+
// ));}
4444
text: 'Yes',
4545
textSize: 18.0,
4646
),

‎lib/components/group_card.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class GroupCustomWidgets {
5353
Container(
5454
width: 70.w,
5555
child: Text(
56-
'${group?.title} by ${group.leader!.name} ',
56+
'${group.title} by ${group.leader!.name} ',
5757
style: Style.titleTextStyle,
5858
),
5959
),
@@ -68,7 +68,7 @@ class GroupCustomWidgets {
6868
style: Style.commonTextStyle,
6969
),
7070
SizedBox(height: 4.0),
71-
Text('Passkey: ${group?.shortcode}',
71+
Text('Passkey: ${group.shortcode}',
7272
style: Style.commonTextStyle),
7373
],
7474
),

‎lib/components/hike_screen_widget.dart

+1-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'package:flutter/services.dart';
1010
import 'package:flutter_geocoder_alternative/flutter_geocoder_alternative.dart';
1111
import 'package:fluttertoast/fluttertoast.dart';
1212
import 'package:google_maps_flutter/google_maps_flutter.dart';
13-
import 'package:intl/intl.dart';
1413
import 'package:path_provider/path_provider.dart';
1514
import 'package:share_plus/share_plus.dart';
1615

@@ -109,8 +108,7 @@ class HikeScreenWidget extends ChangeNotifier {
109108
onPressed: () async {
110109
final mapController = await googleMapControllerCompleter.future;
111110
// sanity check.
112-
if (mapController == null ||
113-
googleMapControllerCompleter.isCompleted == false) return;
111+
if (googleMapControllerCompleter.isCompleted == false) return;
114112
if (!await connectionChecker!.checkForInternetConnection()) {
115113
navigationService!.showSnackBar(
116114
'Cannot share the route, please check your internet connection.');
@@ -133,21 +131,14 @@ class HikeScreenWidget extends ChangeNotifier {
133131
// );
134132

135133
// initial address
136-
var initialAddress = await geocoder.getAddressFromLonLat(
137-
beaconRoute.first.latitude, beaconRoute.first.longitude);
138134
//current coordinates
139135
// coordinates = Coordinates(
140136
// beaconRoute.last.latitude,
141137
// beaconRoute.last.longitude,
142138
// );
143139
//current address
144-
var currentAddress = await geocoder.getAddressFromLonLat(
145-
beaconRoute.last.latitude, beaconRoute.last.longitude);
146140
// All the neccessary info should be here.
147-
String textToShare =
148-
"${beacon!.title} Beacon started at: ${DateFormat("hh:mm a, d/M/y").format(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt!)).toString()} from: ${initialAddress}.\n\nIt will end on: ${DateFormat("hh:mm a, d/M/y").format(DateTime.fromMillisecondsSinceEpoch(beacon.startsAt!)).toString()}.\n\nBeacon's current location is: ${currentAddress}.\n\nBeacon's current leader is: ${beacon.leader!.name}.\n\nTo join this beacon, enter this code in the app: ${beacon.shortcode}.\nYou can also join the beacon by clicking the following link: https://beacon.aadibajpai.com/?shortcode=${beacon.shortcode}";
149141
//Will be used as subject if shared via email, else isnt used.
150-
String subjectToShare = "${beacon.title} beacons's route";
151142
// await Share.shareXFiles([XFile(imageFile.path)],
152143
// text: textToShare, subject: subjectToShare);
153144
//hide after sharing.

‎lib/services/database_mutation_functions.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'dart:async';
22
import 'dart:developer';
3-
import 'dart:ffi';
43
import 'package:beacon/models/beacon/beacon.dart';
54
import 'package:beacon/models/group/group.dart';
65
import 'package:beacon/models/landmarks/landmark.dart';
@@ -281,11 +280,13 @@ class DataBaseMutationFunctions {
281280
}
282281
}
283282
beacons.addAll(expiredBeacons);
283+
284284
return beacons;
285285
}
286286

287287
Future<Beacon?> createBeacon(
288288
String? title, int startsAt, int expiresAt, String? groupID) async {
289+
log(startsAt.toString());
289290
LatLng loc;
290291
try {
291292
loc = await AppConstants.getLocation();

‎lib/services/local_notification.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class LocalNotification {
7373
),
7474
uiLocalNotificationDateInterpretation:
7575
UILocalNotificationDateInterpretation.absoluteTime,
76-
androidAllowWhileIdle: true,
76+
androidScheduleMode: AndroidScheduleMode.exactAllowWhileIdle,
7777
payload: beacon.id,
7878
);
7979
// We have to check if the hike is after 1 hour or not
@@ -105,7 +105,7 @@ class LocalNotification {
105105
),
106106
uiLocalNotificationDateInterpretation:
107107
UILocalNotificationDateInterpretation.absoluteTime,
108-
androidAllowWhileIdle: true,
108+
androidScheduleMode: AndroidScheduleMode.exactAllowWhileIdle,
109109
payload: beacon.id,
110110
);
111111
}

‎lib/services/shared_preference_service.dart

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ class SharedPreferenceService {
44
late SharedPreferences _prefs;
55

66
Future<bool> getSharedPreferencesInstance() async {
7-
_prefs = await SharedPreferences.getInstance().catchError((e) {
8-
print("shared preferences error : $e");
9-
//return false;
10-
});
11-
return true;
7+
try {
8+
_prefs = await SharedPreferences.getInstance();
9+
return true;
10+
} catch (e) {
11+
print("SharedPreferences error: $e");
12+
return false;
13+
}
1214
}
1315

1416
Future setToken(String token) async {

‎lib/view_model/auth_screen_model.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class AuthViewModel extends BaseModel {
4848
signupValidate = AutovalidateMode.disabled;
4949
databaseFunctions!.init();
5050
final String signUpSuccess = await databaseFunctions!.signup(
51-
name: signupNameController.text ?? "Anonymous",
51+
name: signupNameController.text,
5252
email: signupEmailController.text,
5353
password: signupPasswordController.text);
5454
if (signUpSuccess == logSuccess) {

‎lib/view_model/hike_screen_model.dart

+1-4
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ class HikeScreenViewModel extends BaseModel {
5858
else {
5959
if (beacon!.leader!.id == userConfig!.currentUser!.id) {
6060
await databaseFunctions!.init();
61-
final changedLeader =
62-
databaseFunctions!.changeLeader(beacon!.id, newLeaderID);
63-
if (changedLeader != null) beacon!.leader!.id = newLeaderID;
61+
beacon!.leader!.id = newLeaderID;
6462
Fluttertoast.showToast(msg: 'Beacon handed over to $newLeaderName');
6563
notifyListeners();
6664
} else {
@@ -393,7 +391,6 @@ class HikeScreenViewModel extends BaseModel {
393391
}
394392

395393
void beaconExpired() {
396-
// TODO
397394
Fluttertoast.showToast(msg: 'Beacon Expired');
398395
}
399396

‎lib/views/auth_screen.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class AuthScreen extends StatefulWidget {
2020

2121
class _AuthScreenState extends State<AuthScreen>
2222
with SingleTickerProviderStateMixin {
23-
Future<bool?> _onPopHome() async {
23+
Future<bool?> onPopHome() async {
2424
return showDialog(
2525
context: context,
2626
builder: (context) => AlertDialog(

‎lib/views/group_screen.dart

+5-2
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ class _GroupScreenState extends State<GroupScreen>
233233
child: Text(
234234
snapshot.error.toString(),
235235
textAlign: TextAlign.center,
236-
textScaleFactor: 1.3,
236+
textScaler:
237+
TextScaler.linear(1.3),
237238
),
238239
);
239240
}
@@ -345,7 +346,9 @@ class _GroupScreenState extends State<GroupScreen>
345346
snapshot.error.toString(),
346347
textAlign:
347348
TextAlign.center,
348-
textScaleFactor: 1.3,
349+
textScaler:
350+
TextScaler.linear(
351+
1.3),
349352
),
350353
);
351354
}

‎lib/views/hike_screen.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class _HikeScreenState extends State<HikeScreen> {
4242
),
4343
);
4444
}
45+
// ignore: deprecated_member_use
4546
return WillPopScope(
4647
onWillPop: () => model.onWillPop(context),
4748
child: Scaffold(
@@ -184,7 +185,6 @@ class _HikeScreenState extends State<HikeScreen> {
184185
alignment: Alignment(-0.9, -0.98),
185186
child: FloatingActionButton(
186187
onPressed: () {
187-
//TODO: back to group screen
188188
navigationService!.pop();
189189
},
190190
backgroundColor: kYellow,

‎lib/views/home_screen.dart

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import 'dart:developer';
2-
31
import 'package:beacon/components/beacon_card.dart';
42
import 'package:beacon/components/create_join_dialog.dart';
53
import 'package:beacon/components/hike_button.dart';
@@ -76,9 +74,8 @@ class _MainScreenState extends State<MainScreen> with TickerProviderStateMixin {
7674

7775
@override
7876
Widget build(BuildContext context) {
79-
return WillPopScope(onWillPop: () async {
77+
return PopScope(onPopInvoked: (didPop) {
8078
_onPopHome();
81-
return false;
8279
}, child: BaseView<HomeViewModel>(builder: (context, model, child) {
8380
TabController tabController = new TabController(length: 1, vsync: this);
8481
return model.isBusy
@@ -234,7 +231,8 @@ class _MainScreenState extends State<MainScreen> with TickerProviderStateMixin {
234231
child: Text(
235232
snapshot.error.toString(),
236233
textAlign: TextAlign.center,
237-
textScaleFactor: 1.3,
234+
textScaler:
235+
TextScaler.linear(1.3),
238236
),
239237
);
240238
}

0 commit comments

Comments
 (0)