Skip to content

Commit f5283f5

Browse files
AsCressAsCress
authored
feat: add geolocation logging (#2927)
1 parent d15d6ff commit f5283f5

39 files changed

+1091
-143
lines changed

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:tools="http://schemas.android.com/tools">
3+
<uses-permission android:name="android.permission.ACCESS_COURSE_LOCATION"/>
4+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
5+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
36
<uses-permission android:name="android.permission.RECORD_AUDIO" />
47
<uses-feature android:name="android.hardware.usb.host" />
58
<uses-feature

‎ios/Runner/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<string>This app uses motion sensors to determine compass direction.</string>
3535
<key>NSPhotoLibraryUsageDescription</key>
3636
<string>App needs access to photo library</string>
37+
<key>NSLocationWhenInUseUsageDescription</key>
38+
<string>This app needs access to location.</string>
3739
<key>UISupportedInterfaceOrientations</key>
3840
<array>
3941
<string>UIInterfaceOrientationPortrait</string>

‎lib/constants.dart‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
import 'dart:core';
22

3+
import 'package:pslab/l10n/app_localizations.dart';
4+
import 'package:pslab/providers/locator.dart';
5+
36
const instrumentsScreenTitleKey = 'instruments_screen_title';
47
const accelerometerScreenTitleKey = 'accelerometer_screen_title';
58
const powerSourceScreenTitleKey = 'power_source_screen_title';
69
const multimeterScreenTitleKey = 'multimeter_screen_title';
710
const waveGeneratorScreenTitleKey = 'wave_generator_screen_title';
811
const oscilloscopeScreenTitleKey = 'oscilloscope_screen_title';
912

13+
AppLocalizations appLocalizations = getIt.get<AppLocalizations>();
14+
1015
List<String> instrumentHeadings = [
1116
'OSCILLOSCOPE',
1217
'MULTIMETER',
@@ -63,3 +68,22 @@ List<String> instrumentIcons = [
6368
'assets/icons/tile_icon_gas.png',
6469
'assets/icons/tile_icon_gas.png',
6570
];
71+
72+
List<String> instrumentNames = [
73+
appLocalizations.oscilloscope.toLowerCase(),
74+
appLocalizations.multimeter.toLowerCase(),
75+
appLocalizations.logicAnalyzer.toLowerCase(),
76+
appLocalizations.sensors.toLowerCase(),
77+
appLocalizations.waveGenerator.toLowerCase(),
78+
appLocalizations.powerSource.toLowerCase(),
79+
appLocalizations.luxMeter.toLowerCase(),
80+
appLocalizations.accelerometer.toLowerCase(),
81+
appLocalizations.barometer.toLowerCase(),
82+
appLocalizations.compass.toLowerCase(),
83+
appLocalizations.gyroscope.toLowerCase(),
84+
appLocalizations.thermometer.toLowerCase(),
85+
appLocalizations.roboticArm.toLowerCase(),
86+
appLocalizations.gasSensor.toLowerCase(),
87+
appLocalizations.dustSensor.toLowerCase(),
88+
appLocalizations.soundMeter.toLowerCase()
89+
];

‎lib/l10n/app_en.arb‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"sensors": "Sensors",
77
"waveGenerator": "Wave Generator",
88
"powerSource": "Power Source",
9-
"luxMeter": "Lux Meter",
9+
"luxMeter": "Luxmeter",
1010
"accelerometer": "Accelerometer",
1111
"barometer": "Barometer",
1212
"compass": "Compass",
@@ -389,7 +389,7 @@
389389
"documentationError" : "Could not open the documentation link",
390390
"deleteFile": "Delete File",
391391
"deleteAllData": "Delete All Data",
392-
"deleteCautionMessage": "Are you sure you want to delete all logged data for this instrument?",
392+
"deleteCautionMessage": "Are you sure you want to delete all logged data?",
393393
"deleteAll": "Delete All",
394394
"noLoggedData": "No logged data found.",
395395
"importLog": "Import Log",
@@ -496,5 +496,10 @@
496496
"playback" : "Playback",
497497
"stopPlayback" : "Stop Playback",
498498
"resumePlayback" : "Resume Playback",
499-
"pausePlayback" : "Pause Playback"
499+
"pausePlayback" : "Pause Playback",
500+
"openStreetMapContributors": "OpenStreetMap contributors",
501+
"location": "Location",
502+
"noLocationDataAvailable": "No location data available",
503+
"share": "Share",
504+
"loggedData": "Logged Data"
500505
}

‎lib/l10n/app_localizations.dart‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ abstract class AppLocalizations {
165165
/// No description provided for @luxMeter.
166166
///
167167
/// In en, this message translates to:
168-
/// **'Lux Meter'**
168+
/// **'Luxmeter'**
169169
String get luxMeter;
170170

171171
/// No description provided for @accelerometer.
@@ -2463,7 +2463,7 @@ abstract class AppLocalizations {
24632463
/// No description provided for @deleteCautionMessage.
24642464
///
24652465
/// In en, this message translates to:
2466-
/// **'Are you sure you want to delete all logged data for this instrument?'**
2466+
/// **'Are you sure you want to delete all logged data?'**
24672467
String get deleteCautionMessage;
24682468

24692469
/// No description provided for @deleteAll.
@@ -3101,6 +3101,36 @@ abstract class AppLocalizations {
31013101
/// In en, this message translates to:
31023102
/// **'Pause Playback'**
31033103
String get pausePlayback;
3104+
3105+
/// No description provided for @openStreetMapContributors.
3106+
///
3107+
/// In en, this message translates to:
3108+
/// **'OpenStreetMap contributors'**
3109+
String get openStreetMapContributors;
3110+
3111+
/// No description provided for @location.
3112+
///
3113+
/// In en, this message translates to:
3114+
/// **'Location'**
3115+
String get location;
3116+
3117+
/// No description provided for @noLocationDataAvailable.
3118+
///
3119+
/// In en, this message translates to:
3120+
/// **'No location data available'**
3121+
String get noLocationDataAvailable;
3122+
3123+
/// No description provided for @share.
3124+
///
3125+
/// In en, this message translates to:
3126+
/// **'Share'**
3127+
String get share;
3128+
3129+
/// No description provided for @loggedData.
3130+
///
3131+
/// In en, this message translates to:
3132+
/// **'Logged Data'**
3133+
String get loggedData;
31043134
}
31053135

31063136
class _AppLocalizationsDelegate

‎lib/l10n/app_localizations_de.dart‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AppLocalizationsDe extends AppLocalizations {
2727
String get powerSource => 'Power Source';
2828

2929
@override
30-
String get luxMeter => 'Lux Meter';
30+
String get luxMeter => 'Luxmeter';
3131

3232
@override
3333
String get accelerometer => 'Accelerometer';
@@ -1272,7 +1272,7 @@ class AppLocalizationsDe extends AppLocalizations {
12721272

12731273
@override
12741274
String get deleteCautionMessage =>
1275-
'Are you sure you want to delete all logged data for this instrument?';
1275+
'Are you sure you want to delete all logged data?';
12761276

12771277
@override
12781278
String get deleteAll => 'Delete All';
@@ -1611,4 +1611,19 @@ class AppLocalizationsDe extends AppLocalizations {
16111611

16121612
@override
16131613
String get pausePlayback => 'Pause Playback';
1614+
1615+
@override
1616+
String get openStreetMapContributors => 'OpenStreetMap contributors';
1617+
1618+
@override
1619+
String get location => 'Location';
1620+
1621+
@override
1622+
String get noLocationDataAvailable => 'No location data available';
1623+
1624+
@override
1625+
String get share => 'Share';
1626+
1627+
@override
1628+
String get loggedData => 'Logged Data';
16141629
}

‎lib/l10n/app_localizations_en.dart‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AppLocalizationsEn extends AppLocalizations {
2727
String get powerSource => 'Power Source';
2828

2929
@override
30-
String get luxMeter => 'Lux Meter';
30+
String get luxMeter => 'Luxmeter';
3131

3232
@override
3333
String get accelerometer => 'Accelerometer';
@@ -1272,7 +1272,7 @@ class AppLocalizationsEn extends AppLocalizations {
12721272

12731273
@override
12741274
String get deleteCautionMessage =>
1275-
'Are you sure you want to delete all logged data for this instrument?';
1275+
'Are you sure you want to delete all logged data?';
12761276

12771277
@override
12781278
String get deleteAll => 'Delete All';
@@ -1611,4 +1611,19 @@ class AppLocalizationsEn extends AppLocalizations {
16111611

16121612
@override
16131613
String get pausePlayback => 'Pause Playback';
1614+
1615+
@override
1616+
String get openStreetMapContributors => 'OpenStreetMap contributors';
1617+
1618+
@override
1619+
String get location => 'Location';
1620+
1621+
@override
1622+
String get noLocationDataAvailable => 'No location data available';
1623+
1624+
@override
1625+
String get share => 'Share';
1626+
1627+
@override
1628+
String get loggedData => 'Logged Data';
16141629
}

‎lib/l10n/app_localizations_es.dart‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AppLocalizationsEs extends AppLocalizations {
2727
String get powerSource => 'Power Source';
2828

2929
@override
30-
String get luxMeter => 'Lux Meter';
30+
String get luxMeter => 'Luxmeter';
3131

3232
@override
3333
String get accelerometer => 'Accelerometer';
@@ -1272,7 +1272,7 @@ class AppLocalizationsEs extends AppLocalizations {
12721272

12731273
@override
12741274
String get deleteCautionMessage =>
1275-
'Are you sure you want to delete all logged data for this instrument?';
1275+
'Are you sure you want to delete all logged data?';
12761276

12771277
@override
12781278
String get deleteAll => 'Delete All';
@@ -1611,4 +1611,19 @@ class AppLocalizationsEs extends AppLocalizations {
16111611

16121612
@override
16131613
String get pausePlayback => 'Pause Playback';
1614+
1615+
@override
1616+
String get openStreetMapContributors => 'OpenStreetMap contributors';
1617+
1618+
@override
1619+
String get location => 'Location';
1620+
1621+
@override
1622+
String get noLocationDataAvailable => 'No location data available';
1623+
1624+
@override
1625+
String get share => 'Share';
1626+
1627+
@override
1628+
String get loggedData => 'Logged Data';
16141629
}

‎lib/l10n/app_localizations_fr.dart‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AppLocalizationsFr extends AppLocalizations {
2727
String get powerSource => 'Power Source';
2828

2929
@override
30-
String get luxMeter => 'Lux Meter';
30+
String get luxMeter => 'Luxmeter';
3131

3232
@override
3333
String get accelerometer => 'Accelerometer';
@@ -1272,7 +1272,7 @@ class AppLocalizationsFr extends AppLocalizations {
12721272

12731273
@override
12741274
String get deleteCautionMessage =>
1275-
'Are you sure you want to delete all logged data for this instrument?';
1275+
'Are you sure you want to delete all logged data?';
12761276

12771277
@override
12781278
String get deleteAll => 'Delete All';
@@ -1611,4 +1611,19 @@ class AppLocalizationsFr extends AppLocalizations {
16111611

16121612
@override
16131613
String get pausePlayback => 'Pause Playback';
1614+
1615+
@override
1616+
String get openStreetMapContributors => 'OpenStreetMap contributors';
1617+
1618+
@override
1619+
String get location => 'Location';
1620+
1621+
@override
1622+
String get noLocationDataAvailable => 'No location data available';
1623+
1624+
@override
1625+
String get share => 'Share';
1626+
1627+
@override
1628+
String get loggedData => 'Logged Data';
16141629
}

‎lib/l10n/app_localizations_he.dart‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AppLocalizationsHe extends AppLocalizations {
2727
String get powerSource => 'Power Source';
2828

2929
@override
30-
String get luxMeter => 'Lux Meter';
30+
String get luxMeter => 'Luxmeter';
3131

3232
@override
3333
String get accelerometer => 'Accelerometer';
@@ -1272,7 +1272,7 @@ class AppLocalizationsHe extends AppLocalizations {
12721272

12731273
@override
12741274
String get deleteCautionMessage =>
1275-
'Are you sure you want to delete all logged data for this instrument?';
1275+
'Are you sure you want to delete all logged data?';
12761276

12771277
@override
12781278
String get deleteAll => 'Delete All';
@@ -1611,4 +1611,19 @@ class AppLocalizationsHe extends AppLocalizations {
16111611

16121612
@override
16131613
String get pausePlayback => 'Pause Playback';
1614+
1615+
@override
1616+
String get openStreetMapContributors => 'OpenStreetMap contributors';
1617+
1618+
@override
1619+
String get location => 'Location';
1620+
1621+
@override
1622+
String get noLocationDataAvailable => 'No location data available';
1623+
1624+
@override
1625+
String get share => 'Share';
1626+
1627+
@override
1628+
String get loggedData => 'Logged Data';
16141629
}

0 commit comments

Comments
 (0)