Skip to content

Commit 865ad01

Browse files
ScriptbashScriptbash
authored
Merge pull request #393 from Scriptbash/update-filepicker
Update file picker
2 parents f679144 + 53a6151 commit 865ad01

4 files changed

Lines changed: 77 additions & 50 deletions

File tree

‎lib/screens/database_settings_screen.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ class DatabaseSettingsScreenState extends State<DatabaseSettingsScreen> {
350350
await platform.invokeMethod('resolveCustomPath', bookmark);
351351
}
352352
} else {
353-
outputDirectory = await FilePicker.platform.getDirectoryPath(
353+
outputDirectory = await FilePicker.getDirectoryPath(
354354
dialogTitle: AppLocalizations.of(context)!.selectDBExportLocation,
355355
);
356356
}
@@ -423,7 +423,7 @@ class DatabaseSettingsScreenState extends State<DatabaseSettingsScreen> {
423423
Future<void> _importDatabase() async {
424424
try {
425425
final dbHelper = DatabaseHelper();
426-
FilePickerResult? result = await FilePicker.platform.pickFiles(
426+
FilePickerResult? result = await FilePicker.pickFiles(
427427
type: FileType.custom,
428428
allowedExtensions: ['zip'],
429429
);
@@ -614,8 +614,8 @@ class DatabaseSettingsScreenState extends State<DatabaseSettingsScreen> {
614614
'resolveCustomPath', pickedBookmark);
615615
}
616616
} else {
617-
directoryPath = await FilePicker.platform
618-
.getDirectoryPath(
617+
directoryPath =
618+
await FilePicker.getDirectoryPath(
619619
dialogTitle: AppLocalizations.of(context)!
620620
.selectCustomDBLocation,
621621
);

‎lib/services/logs_helper.dart‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ class LogsService {
2727
print(
2828
'${record.level.name}: ${record.time}: ${record.loggerName}: ${record.message}');
2929
if (record.error != null) print('Error: ${record.error}');
30-
if (record.stackTrace != null)
30+
if (record.stackTrace != null) {
3131
print('Stacktrace: ${record.stackTrace}');
32+
}
3233
}
3334
});
3435
}
@@ -48,15 +49,16 @@ class LogsService {
4849
buffer.writeln(
4950
'${record.level.name}: ${record.time}: ${record.loggerName}: ${record.message}');
5051
if (record.error != null) buffer.writeln('Error: ${record.error}');
51-
if (record.stackTrace != null)
52+
if (record.stackTrace != null) {
5253
buffer.writeln('Stacktrace: ${record.stackTrace}');
54+
}
5355
buffer.writeln();
5456
}
5557

5658
final Uint8List logBytes =
5759
Uint8List.fromList(buffer.toString().codeUnits);
5860

59-
final String? outputPath = await FilePicker.platform.saveFile(
61+
final String? outputPath = await FilePicker.saveFile(
6062
dialogTitle: AppLocalizations.of(context)!.selectLogsLocation,
6163
fileName: 'wispar_logs.txt',
6264
bytes: logBytes,
@@ -88,8 +90,9 @@ class LogsService {
8890
buffer.writeln(
8991
'${record.level.name}: ${record.time}: ${record.loggerName}: ${record.message}');
9092
if (record.error != null) buffer.writeln('Error: ${record.error}');
91-
if (record.stackTrace != null)
93+
if (record.stackTrace != null) {
9294
buffer.writeln('Stacktrace: ${record.stackTrace}');
95+
}
9396
buffer.writeln();
9497
}
9598

‎pubspec.lock‎

Lines changed: 64 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ packages:
2121
dependency: transitive
2222
description:
2323
name: async
24-
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
24+
sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "2.13.0"
27+
version: "2.13.1"
2828
background_fetch:
2929
dependency: "direct main"
3030
description:
3131
name: background_fetch
32-
sha256: "6f0cec85480eac151f3971f883180d8c0acf6b40001153f1cf7c2c453df4f851"
32+
sha256: f5f0a5774cbe5e71ce62a9daf7f01007d07b3ac0c1fea1ecb131a3c5a273ca38
3333
url: "https://pub.dev"
3434
source: hosted
35-
version: "1.5.0"
35+
version: "1.5.1"
3636
boolean_selector:
3737
dependency: transitive
3838
description:
@@ -117,10 +117,10 @@ packages:
117117
dependency: "direct main"
118118
description:
119119
name: cupertino_icons
120-
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
120+
sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd"
121121
url: "https://pub.dev"
122122
source: hosted
123-
version: "1.0.8"
123+
version: "1.0.9"
124124
dbus:
125125
dependency: transitive
126126
description:
@@ -165,10 +165,10 @@ packages:
165165
dependency: "direct main"
166166
description:
167167
name: file_picker
168-
sha256: "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343"
168+
sha256: f13a03000d942e476bc1ff0a736d2e9de711d2f89a95cd4c1d88f861c3348387
169169
url: "https://pub.dev"
170170
source: hosted
171-
version: "10.3.10"
171+
version: "11.0.2"
172172
fixnum:
173173
dependency: transitive
174174
description:
@@ -375,10 +375,10 @@ packages:
375375
dependency: transitive
376376
description:
377377
name: flutter_plugin_android_lifecycle
378-
sha256: ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1
378+
sha256: "38d1c268de9097ff59cf0e844ac38759fc78f76836d37edad06fa21e182055a0"
379379
url: "https://pub.dev"
380380
source: hosted
381-
version: "2.0.33"
381+
version: "2.0.34"
382382
flutter_secure_storage:
383383
dependency: "direct main"
384384
description:
@@ -439,10 +439,10 @@ packages:
439439
dependency: transitive
440440
description:
441441
name: flutter_svg
442-
sha256: "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95"
442+
sha256: "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9"
443443
url: "https://pub.dev"
444444
source: hosted
445-
version: "2.2.3"
445+
version: "2.2.4"
446446
flutter_test:
447447
dependency: "direct dev"
448448
description: flutter
@@ -473,10 +473,10 @@ packages:
473473
dependency: transitive
474474
description:
475475
name: hooks
476-
sha256: "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6"
476+
sha256: e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388
477477
url: "https://pub.dev"
478478
source: hosted
479-
version: "1.0.1"
479+
version: "1.0.2"
480480
html:
481481
dependency: "direct main"
482482
description:
@@ -533,6 +533,22 @@ packages:
533533
url: "https://pub.dev"
534534
source: hosted
535535
version: "4.0.0"
536+
jni:
537+
dependency: transitive
538+
description:
539+
name: jni
540+
sha256: c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f
541+
url: "https://pub.dev"
542+
source: hosted
543+
version: "1.0.0"
544+
jni_flutter:
545+
dependency: transitive
546+
description:
547+
name: jni_flutter
548+
sha256: "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6"
549+
url: "https://pub.dev"
550+
source: hosted
551+
version: "1.0.1"
536552
json_annotation:
537553
dependency: "direct main"
538554
description:
@@ -593,10 +609,10 @@ packages:
593609
dependency: transitive
594610
description:
595611
name: markdown
596-
sha256: "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1"
612+
sha256: ee85086ad7698b42522c6ad42fe195f1b9898e4d974a1af4576c1a3a176cada9
597613
url: "https://pub.dev"
598614
source: hosted
599-
version: "7.3.0"
615+
version: "7.3.1"
600616
matcher:
601617
dependency: transitive
602618
description:
@@ -633,10 +649,10 @@ packages:
633649
dependency: transitive
634650
description:
635651
name: native_toolchain_c
636-
sha256: "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac"
652+
sha256: "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572"
637653
url: "https://pub.dev"
638654
source: hosted
639-
version: "0.17.4"
655+
version: "0.17.6"
640656
nested:
641657
dependency: transitive
642658
description:
@@ -661,14 +677,22 @@ packages:
661677
url: "https://pub.dev"
662678
source: hosted
663679
version: "4.7.0"
680+
package_config:
681+
dependency: transitive
682+
description:
683+
name: package_config
684+
sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
685+
url: "https://pub.dev"
686+
source: hosted
687+
version: "2.2.0"
664688
package_info_plus:
665689
dependency: "direct main"
666690
description:
667691
name: package_info_plus
668-
sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d
692+
sha256: "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20"
669693
url: "https://pub.dev"
670694
source: hosted
671-
version: "9.0.0"
695+
version: "9.0.1"
672696
package_info_plus_platform_interface:
673697
dependency: transitive
674698
description:
@@ -705,10 +729,10 @@ packages:
705729
dependency: transitive
706730
description:
707731
name: path_provider_android
708-
sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
732+
sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd"
709733
url: "https://pub.dev"
710734
source: hosted
711-
version: "2.2.22"
735+
version: "2.3.1"
712736
path_provider_foundation:
713737
dependency: transitive
714738
description:
@@ -881,10 +905,10 @@ packages:
881905
dependency: "direct dev"
882906
description:
883907
name: remove_unused_localizations
884-
sha256: "20d97b8138938d0fb4ee717bcb5e7e5e9e8bc3d91e2c185f54d13771261b68d9"
908+
sha256: "1690df0d1b8ddeebfbeeeb29f46fa98573d27695dad6e67739aea28a7e209fe3"
885909
url: "https://pub.dev"
886910
source: hosted
887-
version: "1.0.1"
911+
version: "1.1.2"
888912
rxdart:
889913
dependency: transitive
890914
description:
@@ -937,10 +961,10 @@ packages:
937961
dependency: "direct main"
938962
description:
939963
name: share_plus
940-
sha256: "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840"
964+
sha256: "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa"
941965
url: "https://pub.dev"
942966
source: hosted
943-
version: "12.0.1"
967+
version: "12.0.2"
944968
share_plus_platform_interface:
945969
dependency: transitive
946970
description:
@@ -953,18 +977,18 @@ packages:
953977
dependency: "direct main"
954978
description:
955979
name: shared_preferences
956-
sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
980+
sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf
957981
url: "https://pub.dev"
958982
source: hosted
959-
version: "2.5.4"
983+
version: "2.5.5"
960984
shared_preferences_android:
961985
dependency: transitive
962986
description:
963987
name: shared_preferences_android
964-
sha256: "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41"
988+
sha256: e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53
965989
url: "https://pub.dev"
966990
source: hosted
967-
version: "2.4.21"
991+
version: "2.4.23"
968992
shared_preferences_foundation:
969993
dependency: transitive
970994
description:
@@ -985,10 +1009,10 @@ packages:
9851009
dependency: transitive
9861010
description:
9871011
name: shared_preferences_platform_interface
988-
sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
1012+
sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9"
9891013
url: "https://pub.dev"
9901014
source: hosted
991-
version: "2.4.1"
1015+
version: "2.4.2"
9921016
shared_preferences_web:
9931017
dependency: transitive
9941018
description:
@@ -1038,10 +1062,10 @@ packages:
10381062
dependency: transitive
10391063
description:
10401064
name: sqflite_android
1041-
sha256: ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88
1065+
sha256: "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40"
10421066
url: "https://pub.dev"
10431067
source: hosted
1044-
version: "2.4.2+2"
1068+
version: "2.4.2+3"
10451069
sqflite_common:
10461070
dependency: transitive
10471071
description:
@@ -1078,10 +1102,10 @@ packages:
10781102
dependency: transitive
10791103
description:
10801104
name: sqlite3
1081-
sha256: b7cf6b37667f6a921281797d2499ffc60fb878b161058d422064f0ddc78f6aa6
1105+
sha256: "56da3e13ed7d28a66f930aa2b2b29db6736a233f08283326e96321dd812030f5"
10821106
url: "https://pub.dev"
10831107
source: hosted
1084-
version: "3.1.6"
1108+
version: "3.3.1"
10851109
stack_trace:
10861110
dependency: transitive
10871111
description:
@@ -1166,10 +1190,10 @@ packages:
11661190
dependency: transitive
11671191
description:
11681192
name: url_launcher_android
1169-
sha256: "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611"
1193+
sha256: "3bb000251e55d4a209aa0e2e563309dc9bb2befea2295fd0cec1f51760aac572"
11701194
url: "https://pub.dev"
11711195
source: hosted
1172-
version: "6.3.28"
1196+
version: "6.3.29"
11731197
url_launcher_ios:
11741198
dependency: transitive
11751199
description:
@@ -1230,10 +1254,10 @@ packages:
12301254
dependency: transitive
12311255
description:
12321256
name: vector_graphics
1233-
sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6
1257+
sha256: "81da85e9ca8885ade47f9685b953cb098970d11be4821ac765580a6607ea4373"
12341258
url: "https://pub.dev"
12351259
source: hosted
1236-
version: "1.1.19"
1260+
version: "1.1.21"
12371261
vector_graphics_codec:
12381262
dependency: transitive
12391263
description:

‎pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1616
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
1717
# In Windows, build-name is used as the major, minor, and patch parts
1818
# of the product and file versions while build-number is used as the build suffix.
19-
version: 0.10.1+36
19+
version: 0.10.2+38
2020

2121
environment:
2222
sdk: '>=3.2.3 <4.0.0'
@@ -52,7 +52,7 @@ dependencies:
5252
introduction_screen: ^4.0.0
5353
open_filex: ^4.7.0
5454
google_nav_bar: ^5.0.7
55-
file_picker: ^10.0.0
55+
file_picker: ^11.0.2
5656
flutter_local_notifications: 21.0.0
5757
permission_handler: ^12.0.0+1
5858
latext: ^0.5.0

0 commit comments

Comments
 (0)