Skip to content

Commit 86a93bb

Browse files
authored
Merge branch 'main' into gas_sensor_mq-135
2 parents 1531932 + 43d7eb6 commit 86a93bb

4 files changed

Lines changed: 31 additions & 22 deletions

File tree

lib/view/about_us_screen.dart

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Widget buildContactList(List<Map<String, dynamic>> items) {
3636
if (await canLaunchUrl(uri)) {
3737
await launchUrl(uri);
3838
} else {
39-
debugPrint('Could not launch ${item['url']}');
39+
logger.e('Could not launch URL: ${item['url']}');
4040
}
4141
},
4242
);
@@ -135,7 +135,14 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
135135
style: const TextStyle(fontSize: 15),
136136
),
137137
onTap: () async {
138-
await launchUrl(Uri.parse(appLocalizations.feedbackForm));
138+
final uri = Uri.parse(appLocalizations.feedbackForm);
139+
if (await canLaunchUrl(uri)) {
140+
await launchUrl(uri);
141+
} else {
142+
logger.e(
143+
'Could not launch feedback form URL: ${appLocalizations.feedbackForm}',
144+
);
145+
}
139146
},
140147
),
141148
const Divider(thickness: 0.5),
@@ -162,7 +169,8 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
162169
);
163170
} else if (snapshot.hasError) {
164171
logger.e(
165-
"Error getting version information: ${snapshot.error.toString()}");
172+
"Error getting version information: ${snapshot.error.toString()}",
173+
);
166174
return Text(
167175
appLocalizations.error,
168176
style: const TextStyle(fontSize: 15),

lib/view/faq_screen.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:pslab/l10n/app_localizations.dart';
3+
import 'package:pslab/others/logger_service.dart';
34
import 'package:pslab/providers/locator.dart';
45
import 'package:pslab/theme/colors.dart';
56
import 'package:pslab/view/widgets/main_scaffold_widget.dart';
@@ -147,7 +148,7 @@ class FAQScreen extends StatelessWidget {
147148
if (await canLaunchUrl(uri)) {
148149
await launchUrl(uri);
149150
} else {
150-
throw '${appLocalizations.launchError} $url';
151+
logger.e('${appLocalizations.launchError} $url');
151152
}
152153
}
153154
}

pubspec.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,10 @@ packages:
356356
dependency: "direct main"
357357
description:
358358
name: flutter_map
359-
sha256: "03b71c02806ff20c3718d108cbbb3638142ebafe368d8ce2dd22a33344bcb02b"
359+
sha256: ce1debbb29cade61964334b2a19c7c76e5bb2ef7dacf126c6424ee44036232f8
360360
url: "https://pub.dev"
361361
source: hosted
362-
version: "8.3.0"
362+
version: "8.3.1"
363363
flutter_oss_licenses:
364364
dependency: "direct dev"
365365
description:
@@ -632,10 +632,10 @@ packages:
632632
dependency: "direct main"
633633
description:
634634
name: latlong2
635-
sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe"
635+
sha256: "84b776b100a84a684a0aaa3fa4dc2c9b1931c658de533701ee4e09bfa991f8dc"
636636
url: "https://pub.dev"
637637
source: hosted
638-
version: "0.9.1"
638+
version: "0.10.1"
639639
leak_tracker:
640640
dependency: transitive
641641
description:
@@ -984,26 +984,26 @@ packages:
984984
dependency: "direct main"
985985
description:
986986
name: record
987-
sha256: d28ec249ee4af6753a68a7a5077d6a2eee71e38dc61a241724aded53263274ba
987+
sha256: "82539d1372e23cf51375fdfcba084f39912bcbf9a953b75d56596691f8f11c0f"
988988
url: "https://pub.dev"
989989
source: hosted
990-
version: "7.1.0"
990+
version: "7.1.1"
991991
record_android:
992992
dependency: transitive
993993
description:
994994
name: record_android
995-
sha256: "6722be803d8b2a0945112d69cfbda1391970c5cff2cb53c16afd307a6b7ef0c4"
995+
sha256: "28f1108626a190e249b01ffa9f639070e31e5157474b64a5ae380bf36aec9559"
996996
url: "https://pub.dev"
997997
source: hosted
998-
version: "2.1.1"
998+
version: "2.1.2"
999999
record_ios:
10001000
dependency: transitive
10011001
description:
10021002
name: record_ios
1003-
sha256: de6f660b02c2a909c963d5c3c929fdf100b03cea9e5552599d0e5ae1b7d1a89d
1003+
sha256: "21d189f49a598af4697dac4cc9e48389ac0a1fb3e916622b5504a58d9b96313e"
10041004
url: "https://pub.dev"
10051005
source: hosted
1006-
version: "2.1.0"
1006+
version: "2.1.1"
10071007
record_linux:
10081008
dependency: transitive
10091009
description:
@@ -1016,10 +1016,10 @@ packages:
10161016
dependency: transitive
10171017
description:
10181018
name: record_macos
1019-
sha256: "9c29a7efdace0662db2aa7284873d49f8b48992432db3b5f0d38cbe2da8eecde"
1019+
sha256: ced7495abf3d683e8a7dbe8fc96df8ea5722837a26f922b7cb7c5de11661bb46
10201020
url: "https://pub.dev"
10211021
source: hosted
1022-
version: "2.1.0"
1022+
version: "2.1.1"
10231023
record_platform_interface:
10241024
dependency: transitive
10251025
description:
@@ -1032,18 +1032,18 @@ packages:
10321032
dependency: transitive
10331033
description:
10341034
name: record_web
1035-
sha256: "9d2d43162afff63d8608eb09c2982b9c6898dd8fbf5b05395ca7d08305b6db40"
1035+
sha256: "7d75ed681b5bf40c3a9b51b6c105fe53705f752284d859d5f030ab5a2bfd49cf"
10361036
url: "https://pub.dev"
10371037
source: hosted
1038-
version: "2.1.0"
1038+
version: "2.1.1"
10391039
record_windows:
10401040
dependency: transitive
10411041
description:
10421042
name: record_windows
1043-
sha256: a1db1c0b996acd4161a93cc412b81a2a09a4fd7161c6353f32bf97683003b52f
1043+
sha256: "39ca03e7ae4df5e2512bc3c92b0ef9a7b148d9295ae8ac92df6beb4daf939d94"
10441044
url: "https://pub.dev"
10451045
source: hosted
1046-
version: "2.1.0"
1046+
version: "2.2.0"
10471047
retry:
10481048
dependency: transitive
10491049
description:

pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525
url: https://github.com/marcnause/usbserial.git
2626
ref: master
2727
get_it: ^9.2.1
28-
record: ^7.1.0
28+
record: ^7.1.1
2929
data: ^0.15.1
3030
logger: ^2.7.0
3131
url_launcher: ^6.3.2
@@ -47,7 +47,7 @@ dependencies:
4747
flusbserial: ^0.6.0
4848
inno_bundle: ^0.11.2
4949
flutter_map: ^8.3.0
50-
latlong2: ^0.9.1
50+
latlong2: ^0.10.1
5151
geolocator: ^14.0.3
5252
wakelock_plus: ^1.6.1
5353
image: ^4.9.1

0 commit comments

Comments
 (0)