trent/libre_gps_parser
1
0
Fork 0
mirror of https://github.com/TrentSPalmer/libre_gps_parser.git synced 2024-11-16 03:51:30 -08:00
Code Issues Projects Releases Wiki Activity

implement share from MapQuest for Android

Browse Source
This commit is contained in:
Trent Palmer 2019-07-27 15:34:01 -07:00
parent 286024eb9f
commit 7e435afe20
19 changed files with 2351 additions and 2151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -39,3 +39,9 @@ _____
* add more things to be implemented
* add input from Bing Maps, Mapquest apps
* add other elevation api server options
* include shared-prefs import/export in history import/export
## archive
* [Previous Versions of Libre Gps Parser](https://trentsonlinedocs.xyz/android_app_archive/libre_gps_parser/)
* [archive sha256sums](https://raw.githubusercontent.com/TrentSPalmer/libre_gps_parser/master/archive_sha256sums.md)

4
archive_sha256sums.md Normal file
View File

@ -0,0 +1,4 @@
153330a42f353d19443581d436b5627b6d05c87808e67a2e713ff950e5317de4 libre_gps_parser/0.1.3/armv9/app.aab
ea3f466315375d1f0eea49c0a224b36bcce8517f6ca45c6c2ed558015a97c21a libre_gps_parser/0.1.3/armv9/app-release.apk
cb45d4e5ac5f2a71ccd2ad9a2c4c081725fe2d65dd5db7a95bd196f3be70b108 libre_gps_parser/0.1.3/arm64v10/app.aab
6f145facdf75c83d42bf6ab76a3e27166eac75b0557a990634659944f031a0b9 libre_gps_parser/0.1.3/arm64v10/app-release.apk

30
lib/about.dart
View File

@ -25,13 +25,15 @@ InkWell aboutApp(BuildContext context) {
context: context,
builder: (BuildContext context) {
final double textHeight = 1.5;
Future<void> _launchLicense() async{
Future<void> _launchLicense() async {
AndroidIntent intent = AndroidIntent(
action: 'action_view',
data: Uri.encodeFull('https://github.com/TrentSPalmer/libre_gps_parser/blob/master/LICENSE'),
data: Uri.encodeFull(
'https://github.com/TrentSPalmer/libre_gps_parser/blob/master/LICENSE'),
);
await intent.launch();
}
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
@ -53,12 +55,13 @@ InkWell aboutApp(BuildContext context) {
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Text(
'Version: 0.1.2\n',
'Version: 0.1.3\n',
style: TextStyle(
color: candyApple,
),
),
Text(
'Edit: new feature, you can now share a location to Libre Gps Parser from Mapquest for Android.\n\n'
'The essence of Libre Gps Parser, is to parse gps coordinates from '
'a map link that you share from the Google Maps Application. '
'After that you can use the gps coordinates to make api calls for '
@ -87,7 +90,8 @@ InkWell aboutApp(BuildContext context) {
),
child: ButtonTheme(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
height: 75,
child: RaisedButton(
@ -99,8 +103,7 @@ InkWell aboutApp(BuildContext context) {
),
onPressed: () {
Navigator.of(context).pop();
}
),
}),
),
),
Container(
@ -109,7 +112,8 @@ InkWell aboutApp(BuildContext context) {
),
child: ButtonTheme(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
height: 75,
child: RaisedButton(
@ -124,8 +128,7 @@ InkWell aboutApp(BuildContext context) {
),
onPressed: () {
_launchLicense();
}
),
}),
),
),
Container(
@ -136,7 +139,8 @@ InkWell aboutApp(BuildContext context) {
height: 75,
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
color: peacockBlue,
child: Text(
@ -149,8 +153,7 @@ InkWell aboutApp(BuildContext context) {
),
onPressed: () {
showLicensePage(context: context);
}
),
}),
),
),
],
@ -163,8 +166,7 @@ InkWell aboutApp(BuildContext context) {
],
),
);
}
);
});
},
);
}

20
lib/database_helper.dart
View File

@ -47,10 +47,7 @@ class DatabaseHelper {
// this opens the database (and creates it if it doesn't exist)
_initDatabase() async {
Directory documentsDirectory = await getApplicationDocumentsDirectory();
String path = join(
documentsDirectory.path,
_databaseName
);
String path = join(documentsDirectory.path, _databaseName);
return await openDatabase(
path,
version: _databaseVersion,
@ -64,7 +61,8 @@ class DatabaseHelper {
// you can only ADD one column at a time?
Future _onUpgrade(Database db, int oldVersion, int newVersion) async {
if ((oldVersion == 1) || (oldVersion == 2)) {
await db.execute('''ALTER TABLE $table ADD $columnIsAutoTimeOffset INT''');
await db
.execute('''ALTER TABLE $table ADD $columnIsAutoTimeOffset INT''');
await db.execute('''ALTER TABLE $table ADD $columnNotes TEXT''');
} else if (oldVersion == 3) {
await db.execute('''ALTER TABLE $table ADD $columnNotes TEXT''');
@ -144,12 +142,9 @@ class DatabaseHelper {
Database db = await instance.database;
List<Map> result = await db.rawQuery(
'SELECT $columnMapLocation FROM $table ORDER BY $columnViewTime DESC LIMIT 2');
return (result.length == 2)
? result[1]['mapLocation']
: 'none';
return (result.length == 2) ? result[1]['mapLocation'] : 'none';
}
Future<List<String>> sortedMapLocations() async {
Database db = await instance.database;
var result = await db.rawQuery(
@ -255,9 +250,10 @@ class DatabaseHelper {
.delete(table, where: '$columnMapLocation = ?', whereArgs: [ml]);
}
Future<String> queryDBExport() async{
Future<String> queryDBExport() async {
Database db = await instance.database;
List<Map> result = await db.rawQuery('SELECT $columnMapLocation,$columnNotes,$columnIsAutoTimeOffset,$columnTimeOffSet FROM $table');
return(jsonEncode(result));
List<Map> result = await db.rawQuery(
'SELECT $columnMapLocation,$columnNotes,$columnIsAutoTimeOffset,$columnTimeOffSet FROM $table');
return (jsonEncode(result));
}
}

153
lib/edit_notes.dart
View File

@ -18,7 +18,6 @@ class EditNotes extends StatefulWidget {
}
class _EditNotesState extends State<EditNotes> {
final double textHeight = 1.5;
final _textEditingController = TextEditingController();
final dbHelper = DatabaseHelper.instance;
@ -77,8 +76,7 @@ class _EditNotesState extends State<EditNotes> {
),
onPressed: () {
Navigator.of(context).pop();
}
),
}),
),
),
Container(
@ -100,8 +98,7 @@ class _EditNotesState extends State<EditNotes> {
onPressed: () {
Navigator.of(context).pop();
Navigator.of(context).pop();
}
),
}),
),
),
],
@ -110,8 +107,7 @@ class _EditNotesState extends State<EditNotes> {
],
),
);
}
);
});
return Future.value(false);
} else {
return Future.value(true);
@ -127,19 +123,18 @@ class _EditNotesState extends State<EditNotes> {
actions: <Widget>[
IconButton(
icon: Icon(Icons.save),
onPressed: () async{
onPressed: () async {
Navigator.of(context).pop(this._inputText);
Map<String, dynamic> row = {
DatabaseHelper.columnMapLocation: widget.mapLocation,
DatabaseHelper.columnNotes: this._inputText,
};
await dbHelper.update(row);
}
),
}),
],
),
body: Column(
children: <Widget> [
children: <Widget>[
Expanded(
child: TextField(
controller: _textEditingController,
@ -151,7 +146,7 @@ class _EditNotesState extends State<EditNotes> {
),
),
Row(
children: <Widget> [
children: <Widget>[
Expanded(
child: Container(),
),
@ -160,11 +155,7 @@ class _EditNotesState extends State<EditNotes> {
child: ButtonTheme(
height: 55,
padding: EdgeInsets.only(
top: 5,
right: 12,
bottom: 12,
left: 10
),
top: 5, right: 12, bottom: 12, left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
@ -178,20 +169,28 @@ class _EditNotesState extends State<EditNotes> {
fontSize: 24,
),
),
onPressed: () async{
Map<PermissionGroup, PermissionStatus> _storagePermissions;
PermissionStatus _storagePermission = await PermissionHandler().checkPermissionStatus(PermissionGroup.storage);
onPressed: () async {
Map<PermissionGroup, PermissionStatus>
_storagePermissions;
PermissionStatus _storagePermission =
await PermissionHandler().checkPermissionStatus(
PermissionGroup.storage);
if (_storagePermission == PermissionStatus.denied) {
_storagePermissions = await PermissionHandler().requestPermissions([PermissionGroup.storage]);
_storagePermissions = await PermissionHandler()
.requestPermissions([PermissionGroup.storage]);
}
if ((_storagePermission == PermissionStatus.granted) || (_storagePermissions.toString() == PermissionStatus.granted.toString())) {
if ((_storagePermission ==
PermissionStatus.granted) ||
(_storagePermissions.toString() ==
PermissionStatus.granted.toString())) {
showDialog(
context: context,
builder: (BuildContext context) {
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
title: Text(
'You can import a markdown (or plain text) file.',
@ -214,11 +213,12 @@ class _EditNotesState extends State<EditNotes> {
top: 5,
right: 12,
bottom: 12,
left: 10
),
left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius:
BorderRadius.all(
Radius.circular(6.0)),
),
color: peacockBlue,
child: Text(
@ -229,86 +229,111 @@ class _EditNotesState extends State<EditNotes> {
fontSize: 24,
),
),
onPressed: () async{
onPressed: () async {
String _filePath;
_filePath = await FilePicker.getFilePath(type: FileType.ANY);
_filePath = await FilePicker
.getFilePath(
type: FileType.ANY);
Navigator.of(context).pop();
try {
String _contents = await File(_filePath).readAsString();
String _contents =
await File(_filePath)
.readAsString();
setState(() {
this._textEditingController.text = _contents;
this._inputText = _contents;
this
._textEditingController
.text = _contents;
this._inputText =
_contents;
});
} catch(e) {
} catch (e) {
print(e);
showDialog(
context: context,
builder: (BuildContext context) {
builder: (BuildContext
context) {
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
backgroundColor:
ivory,
shape:
RoundedRectangleBorder(
borderRadius: BorderRadius
.all(Radius
.circular(
6.0)),
),
title: Text(
'Oops, something went wrong',
textAlign: TextAlign.center,
textAlign:
TextAlign
.center,
style: TextStyle(
color: candyApple,
color:
candyApple,
),
),
content: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
mainAxisSize:
MainAxisSize
.min,
children: <
Widget>[
Container(
margin: EdgeInsets.only(
margin:
EdgeInsets
.only(
top: 40,
bottom: 10,
),
child: ButtonTheme(
child:
ButtonTheme(
height: 55,
padding: EdgeInsets.only(
top: 5,
right: 12,
bottom: 12,
left: 10
),
right:
12,
bottom:
12,
left:
10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
),
color: peacockBlue,
child: Text(
'OK',
style: TextStyle(
height: textHeight,
color: Colors.white,
fontSize: 24,
style:
TextStyle(
height:
textHeight,
color:
Colors.white,
fontSize:
24,
),
),
onPressed: () async{
Navigator.of(context).pop();
}
),
onPressed: () async {
Navigator.of(context)
.pop();
}),
),
),
],
),
);
});
}
);
}
}
),
}),
),
),
],
),
);
});
}
);
}
}
),
}),
),
),
],
@ -319,7 +344,7 @@ class _EditNotesState extends State<EditNotes> {
);
}
Future<void> loadNotes() async{
Future<void> loadNotes() async {
String _notes = await dbHelper.queryNotes(widget.mapLocation);
setState(() {
_oldNotes = _notes;

12
lib/elevation.dart
View File

@ -105,7 +105,8 @@ InkWell elevAtion(BuildContext context, int elevation, int feetElevation) {
top: 10,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
mainAxisAlignment:
MainAxisAlignment.spaceAround,
children: <Widget>[
Text(
'github',
@ -140,16 +141,15 @@ InkWell elevAtion(BuildContext context, int elevation, int feetElevation) {
),
onPressed: () {
Navigator.of(context).pop();
urlLaunch('https://github.com/Jorl17/open-elevation/blob/master/docs/host-your-own.md');
}
),
urlLaunch(
'https://github.com/Jorl17/open-elevation/blob/master/docs/host-your-own.md');
}),
),
),
],
),
);
}
);
});
},
);
}

79
lib/global_helper_functions.dart
View File

@ -38,7 +38,8 @@ Future<List<int>> refreshTimeOffSet(String mapLocation, String latLong) async {
['total_offset_min'] ??
2000;
} catch (e) {
print('$e in source file global_helper_functions.dart.getTimeOffSet, can\'t assign Map<String, dynamic> responseJson');
print(
'$e in source file global_helper_functions.dart.getTimeOffSet, can\'t assign Map<String, dynamic> responseJson');
}
Map<String, dynamic> row = {
DatabaseHelper.columnMapLocation: mapLocation,
@ -58,7 +59,7 @@ Future<List<int>> refreshTimeOffSet(String mapLocation, String latLong) async {
}
}
Future<List<int>> getTimeOffSet(String mapLocation, String latLong) async{
Future<List<int>> getTimeOffSet(String mapLocation, String latLong) async {
final dbHelper = DatabaseHelper.instance;
final int _timeStamp = newTimeStamp();
int timeOffSetTime = await dbHelper.queryTimeOffSetTime(mapLocation);
@ -85,7 +86,8 @@ Future<List<int>> getTimeOffSet(String mapLocation, String latLong) async{
['total_offset_min'] ??
2000;
} catch (e) {
print('$e in source file global_helper_functions.dart.getTimeOffSet, can\'t assign Map<String, dynamic> responseJson');
print(
'$e in source file global_helper_functions.dart.getTimeOffSet, can\'t assign Map<String, dynamic> responseJson');
}
Map<String, dynamic> row = {
DatabaseHelper.columnMapLocation: mapLocation,
@ -132,7 +134,9 @@ Future<String> getWeather(
Response response = await get(weatherApiUrl);
if (response.statusCode == 200) {
Map<String, dynamic> responseJson = jsonDecode(response.body);
weatherID = (responseJson['id'] != 0) ? responseJson['id'] : generateFakeWeatherId(lattLong);
weatherID = (responseJson['id'] != 0)
? responseJson['id']
: generateFakeWeatherId(lattLong);
Map<String, dynamic> row = {
DatabaseHelper.columnMapLocation: mapLocation,
DatabaseHelper.columnWeatherID: weatherID
@ -150,8 +154,9 @@ Future<String> getWeather(
}
return response.body;
}
} catch(e) {
print('$e, can\'t connect to openweathermap in global_helper_functions');
} catch (e) {
print(
'$e, can\'t connect to openweathermap in global_helper_functions');
weatherID ??= generateFakeWeatherId(lattLong); // assign if null
String weather = await dbHelper.queryWeather(weatherID);
return weather ?? 'NA';
@ -178,7 +183,9 @@ Future<String> getWeatherForeCast(
weatherID = generateFakeWeatherId(lattLong);
}
int weatherIDExists = await dbHelper.queryWeatherIDExists(weatherID);
if (weatherIDExists == 0) { stale = true; }
if (weatherIDExists == 0) {
stale = true;
}
if ((weatherID == null) || (stale == true)) {
List<String> latLong = lattLong.split(',');
String weatherForeCastApiUrl;
@ -212,8 +219,9 @@ Future<String> getWeatherForeCast(
}
return response.body;
}
} catch(e) {
print('$e, probably cant connect to openweathermap... no network connection? global_helper_functions.getWeatherForeCast');
} catch (e) {
print(
'$e, probably cant connect to openweathermap... no network connection? global_helper_functions.getWeatherForeCast');
weatherID ??= generateFakeWeatherId(lattLong); // assign if null
String weatherForeCast = await dbHelper.queryWeatherForeCast(weatherID);
return (weatherForeCast);
@ -249,6 +257,24 @@ int newTimeStamp() {
}
Future<String> parseMapUrl(String mapUrl) async {
if (mapUrl.contains('mapq.st')) {
try {
Response response = await get(mapUrl);
String mapInfo = response.body;
RegExp _latExp = RegExp(
r'(<meta)\s*(property="place:location:latitude")\s*(content=")(.+)"\s*(/>)');
Match _latMatch = _latExp.firstMatch(mapInfo);
RegExp _longExp = RegExp(
r'(<meta)\s*(property="place:location:longitude")\s*(content=")(.+)"\s*(/>)');
Match _longMatch = _longExp.firstMatch(mapInfo);
String result = _latMatch.group(4) + ',' + _longMatch.group(4);
return (result);
} catch (e) {
print(
'$e can\'t connect to internet in global_helper_functions.parseMapUrl');
}
} else if ((mapUrl.contains('maps.google')) ||
(mapUrl.contains('maps.app.goo.gl'))) {
try {
Response response = await get(mapUrl);
RegExp gmapUrl = RegExp(
@ -258,9 +284,12 @@ Future<String> parseMapUrl(String mapUrl) async {
String subMapInfo = match.group(4);
RegExp subGmapUrl = RegExp(r'@([^,]*,[^,]*),([^,]*,[^,]*)');
Match subMatch = subGmapUrl.firstMatch(subMapInfo);
return subMatch.group(1);
} catch(e) {
print('$e can\'t connect to internet in global_helper_functions.parseMapUrl');
String result = subMatch.group(1);
return (result);
} catch (e) {
print(
'$e can\'t connect to internet in global_helper_functions.parseMapUrl');
}
}
}
@ -300,8 +329,9 @@ String convertCoordinates(String latNLong) {
String gpsDMS =
lat[0] + '\u00B0 ' + latMinSec + ',' + long[0] + '\u00B0 ' + longMinSec;
return gpsDMS;
} catch(e) {
print('$e in source file global_helper_functions.convertCoordinates, function parameter probably not a valid latNLong string');
} catch (e) {
print(
'$e in source file global_helper_functions.convertCoordinates, function parameter probably not a valid latNLong string');
}
}
@ -314,19 +344,20 @@ String getMinSec(String numString) {
return minSecs;
}
String weatherConditions(String weatherConditions) {
int numSpaces = (' '.allMatches(weatherConditions)).length;
if (numSpaces > 1) {
int firstSpace = weatherConditions.indexOf(' ');
int secondSpace = (weatherConditions.indexOf(' ', firstSpace + 1));
return weatherConditions.replaceRange(secondSpace, (secondSpace + 1), '\n').toUpperCase();
return weatherConditions
.replaceRange(secondSpace, (secondSpace + 1), '\n')
.toUpperCase();
} else {
return weatherConditions.toUpperCase();
}
}
Future<void> urlLaunch(String url) async{
Future<void> urlLaunch(String url) async {
if (await canLaunch(url)) {
await launch(url);
} else {
@ -338,7 +369,8 @@ int generateFakeWeatherId(String latLong) {
List<String> _latLongParts = latLong.split(',');
List<String> _shortLat = _latLongParts[0].split('.');
List<String> _shortLong = _latLongParts[1].split('.');
String _fakeIDString = _shortLat[0].replaceFirst('-','8') + _shortLong[0].replaceFirst('-','8');
String _fakeIDString = _shortLat[0].replaceFirst('-', '8') +
_shortLong[0].replaceFirst('-', '8');
// you know a weatherID is fake because it is less than zero
return (0 - int.parse(_fakeIDString));
}
@ -394,8 +426,11 @@ Future<bool> setPreferenceUseWeather(bool useWeather) async {
Future<String> getPreferenceDBExportFileName() async {
SharedPreferences prefs = await SharedPreferences.getInstance();
String dbExportFileName = prefs.getString("dbExportFileName") ?? "libre_gps_parser.json";
return (dbExportFileName.length > 0) ? dbExportFileName : "libre_gps_parser.json";
String dbExportFileName =
prefs.getString("dbExportFileName") ?? "libre_gps_parser.json";
return (dbExportFileName.length > 0)
? dbExportFileName
: "libre_gps_parser.json";
}
Future<bool> setPreferenceDBExportFileName(String dbExportFileName) async {
@ -410,7 +445,9 @@ Future<bool> importDataBase(String importString) {
List<dynamic> _importJson = jsonDecode(importString);
int _importJsonLength = _importJson.length;
for (int i = 0; i < _importJsonLength; i++) {
dbHelper.queryRowExists(_importJson[i]['mapLocation']).then((int rowExists) {
dbHelper
.queryRowExists(_importJson[i]['mapLocation'])
.then((int rowExists) {
if (rowExists == 0) {
Map<String, dynamic> row = {
DatabaseHelper.columnMapLocation: _importJson[i]['mapLocation'],

7
lib/lnl_dec.dart
View File

@ -6,8 +6,7 @@ import 'package:share/share.dart';
final double textHeight = 1.5;
Row lnlDec(String latnLong) {
Future<void> _launchLnL() async{
Future<void> _launchLnL() async {
AndroidIntent intent = AndroidIntent(
action: 'action_view',
data: Uri.encodeFull('geo:$latnLong?z=12'),
@ -16,7 +15,7 @@ Row lnlDec(String latnLong) {
await intent.launch();
}
List<String> _latNLong = ['x','y'];
List<String> _latNLong = ['x', 'y'];
if ((latnLong == 'none') || (latnLong == null)) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
@ -125,5 +124,3 @@ Row lnlDec(String latnLong) {
);
}
}

2
lib/lnl_deg.dart
View File

@ -5,7 +5,7 @@ import 'package:share/share.dart';
final double textHeight = 1.5;
Row lnlDeg(String latnLongDMS) {
List<String> _latNLong = ['x','y'];
List<String> _latNLong = ['x', 'y'];
if ((latnLongDMS == 'none') || (latnLongDMS == null)) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,

47
lib/location.dart
View File

@ -18,9 +18,10 @@ class _LocationState extends State<Location> {
@override
Widget build(BuildContext context) {
final double textHeight = 1.5;
List<String> locationStringList = _getlocationStringList(widget.mapLocation);
List<String> locationStringList =
_getlocationStringList(widget.mapLocation);
Future<void> _launchUrl() async{
Future<void> _launchUrl() async {
AndroidIntent intent = AndroidIntent(
action: 'action_view',
data: Uri.encodeFull(locationStringList[locationStringList.length - 1]),
@ -30,8 +31,7 @@ class _LocationState extends State<Location> {
List<Container> createLocation(List<String> location) {
return location.map((line) {
line = (line.length < 25) ? line :
(line.substring(0,20) + '.....' );
line = (line.length < 25) ? line : (line.substring(0, 20) + '.....');
return Container(
child: Text(
line,
@ -93,8 +93,7 @@ class _LocationState extends State<Location> {
],
),
);
}
);
});
},
),
),
@ -128,7 +127,8 @@ class _LocationState extends State<Location> {
),
RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
),
color: peacockBlue,
child: Container(
@ -147,19 +147,17 @@ class _LocationState extends State<Location> {
),
onPressed: () {
Navigator.of(context).pop();
}
),
}),
],
),
);
}
);
});
},
),
),
],
);
} catch(e) {
} catch (e) {
print('$e, probably could not call createLocation(locationStringList)');
return Wrap(
spacing: 20.0,
@ -170,7 +168,6 @@ class _LocationState extends State<Location> {
),
],
);
}
}
@ -178,34 +175,36 @@ class _LocationState extends State<Location> {
List<String> stringList;
try {
stringList = mapLocation.split('\n');
} catch(e) {
print('$e in source file location.dart._getlocationStringList::first_try');
} catch (e) {
print(
'$e in source file location.dart._getlocationStringList::first_try');
}
if (stringList.length < 2) {
return ['','pending...',''];
return ['', 'pending...', ''];
} else {
try {
if (stringList[1].contains(stringList[0])) {
stringList.removeAt(0);
}
} catch(e) {
print('$e in source file location.dart._getlocationStringList::second_try');
} catch (e) {
print(
'$e in source file location.dart._getlocationStringList::second_try');
}
// split up long address lines on the second to last comma
for (int i=0; i<stringList.length; i++) {
for (int i = 0; i < stringList.length; i++) {
int numCommas = (','.allMatches(stringList[i])).length;
if (numCommas > 1) {
String currentLine = stringList[i];
stringList.removeAt(i);
int commaCount = 0;
for (int j=0; j<currentLine.length; j++) {
for (int j = 0; j < currentLine.length; j++) {
if (currentLine[j] == ',') {
commaCount += 1;
if (commaCount == (numCommas -1)) {
String firstHalf = currentLine.substring(0,j+1);
String secondHalf = currentLine.substring(j+2);
if (commaCount == (numCommas - 1)) {
String firstHalf = currentLine.substring(0, j + 1);
String secondHalf = currentLine.substring(j + 2);
stringList.insert(i, firstHalf);
stringList.insert(i+1, secondHalf);
stringList.insert(i + 1, secondHalf);
}
}
}

164
lib/main.dart
View File

@ -42,7 +42,8 @@ class _LatNLongState extends State<LatNLong> {
final dbHelper = DatabaseHelper.instance;
static const platform = const MethodChannel('app.channel.shared.data');
// "static" variables are hard-coded into the class rather than instances
static RegExp gmapExp = RegExp(r'(https://maps.app.goo.gl/|https://maps.google.com/)(.*$)');
static RegExp mapExp = RegExp(
r'(https://maps.app.goo.gl/|https://maps.google.com/|https?://mapq.st/)(.*$)');
String widgetMapLocation = "none";
String latnLong = "none";
String latnLongDMS = "none";
@ -86,8 +87,7 @@ class _LatNLongState extends State<LatNLong> {
parentAction: this._userTzOffset,
timeOffSet: this.timeOffSet,
timeOffSetTime: this.timeOffSetTime,
isAutoTimeOffSet: this.isAutoTimeOffSet
);
isAutoTimeOffSet: this.isAutoTimeOffSet);
}
InkWell _delete() {
@ -143,7 +143,8 @@ class _LatNLongState extends State<LatNLong> {
),
child: ButtonTheme(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
),
height: 75,
child: RaisedButton(
@ -159,8 +160,7 @@ class _LatNLongState extends State<LatNLong> {
onPressed: () {
Navigator.of(context).pop();
_deleteLocation();
}
),
}),
),
),
Container(
@ -171,7 +171,8 @@ class _LatNLongState extends State<LatNLong> {
height: 75,
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
color: peacockBlue,
child: Text(
@ -184,8 +185,7 @@ class _LatNLongState extends State<LatNLong> {
),
onPressed: () {
Navigator.of(context).pop();
}
),
}),
),
),
],
@ -194,8 +194,7 @@ class _LatNLongState extends State<LatNLong> {
],
),
);
}
);
});
},
);
}
@ -216,10 +215,13 @@ class _LatNLongState extends State<LatNLong> {
),
],
),
onTap: () async{
onTap: () async {
String _noteText = await Navigator.push(
context,
MaterialPageRoute(builder: (context) => EditNotes(mapLocation: this.widgetMapLocation,)),
MaterialPageRoute(
builder: (context) => EditNotes(
mapLocation: this.widgetMapLocation,
)),
);
if ((_noteText != null) && (_noteText != this.notes)) {
setState(() {
@ -229,7 +231,8 @@ class _LatNLongState extends State<LatNLong> {
},
),
),
((this.notes.length > 0) ? Expanded(
((this.notes.length > 0)
? Expanded(
flex: 5,
child: Container(
decoration: BoxDecoration(
@ -251,15 +254,19 @@ class _LatNLongState extends State<LatNLong> {
),
],
),
onTap: () async{
onTap: () async {
await Navigator.push(
context,
MaterialPageRoute(builder: (context) => RenderNotes(notes: this.notes,)),
MaterialPageRoute(
builder: (context) => RenderNotes(
notes: this.notes,
)),
);
},
),
),
) : Container()),
)
: Container()),
],
);
}
@ -278,7 +285,9 @@ class _LatNLongState extends State<LatNLong> {
),
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: (this.latnLong != null) ? lnlDec(this.latnLong) : lnlDec('none') ,
child: (this.latnLong != null)
? lnlDec(this.latnLong)
: lnlDec('none'),
),
IntrinsicHeight(
child: Row(
@ -294,7 +303,9 @@ class _LatNLongState extends State<LatNLong> {
),
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: (this.latnLongDMS != null) ? lnlDeg(this.latnLongDMS) : lnlDeg('none'),
child: (this.latnLongDMS != null)
? lnlDeg(this.latnLongDMS)
: lnlDeg('none'),
),
),
],
@ -373,7 +384,8 @@ class _LatNLongState extends State<LatNLong> {
child: aboutApp(context),
),
),
((this._useElev) ? Expanded(
((this._useElev)
? Expanded(
flex: 4,
child: Container(
margin: EdgeInsets.only(
@ -384,9 +396,11 @@ class _LatNLongState extends State<LatNLong> {
),
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: elevAtion(context, this.elevation, this.feetElevation),
child: elevAtion(
context, this.elevation, this.feetElevation),
),
) : Container()),
)
: Container()),
Expanded(
flex: 3,
child: Container(
@ -407,7 +421,8 @@ class _LatNLongState extends State<LatNLong> {
IntrinsicHeight(
child: Row(
children: <Widget>[
((this._useWTHR) ? Expanded(
((this._useWTHR)
? Expanded(
flex: 7,
child: Container(
margin: EdgeInsets.only(
@ -420,7 +435,8 @@ class _LatNLongState extends State<LatNLong> {
decoration: myBoxDecoration(ivory),
child: _timezone(),
),
) : Container()),
)
: Container()),
],
),
),
@ -445,7 +461,9 @@ class _LatNLongState extends State<LatNLong> {
),
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: (this.latnLongDMS != null) ? lnlDeg(this.latnLongDMS) : lnlDeg('none'),
child: (this.latnLongDMS != null)
? lnlDeg(this.latnLongDMS)
: lnlDeg('none'),
),
),
Expanded(
@ -474,7 +492,9 @@ class _LatNLongState extends State<LatNLong> {
),
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: (this.latnLong != null) ? lnlDec(this.latnLong) : lnlDec('none') ,
child: (this.latnLong != null)
? lnlDec(this.latnLong)
: lnlDec('none'),
),
IntrinsicHeight(
child: Row(
@ -549,7 +569,8 @@ class _LatNLongState extends State<LatNLong> {
IntrinsicHeight(
child: Row(
children: <Widget>[
((this._useElev) ? Expanded(
((this._useElev)
? Expanded(
flex: 3,
child: Container(
margin: EdgeInsets.only(
@ -560,10 +581,13 @@ class _LatNLongState extends State<LatNLong> {
),
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: elevAtion(context, this.elevation, this.feetElevation),
child: elevAtion(
context, this.elevation, this.feetElevation),
),
) : Container()),
((this._useWTHR) ? Expanded(
)
: Container()),
((this._useWTHR)
? Expanded(
flex: 7,
child: Container(
margin: EdgeInsets.only(
@ -576,7 +600,8 @@ class _LatNLongState extends State<LatNLong> {
decoration: myBoxDecoration(ivory),
child: _timezone(),
),
) : Container()),
)
: Container()),
],
),
),
@ -615,7 +640,9 @@ class _LatNLongState extends State<LatNLong> {
),
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: (this.latnLong != null) ? lnlDec(this.latnLong) : lnlDec('none'),
child: (this.latnLong != null)
? lnlDec(this.latnLong)
: lnlDec('none'),
),
),
Expanded(
@ -649,7 +676,9 @@ class _LatNLongState extends State<LatNLong> {
),
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: (this.latnLongDMS != null) ? lnlDeg(this.latnLongDMS) : lnlDeg('none'),
child: (this.latnLongDMS != null)
? lnlDeg(this.latnLongDMS)
: lnlDeg('none'),
),
),
Expanded(
@ -702,7 +731,8 @@ class _LatNLongState extends State<LatNLong> {
),
),
),
((this._useElev) ? Expanded(
((this._useElev)
? Expanded(
flex: 2,
child: Container(
margin: EdgeInsets.only(
@ -713,10 +743,13 @@ class _LatNLongState extends State<LatNLong> {
),
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: elevAtion(context, this.elevation, this.feetElevation),
child: elevAtion(
context, this.elevation, this.feetElevation),
),
) : Container()),
((this._useWTHR) ? Expanded(
)
: Container()),
((this._useWTHR)
? Expanded(
flex: 4,
child: Container(
margin: EdgeInsets.only(
@ -729,7 +762,8 @@ class _LatNLongState extends State<LatNLong> {
decoration: myBoxDecoration(ivory),
child: _timezone(),
),
) : Container()),
)
: Container()),
],
),
),
@ -764,7 +798,8 @@ class _LatNLongState extends State<LatNLong> {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
_top(),
((this._useWTHR) ? Weather(
((this._useWTHR)
? Weather(
weatherLocationID: this.weatherLocationID,
weatherConditions: this.weatherConditions,
weatherConditionsIcon: this.weatherConditionsIcon,
@ -781,11 +816,14 @@ class _LatNLongState extends State<LatNLong> {
weatherCurrentDT: this.weatherCurrentDT,
timeOffSet: this.timeOffSet,
parentAction: this._refreshWeather,
) : Container()),
((this._useWTHR) ? WeatherForeCast(
)
: Container()),
((this._useWTHR)
? WeatherForeCast(
weatherForeCast: this.weatherForeCast,
timeOffSet: this.timeOffSet,
) : Container()),
)
: Container()),
],
),
),
@ -794,7 +832,7 @@ class _LatNLongState extends State<LatNLong> {
);
}
void _settings() async{
void _settings() async {
int newSetting = await Navigator.push(
context,
MaterialPageRoute(builder: (context) => Settings()),
@ -804,7 +842,7 @@ class _LatNLongState extends State<LatNLong> {
}
}
void _pushSaved() async{
void _pushSaved() async {
List<String> sortedMapLocations = await dbHelper.sortedMapLocations();
await Navigator.of(context).push(
MaterialPageRoute<void>(
@ -865,7 +903,7 @@ class _LatNLongState extends State<LatNLong> {
Future<void> updateState() async {
var sharedData = await platform.invokeMethod("getSharedText");
if (sharedData != null && sharedData is String) {
if (gmapExp.hasMatch(sharedData)) {
if (mapExp.hasMatch(sharedData)) {
setState(() {
this.widgetMapLocation = sharedData;
});
@ -883,7 +921,7 @@ class _LatNLongState extends State<LatNLong> {
await _populateNotes(sharedData);
}
Future<void> _populateNotes(String mapLocation) async{
Future<void> _populateNotes(String mapLocation) async {
String _notes = await dbHelper.queryNotes(mapLocation);
if ((_notes != null) || (_notes != this.notes)) {
if ((mapLocation.contains('Plataea')) && (_notes.length == 0)) {
@ -910,7 +948,8 @@ class _LatNLongState extends State<LatNLong> {
Map<String, dynamic> weatherForeCastJson = jsonDecode(weatherForeCast);
int _threeHoursAgo = (newTimeStamp() - 10800);
if (weatherForeCastJson['list'][1]['dt'] < _threeHoursAgo) {
weatherForeCast = await getWeatherForeCast(mapLocation, latLong, true);
weatherForeCast =
await getWeatherForeCast(mapLocation, latLong, true);
setState(() {
this.weatherForeCast = weatherForeCast;
});
@ -919,12 +958,12 @@ class _LatNLongState extends State<LatNLong> {
}
}
Future<void> _refreshWeather() async{
await _populateWeather(this.widgetMapLocation,this.latnLong);
await _populateWeatherForeCast(this.widgetMapLocation,this.latnLong);
Future<void> _refreshWeather() async {
await _populateWeather(this.widgetMapLocation, this.latnLong);
await _populateWeatherForeCast(this.widgetMapLocation, this.latnLong);
}
Future<void> _populateWeather(String mapLocation, String latLong) async{
Future<void> _populateWeather(String mapLocation, String latLong) async {
if ((this._useWTHR) && (latLong != null)) {
String weather = await getWeather(mapLocation, latLong, false);
if (weather == 'NA') {
@ -943,9 +982,12 @@ class _LatNLongState extends State<LatNLong> {
}
}
Future<void> _updateWeather(Map<String, dynamic> weatherJson,String latLong) async {
Future<void> _updateWeather(
Map<String, dynamic> weatherJson, String latLong) async {
if (this._useWTHR) {
int _weatherId = (weatherJson['id'] != 0) ? weatherJson['id']: generateFakeWeatherId(latLong);
int _weatherId = (weatherJson['id'] != 0)
? weatherJson['id']
: generateFakeWeatherId(latLong);
if ((_weatherId != this.weatherLocationID) ||
(weatherJson['dt'] != this.weatherCurrentDT)) {
double tempTemp = (weatherJson['main']['temp'] != null)
@ -1053,7 +1095,7 @@ class _LatNLongState extends State<LatNLong> {
}
Future<void> _updateLatNLong(int timeStamp, String mapLocation) async {
String mapUrl = gmapExp.stringMatch(mapLocation);
String mapUrl = mapExp.stringMatch(mapLocation);
await parseMapUrl(mapUrl).then((String lattLong) {
setState(() {
this.latnLong = lattLong;
@ -1102,7 +1144,7 @@ class _LatNLongState extends State<LatNLong> {
}
}
Future<void> _deleteLocation() async{
Future<void> _deleteLocation() async {
String _secondNewest = await dbHelper.querySecondNewestMapLocation();
if (_secondNewest != 'none') {
String locationToBeDeleted = this.widgetMapLocation;
@ -1122,10 +1164,12 @@ class _LatNLongState extends State<LatNLong> {
}
}
Future<void> _userTzOffset(int offset) async{
Future<void> _userTzOffset(int offset) async {
if (this._useWTHR) {
if (offset > 1999) { // 2001 is magic number for auto
List<int> _timeOffSet = await refreshTimeOffSet(this.widgetMapLocation,this.latnLong);
if (offset > 1999) {
// 2001 is magic number for auto
List<int> _timeOffSet =
await refreshTimeOffSet(this.widgetMapLocation, this.latnLong);
setState(() {
this.timeOffSet = _timeOffSet[0];
this.timeOffSetTime = _timeOffSet[1];
@ -1151,7 +1195,7 @@ class _LatNLongState extends State<LatNLong> {
}
}
Future<void> _getUseElevPref() async{
Future<void> _getUseElevPref() async {
bool _useElevation = await getPreferenceUseElevation();
if (_useElevation != _useElev) {
setState(() {
@ -1161,7 +1205,7 @@ class _LatNLongState extends State<LatNLong> {
await _getUseWeatherPref();
}
Future<void> _getUseWeatherPref() async{
Future<void> _getUseWeatherPref() async {
bool _useWeather = await getPreferenceUseWeather();
if (_useWeather != _useWTHR) {
setState(() {

215
lib/render_notes.dart
View File

@ -44,7 +44,7 @@ class _RenderNotesState extends State<RenderNotes> {
SliverToBoxAdapter(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget> [
children: <Widget>[
Container(
margin: EdgeInsets.symmetric(
horizontal: 10.0,
@ -54,7 +54,7 @@ class _RenderNotesState extends State<RenderNotes> {
),
),
Row(
children: <Widget> [
children: <Widget>[
Expanded(
child: Container(),
),
@ -63,14 +63,11 @@ class _RenderNotesState extends State<RenderNotes> {
child: ButtonTheme(
height: 55,
padding: EdgeInsets.only(
top: 5,
right: 12,
bottom: 12,
left: 10
),
top: 5, right: 12, bottom: 12, left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
),
color: peacockBlue,
child: Text(
@ -81,21 +78,33 @@ class _RenderNotesState extends State<RenderNotes> {
fontSize: 24,
),
),
onPressed: () async{
Map<PermissionGroup, PermissionStatus> _storagePermissions;
PermissionStatus _storagePermission = await PermissionHandler().checkPermissionStatus(PermissionGroup.storage);
if (_storagePermission == PermissionStatus.denied) {
_storagePermissions = await PermissionHandler().requestPermissions([PermissionGroup.storage]);
onPressed: () async {
Map<PermissionGroup, PermissionStatus>
_storagePermissions;
PermissionStatus _storagePermission =
await PermissionHandler()
.checkPermissionStatus(
PermissionGroup.storage);
if (_storagePermission ==
PermissionStatus.denied) {
_storagePermissions = await PermissionHandler()
.requestPermissions(
[PermissionGroup.storage]);
}
if ((_storagePermission == PermissionStatus.granted) || (_storagePermissions.toString() == PermissionStatus.granted.toString())) {
Directory sdcard = await getExternalStorageDirectory();
if ((_storagePermission ==
PermissionStatus.granted) ||
(_storagePermissions.toString() ==
PermissionStatus.granted.toString())) {
Directory sdcard =
await getExternalStorageDirectory();
showDialog(
context: context,
builder: (BuildContext context) {
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
title: Text(
'File Name To Save As?',
@ -108,8 +117,10 @@ class _RenderNotesState extends State<RenderNotes> {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
TextField(
controller: _textEditingController,
keyboardType: TextInputType.multiline,
controller:
_textEditingController,
keyboardType:
TextInputType.multiline,
maxLines: null,
decoration: InputDecoration(
hintText: 'i.e. timbuktu.md',
@ -129,11 +140,14 @@ class _RenderNotesState extends State<RenderNotes> {
top: 5,
right: 12,
bottom: 12,
left: 10
),
left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
shape:
RoundedRectangleBorder(
borderRadius:
BorderRadius.all(
Radius.circular(
6.0)),
),
color: peacockBlue,
child: Text(
@ -144,47 +158,76 @@ class _RenderNotesState extends State<RenderNotes> {
fontSize: 24,
),
),
onPressed: () async{
if (this._exportFileNameString.length > 0) {
String _fileName = '${sdcard.path}/${this._exportFileNameString}';
File _file = File(_fileName);
File _result = await _file.writeAsString(widget.notes);
Navigator.of(context).pop();
onPressed: () async {
if (this
._exportFileNameString
.length >
0) {
String _fileName =
'${sdcard.path}/${this._exportFileNameString}';
File _file =
File(_fileName);
File _result =
await _file
.writeAsString(
widget
.notes);
Navigator.of(context)
.pop();
if (_result == null) {
setState(() {
this.fileName = _fileName;
this.fileName =
_fileName;
});
showDialog(
context: context,
builder: (BuildContext context) {
builder:
(BuildContext
context) {
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
backgroundColor:
ivory,
shape:
RoundedRectangleBorder(
borderRadius:
BorderRadius.all(
Radius.circular(6.0)),
),
title: Text(
'Writing To\n\'$fileName\'\n(sdcard) Failed!',
textAlign: TextAlign.center,
style: TextStyle(
color: candyApple,
textAlign:
TextAlign
.center,
style:
TextStyle(
color:
candyApple,
),
),
content: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
content:
Column(
mainAxisSize:
MainAxisSize
.min,
children: <
Widget>[
Container(
margin: EdgeInsets.only(
top: 40,
bottom: 10,
margin:
EdgeInsets.only(
top:
40,
bottom:
10,
),
child: ButtonTheme(
height: 55,
child:
ButtonTheme(
height:
55,
padding: EdgeInsets.only(
top: 5,
right: 12,
bottom: 12,
left: 10
),
left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
@ -198,52 +241,69 @@ class _RenderNotesState extends State<RenderNotes> {
fontSize: 24,
),
),
onPressed: () async{
onPressed: () async {
Navigator.of(context).pop();
}
),
}),
),
),
],
),
);
}
);
});
} else {
setState(() {
this.fileName = _fileName;
this.fileName =
_fileName;
});
showDialog(
context: context,
builder: (BuildContext context) {
builder:
(BuildContext
context) {
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
backgroundColor:
ivory,
shape:
RoundedRectangleBorder(
borderRadius:
BorderRadius.all(
Radius.circular(6.0)),
),
title: Text(
'Writing To\n\'$fileName\'\n(sdcard) Succeeded!',
textAlign: TextAlign.center,
style: TextStyle(
color: candyApple,
textAlign:
TextAlign
.center,
style:
TextStyle(
color:
candyApple,
),
),
content: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
content:
Column(
mainAxisSize:
MainAxisSize
.min,
children: <
Widget>[
Container(
margin: EdgeInsets.only(
top: 40,
bottom: 10,
margin:
EdgeInsets.only(
top:
40,
bottom:
10,
),
child: ButtonTheme(
height: 55,
child:
ButtonTheme(
height:
55,
padding: EdgeInsets.only(
top: 5,
right: 12,
bottom: 12,
left: 10
),
left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
@ -257,31 +317,26 @@ class _RenderNotesState extends State<RenderNotes> {
fontSize: 24,
),
),
onPressed: () async{
onPressed: () async {
Navigator.of(context).pop();
}
),
}),
),
),
],
),
);
}
);
});
}
}
}
),
}),
),
),
],
),
);
});
}
);
}
}
),
}),
),
),
],

198
lib/settings.dart
View File

@ -32,14 +32,17 @@ class _SettingsState extends State<Settings> {
@override
Widget build(BuildContext context) {
Future<void> _showDBImportDialog() async{
Future<void> _showDBImportDialog() async {
Map<PermissionGroup, PermissionStatus> _storagePermissions;
PermissionStatus _storagePermission = await PermissionHandler().checkPermissionStatus(PermissionGroup.storage);
PermissionStatus _storagePermission = await PermissionHandler()
.checkPermissionStatus(PermissionGroup.storage);
if (_storagePermission == PermissionStatus.denied) {
_storagePermissions = await PermissionHandler().requestPermissions([PermissionGroup.storage]);
_storagePermissions = await PermissionHandler()
.requestPermissions([PermissionGroup.storage]);
}
if ((_storagePermission == PermissionStatus.granted) || (_storagePermissions.toString() == PermissionStatus.granted.toString())) {
if ((_storagePermission == PermissionStatus.granted) ||
(_storagePermissions.toString() ==
PermissionStatus.granted.toString())) {
showDialog(
context: context,
builder: (BuildContext context) {
@ -66,14 +69,11 @@ class _SettingsState extends State<Settings> {
child: ButtonTheme(
height: 55,
padding: EdgeInsets.only(
top: 5,
right: 12,
bottom: 12,
left: 10
),
top: 5, right: 12, bottom: 12, left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
),
color: peacockBlue,
child: Text(
@ -84,13 +84,16 @@ class _SettingsState extends State<Settings> {
fontSize: 24,
),
),
onPressed: () async{
onPressed: () async {
String _filePath;
_filePath = await FilePicker.getFilePath(type: FileType.ANY);
_filePath = await FilePicker.getFilePath(
type: FileType.ANY);
Navigator.of(context).pop();
try {
String _importString = await File(_filePath).readAsString();
bool _imported = await importDataBase(_importString);
String _importString =
await File(_filePath).readAsString();
bool _imported =
await importDataBase(_importString);
if (_imported) {
showDialog(
context: context,
@ -98,7 +101,8 @@ class _SettingsState extends State<Settings> {
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
title: Text(
'Importing From\n\'$_filePath\'\n Succeeded!',
@ -121,11 +125,14 @@ class _SettingsState extends State<Settings> {
top: 5,
right: 12,
bottom: 12,
left: 10
),
left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
shape:
RoundedRectangleBorder(
borderRadius:
BorderRadius.all(
Radius.circular(
6.0)),
),
color: peacockBlue,
child: Text(
@ -136,19 +143,18 @@ class _SettingsState extends State<Settings> {
fontSize: 24,
),
),
onPressed: () async{
Navigator.of(context).pop();
}
),
onPressed: () async {
Navigator.of(context)
.pop();
}),
),
),
],
),
);
});
}
);
}
} catch(e) {
} catch (e) {
print(e);
showDialog(
context: context,
@ -156,7 +162,8 @@ class _SettingsState extends State<Settings> {
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
title: Text(
'Oops, something went wrong',
@ -179,11 +186,14 @@ class _SettingsState extends State<Settings> {
top: 5,
right: 12,
bottom: 12,
left: 10
),
left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
shape:
RoundedRectangleBorder(
borderRadius:
BorderRadius.all(
Radius.circular(
6.0)),
),
color: peacockBlue,
child: Text(
@ -194,37 +204,38 @@ class _SettingsState extends State<Settings> {
fontSize: 24,
),
),
onPressed: () async{
Navigator.of(context).pop();
}
),
onPressed: () async {
Navigator.of(context)
.pop();
}),
),
),
],
),
);
});
}
);
}
}
),
}),
),
),
],
),
);
}
);
});
}
}
Future<void> _showDBExportDialog() async{
Future<void> _showDBExportDialog() async {
Map<PermissionGroup, PermissionStatus> _storagePermissions;
PermissionStatus _storagePermission = await PermissionHandler().checkPermissionStatus(PermissionGroup.storage);
PermissionStatus _storagePermission = await PermissionHandler()
.checkPermissionStatus(PermissionGroup.storage);
if (_storagePermission == PermissionStatus.denied) {
_storagePermissions = await PermissionHandler().requestPermissions([PermissionGroup.storage]);
_storagePermissions = await PermissionHandler()
.requestPermissions([PermissionGroup.storage]);
}
if ((_storagePermission == PermissionStatus.granted) || (_storagePermissions.toString() == PermissionStatus.granted.toString())) {
if ((_storagePermission == PermissionStatus.granted) ||
(_storagePermissions.toString() ==
PermissionStatus.granted.toString())) {
Directory sdcard = await getExternalStorageDirectory();
showDialog(
context: context,
@ -258,7 +269,8 @@ class _SettingsState extends State<Settings> {
hintText: this._dbExportFileNameString,
),
onChanged: (text) {
this._dbExportFileNameString = (text.length > 0) ? text : "libre_gps_parser.json";
this._dbExportFileNameString =
(text.length > 0) ? text : "libre_gps_parser.json";
},
),
Container(
@ -269,14 +281,11 @@ class _SettingsState extends State<Settings> {
child: ButtonTheme(
height: 55,
padding: EdgeInsets.only(
top: 5,
right: 12,
bottom: 12,
left: 10
),
top: 5, right: 12, bottom: 12, left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
),
color: peacockBlue,
child: Text(
@ -287,13 +296,16 @@ class _SettingsState extends State<Settings> {
fontSize: 24,
),
),
onPressed: () async{
onPressed: () async {
_updatedbExportFileName();
final dbHelper = DatabaseHelper.instance;
String _dbExportString = await dbHelper.queryDBExport();
String _absoluteDBExportFileName = '${sdcard.path}/${this._dbExportFileNameString}';
String _dbExportString =
await dbHelper.queryDBExport();
String _absoluteDBExportFileName =
'${sdcard.path}/${this._dbExportFileNameString}';
File _file = File(_absoluteDBExportFileName);
File _result = await _file.writeAsString(_dbExportString);
File _result =
await _file.writeAsString(_dbExportString);
Navigator.of(context).pop();
if (_result == null) {
showDialog(
@ -302,7 +314,8 @@ class _SettingsState extends State<Settings> {
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
title: Text(
'Writing To\n\'$_absoluteDBExportFileName\'\n(sdcard) Failed!',
@ -325,11 +338,14 @@ class _SettingsState extends State<Settings> {
top: 5,
right: 12,
bottom: 12,
left: 10
),
left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
shape:
RoundedRectangleBorder(
borderRadius:
BorderRadius.all(
Radius.circular(
6.0)),
),
color: peacockBlue,
child: Text(
@ -340,17 +356,16 @@ class _SettingsState extends State<Settings> {
fontSize: 24,
),
),
onPressed: () async{
Navigator.of(context).pop();
}
),
onPressed: () async {
Navigator.of(context)
.pop();
}),
),
),
],
),
);
}
);
});
} else {
showDialog(
context: context,
@ -358,7 +373,8 @@ class _SettingsState extends State<Settings> {
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
title: Text(
'Writing To\n\'$_absoluteDBExportFileName\'\n(sdcard) Succeeded!',
@ -381,11 +397,14 @@ class _SettingsState extends State<Settings> {
top: 5,
right: 12,
bottom: 12,
left: 10
),
left: 10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
shape:
RoundedRectangleBorder(
borderRadius:
BorderRadius.all(
Radius.circular(
6.0)),
),
color: peacockBlue,
child: Text(
@ -396,27 +415,24 @@ class _SettingsState extends State<Settings> {
fontSize: 24,
),
),
onPressed: () async{
Navigator.of(context).pop();
}
),
onPressed: () async {
Navigator.of(context)
.pop();
}),
),
),
],
),
);
});
}
);
}
}
),
}),
),
),
],
),
);
}
);
});
}
}
@ -450,7 +466,8 @@ class _SettingsState extends State<Settings> {
child: Switch(
value: this._useElevation,
onChanged: (value) {
setPreferenceUseElevation(value).then((bool committed) {
setPreferenceUseElevation(value)
.then((bool committed) {
setState(() {
this._useElevation = value;
});
@ -465,7 +482,8 @@ class _SettingsState extends State<Settings> {
],
),
),
((this._useElevation) ? Container(
((this._useElevation)
? Container(
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: Column(
@ -503,7 +521,8 @@ class _SettingsState extends State<Settings> {
),
],
),
) : Container()),
)
: Container()),
Container(
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
@ -540,7 +559,8 @@ class _SettingsState extends State<Settings> {
],
),
),
((this._useWeather) ? Container(
((this._useWeather)
? Container(
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
child: Column(
@ -578,7 +598,8 @@ class _SettingsState extends State<Settings> {
),
],
),
) : Container()),
)
: Container()),
Container(
padding: myBoxPadding,
decoration: myBoxDecoration(ivory),
@ -738,5 +759,4 @@ class _SettingsState extends State<Settings> {
Navigator.pop(context, 3);
return Future.value(false);
}
}

71
lib/timezone.dart
View File

@ -34,13 +34,13 @@ class _TimeZoneState extends State<TimeZone> {
final double textHeight = 1.5;
return Row(
children: <Widget> [
children: <Widget>[
Expanded(
flex: 7,
child: InkWell(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget> [
children: <Widget>[
Text(
'Time Offset:',
style: TextStyle(
@ -53,7 +53,9 @@ class _TimeZoneState extends State<TimeZone> {
text: TextSpan(
children: <TextSpan>[
TextSpan(
text: (widget.timeOffSet != 2000) ? '$offSet' : 'INVALID',
text: (widget.timeOffSet != 2000)
? '$offSet'
: 'INVALID',
style: TextStyle(
height: textHeight,
color: Colors.black,
@ -76,7 +78,9 @@ class _TimeZoneState extends State<TimeZone> {
text: TextSpan(
children: <TextSpan>[
TextSpan(
text: (widget.isAutoTimeOffSet == 1) ? 'as of' : 'MANUAL SETTING',
text: (widget.isAutoTimeOffSet == 1)
? 'as of'
: 'MANUAL SETTING',
style: TextStyle(
height: textHeight,
color: candyApple,
@ -84,7 +88,9 @@ class _TimeZoneState extends State<TimeZone> {
),
),
TextSpan(
text: (widget.isAutoTimeOffSet == 1) ? ' $elapsedHours' : '',
text: (widget.isAutoTimeOffSet == 1)
? ' $elapsedHours'
: '',
style: TextStyle(
height: textHeight,
color: Colors.black,
@ -118,19 +124,21 @@ class _TimeZoneState extends State<TimeZone> {
context: context,
builder: (BuildContext context) {
final FixedExtentScrollController scrollController =
FixedExtentScrollController(initialItem: _getTimeZoneListIndex());
FixedExtentScrollController(
initialItem: _getTimeZoneListIndex());
return AlertDialog(
backgroundColor: ivory,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
),
content: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
content:
Column(mainAxisSize: MainAxisSize.min, children: <
Widget>[
ButtonTheme(
height: 75,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
),
child: RaisedButton(
onPressed: () {
@ -180,7 +188,8 @@ class _TimeZoneState extends State<TimeZone> {
});
}
},
children: List<Widget>.generate(timeZoneList.length, (int index) {
children: List<Widget>.generate(timeZoneList.length,
(int index) {
return Column(
children: <Widget>[
Container(
@ -188,21 +197,25 @@ class _TimeZoneState extends State<TimeZone> {
color: ivory,
),
Container(
alignment: Alignment(0.0,0.0),
alignment: Alignment(0.0, 0.0),
height: 80,
width: (MediaQuery.of(context).size.width * .9),
width: (MediaQuery.of(context).size.width *
.9),
decoration: BoxDecoration(
color: peacockBlue,
border: Border.all(
width: 2.0,
),
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius: BorderRadius.all(
Radius.circular(6.0)),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: <Widget>[
Text(
_parseTimeZoneOffSet(timeZoneList[index]['offset']),
_parseTimeZoneOffSet(
timeZoneList[index]['offset']),
style: TextStyle(
height: textHeight,
color: Colors.white,
@ -229,13 +242,11 @@ class _TimeZoneState extends State<TimeZone> {
}),
),
),
]
),
]),
);
},
);
}
),
}),
),
Expanded(
flex: 3,
@ -287,7 +298,8 @@ class _TimeZoneState extends State<TimeZone> {
child: ButtonTheme(
height: 75,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6.0)),
borderRadius:
BorderRadius.all(Radius.circular(6.0)),
),
child: RaisedButton(
color: peacockBlue,
@ -299,7 +311,8 @@ class _TimeZoneState extends State<TimeZone> {
top: 10,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
mainAxisAlignment:
MainAxisAlignment.spaceAround,
children: <Widget>[
Text(
'List',
@ -334,29 +347,29 @@ class _TimeZoneState extends State<TimeZone> {
),
onPressed: () {
Navigator.of(context).pop();
urlLaunch('https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations');
}
),
urlLaunch(
'https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations');
}),
),
),
],
),
);
}
);
});
},
),
),
),
],
);
}
int _getTimeZoneListIndex() {
// 2001 is a magic number which means auto
// as in the tz offset is automatically set
return timeZoneList.indexOf(timeZoneList.singleWhere((timeZone) => timeZone['offset'] == ((widget.isAutoTimeOffSet == 1) ? 2001 : widget.timeOffSet)));
return timeZoneList.indexOf(timeZoneList.singleWhere((timeZone) =>
timeZone['offset'] ==
((widget.isAutoTimeOffSet == 1) ? 2001 : widget.timeOffSet)));
}
String _parseTimeZoneOffSet(int offset) {

86
lib/timezones.dart
View File

@ -1,48 +1,46 @@
// https://en.wikipedia.org/wiki/List_of_time_zone_abbreviations
final List<Map<String, Object>> timeZoneList = [
{ 'offset' : -720, 'tz' : 'BIT, IDLW' },
{ 'offset' : -660, 'tz' : 'NUT, SST' },
{ 'offset' : -600, 'tz' : 'HST, TAHT' },
{ 'offset' : -570, 'tz' : 'MART, MIT' },
{ 'offset' : -540, 'tz' : 'AKST, HDT' },
{ 'offset' : -480, 'tz' : 'AKDT, PST' },
{ 'offset' : -420, 'tz' : 'MST, PDT' },
{ 'offset' : -360, 'tz' : 'CST, GALT' },
{ 'offset' : -300, 'tz' : 'EST, PET' },
{ 'offset' : -240, 'tz' : 'AMT, AST' },
{ 'offset' : -210, 'tz' : 'NST, NT' },
{ 'offset' : -180, 'tz' : 'ADT, FKST' },
{ 'offset' : -150, 'tz' : 'NDT' },
{ 'offset' : -120, 'tz' : 'GST, UYST' },
{ 'offset' : -60, 'tz' : 'CVT, EGT' },
{ 'offset' : 0, 'tz' : 'GMT, UTC' },
{ 'offset' : 60, 'tz' : 'CET, BST' },
{ 'offset' : 120, 'tz' : 'EET, CEST' },
{ 'offset' : 180, 'tz' : 'FET, EEST' },
{ 'offset' : 210, 'tz' : 'IRST' },
{ 'offset' : 240, 'tz' : 'AMT, VOLT' },
{ 'offset' : 270, 'tz' : 'AFT, IRDT' },
{ 'offset' : 300, 'tz' : 'PKT, TFT' },
{ 'offset' : 330, 'tz' : 'IST, SLST' },
{ 'offset' : 345, 'tz' : 'NPT' },
{ 'offset' : 360, 'tz' : 'BST, VOST' },
{ 'offset' : 390, 'tz' : 'CCT, MMT' },
{ 'offset' : 420, 'tz' : 'CXT, THA' },
{ 'offset' : 480, 'tz' : 'AWST, HKT' },
{ 'offset' : 525, 'tz' : 'ACWST' },
{ 'offset' : 540, 'tz' : 'JST, YAKT' },
{ 'offset' : 570, 'tz' : 'ACST' },
{ 'offset' : 600, 'tz' : 'AEST, VLAT' },
{ 'offset' : 630, 'tz' : 'ACDT, LHST' },
{ 'offset' : 660, 'tz' : 'AEDT, VUT' },
{ 'offset' : 720, 'tz' : 'NZST, WAKT' },
{ 'offset' : 765, 'tz' : 'CHAST' },
{ 'offset' : 780, 'tz' : 'NZDT, TOT' },
{ 'offset' : 825, 'tz' : 'CHADT' },
{ 'offset' : 840, 'tz' : 'LINT' },
{ 'offset' : 2000, 'tz' : 'INVLD' },
{ 'offset' : 2001, 'tz' : 'AUTO' },
{'offset': -720, 'tz': 'BIT, IDLW'},
{'offset': -660, 'tz': 'NUT, SST'},
{'offset': -600, 'tz': 'HST, TAHT'},
{'offset': -570, 'tz': 'MART, MIT'},
{'offset': -540, 'tz': 'AKST, HDT'},
{'offset': -480, 'tz': 'AKDT, PST'},
{'offset': -420, 'tz': 'MST, PDT'},
{'offset': -360, 'tz': 'CST, GALT'},
{'offset': -300, 'tz': 'EST, PET'},
{'offset': -240, 'tz': 'AMT, AST'},
{'offset': -210, 'tz': 'NST, NT'},
{'offset': -180, 'tz': 'ADT, FKST'},
{'offset': -150, 'tz': 'NDT'},
{'offset': -120, 'tz': 'GST, UYST'},
{'offset': -60, 'tz': 'CVT, EGT'},
{'offset': 0, 'tz': 'GMT, UTC'},
{'offset': 60, 'tz': 'CET, BST'},
{'offset': 120, 'tz': 'EET, CEST'},
{'offset': 180, 'tz': 'FET, EEST'},
{'offset': 210, 'tz': 'IRST'},
{'offset': 240, 'tz': 'AMT, VOLT'},
{'offset': 270, 'tz': 'AFT, IRDT'},
{'offset': 300, 'tz': 'PKT, TFT'},
{'offset': 330, 'tz': 'IST, SLST'},
{'offset': 345, 'tz': 'NPT'},
{'offset': 360, 'tz': 'BST, VOST'},
{'offset': 390, 'tz': 'CCT, MMT'},
{'offset': 420, 'tz': 'CXT, THA'},
{'offset': 480, 'tz': 'AWST, HKT'},
{'offset': 525, 'tz': 'ACWST'},
{'offset': 540, 'tz': 'JST, YAKT'},
{'offset': 570, 'tz': 'ACST'},
{'offset': 600, 'tz': 'AEST, VLAT'},
{'offset': 630, 'tz': 'ACDT, LHST'},
{'offset': 660, 'tz': 'AEDT, VUT'},
{'offset': 720, 'tz': 'NZST, WAKT'},
{'offset': 765, 'tz': 'CHAST'},
{'offset': 780, 'tz': 'NZDT, TOT'},
{'offset': 825, 'tz': 'CHADT'},
{'offset': 840, 'tz': 'LINT'},
{'offset': 2000, 'tz': 'INVLD'},
{'offset': 2001, 'tz': 'AUTO'},
];

33
lib/weather.dart
View File

@ -63,7 +63,8 @@ class _WeatherState extends State<Weather> {
final bool _stale = (_staleness > 3600);
Expanded _refresh() {
return _stale ? Expanded(
return _stale
? Expanded(
flex: 4,
child: Container(
child: IconButton(
@ -75,11 +76,14 @@ class _WeatherState extends State<Weather> {
widget.parentAction();
},
),
),) : Expanded(child: Container());
),
)
: Expanded(child: Container());
}
Expanded _staleNotice() {
return _stale ? Expanded(
return _stale
? Expanded(
flex: 6,
child: RichText(
textAlign: TextAlign.justify,
@ -108,7 +112,8 @@ class _WeatherState extends State<Weather> {
),
),
TextSpan(
text: '. You probably want to check your network connection and then ',
text:
'. You probably want to check your network connection and then ',
style: TextStyle(
color: Colors.black,
fontSize: 16,
@ -132,7 +137,8 @@ class _WeatherState extends State<Weather> {
],
),
),
) : Expanded(child: Container());
)
: Expanded(child: Container());
}
Column _currentConditions() {
@ -247,8 +253,7 @@ class _WeatherState extends State<Weather> {
),
),
TextSpan(
text:
'${widget.weatherCurrentTempMin.round()}\u00B0',
text: '${widget.weatherCurrentTempMin.round()}\u00B0',
style: TextStyle(
height: textHeight,
color: Colors.black,
@ -298,8 +303,7 @@ class _WeatherState extends State<Weather> {
),
),
TextSpan(
text:
'${widget.weatherCurrentTempMax.round()}\u00B0',
text: '${widget.weatherCurrentTempMax.round()}\u00B0',
style: TextStyle(
height: textHeight,
color: Colors.black,
@ -468,8 +472,7 @@ class _WeatherState extends State<Weather> {
text: TextSpan(
children: <TextSpan>[
TextSpan(
text:
'${(widget.weatherCurrentWindSpd * 1.60934).round()}',
text: '${(widget.weatherCurrentWindSpd * 1.60934).round()}',
style: TextStyle(
height: textHeight,
color: Colors.black,
@ -901,7 +904,8 @@ class _WeatherState extends State<Weather> {
return Container(
width: 100,
child: CachedNetworkImage(
imageUrl: 'http://openweathermap.org/img/w/${widget.weatherConditionsIcon}.png',
imageUrl:
'http://openweathermap.org/img/w/${widget.weatherConditionsIcon}.png',
),
);
}
@ -1215,7 +1219,6 @@ class _WeatherState extends State<Weather> {
),
);
}
}
Map<String, String> get3WayTime(int secondsFromEpoch, int timeOffSet) {
@ -1223,7 +1226,9 @@ class _WeatherState extends State<Weather> {
DateTime.fromMillisecondsSinceEpoch(secondsFromEpoch * 1000).toUtc();
DateTime thereTime = utcTime.add(Duration(minutes: timeOffSet));
DateTime hereTime = utcTime.toLocal();
String there = (timeOffSet != 2000) ? DateFormat('EEEE MMMM d, HH:mm').format(thereTime) : 'UNKNOWN, INVALID';
String there = (timeOffSet != 2000)
? DateFormat('EEEE MMMM d, HH:mm').format(thereTime)
: 'UNKNOWN, INVALID';
String here = DateFormat('EEEE MMMM d, HH:mm').format(hereTime);
String utc = DateFormat('EEEE MMMM d, HH:mm').format(utcTime);
return {

21
lib/weather_forecast.dart
View File

@ -81,7 +81,8 @@ class _WeatherForeCastState extends State<WeatherForeCast> {
return Container(
width: 100,
child: CachedNetworkImage(
imageUrl: 'http://openweathermap.org/img/w/${foreCast['weather'][0]['icon']}.png',
imageUrl:
'http://openweathermap.org/img/w/${foreCast['weather'][0]['icon']}.png',
),
);
}
@ -183,8 +184,7 @@ class _WeatherForeCastState extends State<WeatherForeCast> {
),
),
TextSpan(
text:
'${foreCast['wind']['deg'].round()}\u00B0, ',
text: '${foreCast['wind']['deg'].round()}\u00B0, ',
style: TextStyle(
height: textHeight,
color: Colors.black,
@ -225,8 +225,7 @@ class _WeatherForeCastState extends State<WeatherForeCast> {
),
),
TextSpan(
text:
'${foreCast['main']['temp'].round()}\u00B0',
text: '${foreCast['main']['temp'].round()}\u00B0',
style: TextStyle(
height: textHeight,
color: Colors.black,
@ -276,8 +275,7 @@ class _WeatherForeCastState extends State<WeatherForeCast> {
),
),
TextSpan(
text:
'${foreCast['main']['temp_min'].round()}\u00B0',
text: '${foreCast['main']['temp_min'].round()}\u00B0',
style: TextStyle(
height: textHeight,
color: Colors.black,
@ -327,8 +325,7 @@ class _WeatherForeCastState extends State<WeatherForeCast> {
),
),
TextSpan(
text:
'${foreCast['main']['temp_max'].round()}\u00B0',
text: '${foreCast['main']['temp_max'].round()}\u00B0',
style: TextStyle(
height: textHeight,
color: Colors.black,
@ -991,7 +988,7 @@ class _WeatherForeCastState extends State<WeatherForeCast> {
children: createForeCast(foreCastJson['list']),
),
);
} catch(e) {
} catch (e) {
return Container(
margin: EdgeInsets.symmetric(
vertical: 3,
@ -1037,7 +1034,9 @@ class _WeatherForeCastState extends State<WeatherForeCast> {
DateTime.fromMillisecondsSinceEpoch(secondsFromEpoch * 1000).toUtc();
DateTime thereTime = utcTime.add(Duration(minutes: timeOffSet));
DateTime hereTime = utcTime.toLocal();
String there = (timeOffSet != 2000) ? DateFormat('EEEE MMMM d, HH:mm').format(thereTime) : 'UNKNOWN, INVALID';
String there = (timeOffSet != 2000)
? DateFormat('EEEE MMMM d, HH:mm').format(thereTime)
: 'UNKNOWN, INVALID';
String here = DateFormat('EEEE MMMM d, HH:mm').format(hereTime);
String utc = DateFormat('EEEE MMMM d, HH:mm').format(utcTime);
return {

2
pubspec.yaml
View File

@ -11,7 +11,7 @@ description: A new Flutter project.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 0.1.2+8
version: 0.1.2+10
environment:
sdk: ">=2.1.0 <3.0.0"