Skip to content

Commit e520929

Browse files
committed
chore: migrate fl_lib
1 parent 8f09085 commit e520929

File tree

6 files changed

+62
-69
lines changed

6 files changed

+62
-69
lines changed

lib/core/sync.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const bakSync = BakSyncer._();
77

88
final icloud = ICloud(containerId: 'iCloud.tech.lolli.serverbox');
99

10-
final class BakSyncer extends SyncIface<Backup> {
10+
final class BakSyncer extends SyncIface {
1111
const BakSyncer._() : super();
1212

1313
@override

lib/data/model/app/backup.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ class Backup implements Mergeable {
5353
spis: Stores.server.fetch(),
5454
snippets: Stores.snippet.fetch(),
5555
keys: Stores.key.fetch(),
56-
container: await Stores.container.getAllMap(),
56+
container: Stores.container.getAllMap(),
5757
lastModTime: lastModTime,
58-
history: await Stores.history.getAllMap(),
59-
settings: await Stores.setting.getAllMap(),
58+
history: Stores.history.getAllMap(),
59+
settings: Stores.setting.getAllMap(),
6060
);
6161
}
6262

lib/view/page/setting/entries/server.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ extension _Server on _AppSettingsPageState {
206206
}
207207

208208
Future<void> _editRawSettings() async {
209-
final map = await Stores.setting.getAllMap(includeInternalKeys: true);
209+
final map = Stores.setting.getAllMap(includeInternalKeys: true);
210210
final keys = map.keys;
211211

212212
void onSave(BuildContext context, EditorPageRet ret) {

lib/view/page/setting/platform/android.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class _AndroidSettingsPageState extends State<AndroidSettingsPage> {
6868
trailing: const Icon(Icons.keyboard_arrow_right),
6969
onTap: () async {
7070
final data = <String, String>{};
71-
final keys = await PrefStore.shared.keys();
71+
final keys = PrefStore.shared.keys();
7272

7373
for (final key in keys) {
7474
final val = PrefStore.shared.get<String>(key);

pubspec.lock

+54-61
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ packages:
6666
dependency: transitive
6767
description:
6868
name: archive
69-
sha256: "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12"
69+
sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
7070
url: "https://pub.dev"
7171
source: hosted
72-
version: "4.0.5"
72+
version: "4.0.7"
7373
args:
7474
dependency: transitive
7575
description:
@@ -82,10 +82,10 @@ packages:
8282
dependency: transitive
8383
description:
8484
name: asn1lib
85-
sha256: e02d018628c870ef2d7f03e33f9ad179d89ff6ec52ca6c56bcb80bcef979867f
85+
sha256: "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623"
8686
url: "https://pub.dev"
8787
source: hosted
88-
version: "1.6.2"
88+
version: "1.6.4"
8989
async:
9090
dependency: transitive
9191
description:
@@ -178,26 +178,26 @@ packages:
178178
dependency: transitive
179179
description:
180180
name: camera_android_camerax
181-
sha256: "13784f539c7f104766bff84e4479a70f03b29d78b208278be45c939250d9d7f5"
181+
sha256: f0dcbce91623f75030840609de9b64d0d73f86df279c6e9588c1501245a05eb2
182182
url: "https://pub.dev"
183183
source: hosted
184-
version: "0.6.14+1"
184+
version: "0.6.15+2"
185185
camera_avfoundation:
186186
dependency: transitive
187187
description:
188188
name: camera_avfoundation
189-
sha256: ba48b65a3a97004276ede882e6b838d9667642ff462c95a8bb57ca8a82b6bd25
189+
sha256: a33cd9a250296271cdf556891b7c0986a93772426f286595eccd5f45b185933c
190190
url: "https://pub.dev"
191191
source: hosted
192-
version: "0.9.18+11"
192+
version: "0.9.18+14"
193193
camera_platform_interface:
194194
dependency: transitive
195195
description:
196196
name: camera_platform_interface
197-
sha256: "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31"
197+
sha256: "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2"
198198
url: "https://pub.dev"
199199
source: hosted
200-
version: "2.9.0"
200+
version: "2.10.0"
201201
camera_web:
202202
dependency: transitive
203203
description:
@@ -405,22 +405,18 @@ packages:
405405
dependency: "direct main"
406406
description:
407407
name: extended_image
408-
sha256: fcefcf3cba32696c639e9e305a790039709d05a7139320b91bb9d300993452e2
409-
sha256: fcefcf3cba32696c639e9e305a790039709d05a7139320b91bb9d300993452e2
408+
sha256: f6cbb1d798f51262ed1a3d93b4f1f2aa0d76128df39af18ecb77fa740f88b2e0
410409
url: "https://pub.dev"
411410
source: hosted
412-
version: "10.0.0"
413-
version: "10.0.0"
411+
version: "10.0.1"
414412
extended_image_library:
415413
dependency: transitive
416414
description:
417415
name: extended_image_library
418416
sha256: ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5
419-
sha256: ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5
420417
url: "https://pub.dev"
421418
source: hosted
422419
version: "5.0.0"
423-
version: "5.0.0"
424420
fake_async:
425421
dependency: transitive
426422
description:
@@ -449,12 +445,10 @@ packages:
449445
dependency: "direct main"
450446
description:
451447
name: file_picker
452-
sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b"
453-
sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b"
448+
sha256: "09b474c0c8117484b80cbebc043801ff91e05cfbd2874d512825c899e1754694"
454449
url: "https://pub.dev"
455450
source: hosted
456-
version: "9.2.1"
457-
version: "9.2.1"
451+
version: "9.2.3"
458452
fixnum:
459453
dependency: transitive
460454
description:
@@ -484,8 +478,8 @@ packages:
484478
dependency: "direct main"
485479
description:
486480
path: "."
487-
ref: "v1.0.263"
488-
resolved-ref: "42579f45363029584c6fbe11f84b6aa0780339e7"
481+
ref: "v1.0.269"
482+
resolved-ref: "338eb9135ea24f1d936ec023511a22d6c409576d"
489483
url: "https://github.com/lppcg/fl_lib"
490484
source: git
491485
version: "0.0.1"
@@ -599,10 +593,10 @@ packages:
599593
dependency: transitive
600594
description:
601595
name: flutter_markdown
602-
sha256: e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5
596+
sha256: "634622a3a826d67cb05c0e3e576d1812c430fa98404e95b60b131775c73d76ec"
603597
url: "https://pub.dev"
604598
source: hosted
605-
version: "0.7.6+2"
599+
version: "0.7.7"
606600
flutter_markdown_latex:
607601
dependency: transitive
608602
description:
@@ -623,18 +617,18 @@ packages:
623617
dependency: "direct dev"
624618
description:
625619
name: flutter_native_splash
626-
sha256: edb09c35ee9230c4b03f13dd45bb3a276d0801865f0a4650b7e2a3bba61a803a
620+
sha256: "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc"
627621
url: "https://pub.dev"
628622
source: hosted
629-
version: "2.4.5"
623+
version: "2.4.6"
630624
flutter_plugin_android_lifecycle:
631625
dependency: transitive
632626
description:
633627
name: flutter_plugin_android_lifecycle
634-
sha256: "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3"
628+
sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e
635629
url: "https://pub.dev"
636630
source: hosted
637-
version: "2.0.27"
631+
version: "2.0.28"
638632
flutter_reorderable_grid_view:
639633
dependency: "direct main"
640634
description:
@@ -655,10 +649,10 @@ packages:
655649
dependency: transitive
656650
description:
657651
name: flutter_svg
658-
sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
652+
sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1
659653
url: "https://pub.dev"
660654
source: hosted
661-
version: "2.0.17"
655+
version: "2.1.0"
662656
flutter_test:
663657
dependency: "direct dev"
664658
description: flutter
@@ -745,10 +739,10 @@ packages:
745739
dependency: transitive
746740
description:
747741
name: html
748-
sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
742+
sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
749743
url: "https://pub.dev"
750744
source: hosted
751-
version: "0.15.5"
745+
version: "0.15.6"
752746
http:
753747
dependency: transitive
754748
description:
@@ -897,10 +891,10 @@ packages:
897891
dependency: transitive
898892
description:
899893
name: local_auth_android
900-
sha256: "0abe4e72f55c785b28900de52a2522c86baba0988838b5dc22241b072ecccd74"
894+
sha256: "63ad7ca6396290626dc0cb34725a939e4cfe965d80d36112f08d49cf13a8136e"
901895
url: "https://pub.dev"
902896
source: hosted
903-
version: "1.0.48"
897+
version: "1.0.49"
904898
local_auth_darwin:
905899
dependency: transitive
906900
description:
@@ -1049,10 +1043,10 @@ packages:
10491043
dependency: transitive
10501044
description:
10511045
name: path_provider_android
1052-
sha256: "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12"
1046+
sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
10531047
url: "https://pub.dev"
10541048
source: hosted
1055-
version: "2.2.16"
1049+
version: "2.2.17"
10561050
path_provider_foundation:
10571051
dependency: transitive
10581052
description:
@@ -1146,26 +1140,26 @@ packages:
11461140
dependency: transitive
11471141
description:
11481142
name: posix
1149-
sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
1143+
sha256: f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62
11501144
url: "https://pub.dev"
11511145
source: hosted
1152-
version: "6.0.1"
1146+
version: "6.0.2"
11531147
pretty_qr_code:
11541148
dependency: transitive
11551149
description:
11561150
name: pretty_qr_code
1157-
sha256: cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5
1151+
sha256: b078bd5d51956dea4342378af1b092ad962b81bdbb55b10fffce03461da8db74
11581152
url: "https://pub.dev"
11591153
source: hosted
1160-
version: "3.3.0"
1154+
version: "3.4.0"
11611155
provider:
11621156
dependency: transitive
11631157
description:
11641158
name: provider
1165-
sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
1159+
sha256: "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310"
11661160
url: "https://pub.dev"
11671161
source: hosted
1168-
version: "6.1.2"
1162+
version: "6.1.4"
11691163
pub_semver:
11701164
dependency: transitive
11711165
description:
@@ -1290,18 +1284,18 @@ packages:
12901284
dependency: "direct main"
12911285
description:
12921286
name: shared_preferences
1293-
sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
1287+
sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
12941288
url: "https://pub.dev"
12951289
source: hosted
1296-
version: "2.5.2"
1290+
version: "2.5.3"
12971291
shared_preferences_android:
12981292
dependency: transitive
12991293
description:
13001294
name: shared_preferences_android
1301-
sha256: "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad"
1295+
sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
13021296
url: "https://pub.dev"
13031297
source: hosted
1304-
version: "2.4.8"
1298+
version: "2.4.10"
13051299
shared_preferences_foundation:
13061300
dependency: transitive
13071301
description:
@@ -1495,18 +1489,18 @@ packages:
14951489
dependency: transitive
14961490
description:
14971491
name: url_launcher_android
1498-
sha256: "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4"
1492+
sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
14991493
url: "https://pub.dev"
15001494
source: hosted
1501-
version: "6.3.15"
1495+
version: "6.3.16"
15021496
url_launcher_ios:
15031497
dependency: transitive
15041498
description:
15051499
name: url_launcher_ios
1506-
sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
1500+
sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
15071501
url: "https://pub.dev"
15081502
source: hosted
1509-
version: "6.3.2"
1503+
version: "6.3.3"
15101504
url_launcher_linux:
15111505
dependency: transitive
15121506
description:
@@ -1535,10 +1529,10 @@ packages:
15351529
dependency: transitive
15361530
description:
15371531
name: url_launcher_web
1538-
sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9"
1532+
sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
15391533
url: "https://pub.dev"
15401534
source: hosted
1541-
version: "2.4.0"
1535+
version: "2.4.1"
15421536
url_launcher_windows:
15431537
dependency: transitive
15441538
description:
@@ -1607,18 +1601,18 @@ packages:
16071601
dependency: "direct main"
16081602
description:
16091603
name: wakelock_plus
1610-
sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e"
1604+
sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678
16111605
url: "https://pub.dev"
16121606
source: hosted
1613-
version: "1.2.10"
1607+
version: "1.3.2"
16141608
wakelock_plus_platform_interface:
16151609
dependency: transitive
16161610
description:
16171611
name: wakelock_plus_platform_interface
1618-
sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a"
1612+
sha256: e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207
16191613
url: "https://pub.dev"
16201614
source: hosted
1621-
version: "1.2.2"
1615+
version: "1.2.3"
16221616
watch_connectivity:
16231617
dependency: "direct main"
16241618
description:
@@ -1648,18 +1642,18 @@ packages:
16481642
dependency: transitive
16491643
description:
16501644
name: web_socket
1651-
sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
1645+
sha256: bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b
16521646
url: "https://pub.dev"
16531647
source: hosted
1654-
version: "0.1.6"
1648+
version: "1.0.0"
16551649
web_socket_channel:
16561650
dependency: transitive
16571651
description:
16581652
name: web_socket_channel
1659-
sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
1653+
sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
16601654
url: "https://pub.dev"
16611655
source: hosted
1662-
version: "3.0.2"
1656+
version: "3.0.3"
16631657
webdav_client_plus:
16641658
dependency: "direct main"
16651659
description:
@@ -1736,4 +1730,3 @@ packages:
17361730
sdks:
17371731
dart: ">=3.7.0 <4.0.0"
17381732
flutter: ">=3.29.0"
1739-
flutter: ">=3.29.0"

pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ dependencies:
3131
choice: ^2.3.2
3232
flutter_reorderable_grid_view: ^5.1.0
3333
webdav_client_plus: ^1.0.2
34+
flutter_adaptive_scaffold: ^0.3.2
3435
dartssh2:
3536
git:
3637
url: https://github.com/lollipopkit/dartssh2
@@ -58,8 +59,7 @@ dependencies:
5859
fl_lib:
5960
git:
6061
url: https://github.com/lppcg/fl_lib
61-
ref: v1.0.263
62-
flutter_adaptive_scaffold: ^0.3.2
62+
ref: v1.0.269
6363

6464
dependency_overrides:
6565
# webdav_client_plus:

0 commit comments

Comments
 (0)