diff --git a/lib/core/sync.dart b/lib/core/sync.dart index e60b26ea..32b8844f 100644 --- a/lib/core/sync.dart +++ b/lib/core/sync.dart @@ -7,7 +7,7 @@ const bakSync = BakSyncer._(); final icloud = ICloud(containerId: 'iCloud.tech.lolli.serverbox'); -final class BakSyncer extends SyncIface { +final class BakSyncer extends SyncIface { const BakSyncer._() : super(); @override diff --git a/lib/data/model/app/backup.dart b/lib/data/model/app/backup.dart index d6501b4a..0ad6a437 100644 --- a/lib/data/model/app/backup.dart +++ b/lib/data/model/app/backup.dart @@ -53,10 +53,10 @@ class Backup implements Mergeable { spis: Stores.server.fetch(), snippets: Stores.snippet.fetch(), keys: Stores.key.fetch(), - container: await Stores.container.getAllMap(), + container: Stores.container.getAllMap(), lastModTime: lastModTime, - history: await Stores.history.getAllMap(), - settings: await Stores.setting.getAllMap(), + history: Stores.history.getAllMap(), + settings: Stores.setting.getAllMap(), ); } diff --git a/lib/view/page/setting/entries/server.dart b/lib/view/page/setting/entries/server.dart index 65d0cb24..7559b7e5 100644 --- a/lib/view/page/setting/entries/server.dart +++ b/lib/view/page/setting/entries/server.dart @@ -206,7 +206,7 @@ extension _Server on _AppSettingsPageState { } Future _editRawSettings() async { - final map = await Stores.setting.getAllMap(includeInternalKeys: true); + final map = Stores.setting.getAllMap(includeInternalKeys: true); final keys = map.keys; void onSave(BuildContext context, EditorPageRet ret) { diff --git a/lib/view/page/setting/platform/android.dart b/lib/view/page/setting/platform/android.dart index b77e3a04..ac14532a 100644 --- a/lib/view/page/setting/platform/android.dart +++ b/lib/view/page/setting/platform/android.dart @@ -68,7 +68,7 @@ class _AndroidSettingsPageState extends State { trailing: const Icon(Icons.keyboard_arrow_right), onTap: () async { final data = {}; - final keys = await PrefStore.shared.keys(); + final keys = PrefStore.shared.keys(); for (final key in keys) { final val = PrefStore.shared.get(key); diff --git a/pubspec.lock b/pubspec.lock index adc89cc6..946b05cd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -66,10 +66,10 @@ packages: dependency: transitive description: name: archive - sha256: "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12" + sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd" url: "https://pub.dev" source: hosted - version: "4.0.5" + version: "4.0.7" args: dependency: transitive description: @@ -82,10 +82,10 @@ packages: dependency: transitive description: name: asn1lib - sha256: e02d018628c870ef2d7f03e33f9ad179d89ff6ec52ca6c56bcb80bcef979867f + sha256: "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623" url: "https://pub.dev" source: hosted - version: "1.6.2" + version: "1.6.4" async: dependency: transitive description: @@ -178,26 +178,26 @@ packages: dependency: transitive description: name: camera_android_camerax - sha256: "13784f539c7f104766bff84e4479a70f03b29d78b208278be45c939250d9d7f5" + sha256: f0dcbce91623f75030840609de9b64d0d73f86df279c6e9588c1501245a05eb2 url: "https://pub.dev" source: hosted - version: "0.6.14+1" + version: "0.6.15+2" camera_avfoundation: dependency: transitive description: name: camera_avfoundation - sha256: ba48b65a3a97004276ede882e6b838d9667642ff462c95a8bb57ca8a82b6bd25 + sha256: a33cd9a250296271cdf556891b7c0986a93772426f286595eccd5f45b185933c url: "https://pub.dev" source: hosted - version: "0.9.18+11" + version: "0.9.18+14" camera_platform_interface: dependency: transitive description: name: camera_platform_interface - sha256: "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31" + sha256: "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2" url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.10.0" camera_web: dependency: transitive description: @@ -405,22 +405,18 @@ packages: dependency: "direct main" description: name: extended_image - sha256: fcefcf3cba32696c639e9e305a790039709d05a7139320b91bb9d300993452e2 - sha256: fcefcf3cba32696c639e9e305a790039709d05a7139320b91bb9d300993452e2 + sha256: f6cbb1d798f51262ed1a3d93b4f1f2aa0d76128df39af18ecb77fa740f88b2e0 url: "https://pub.dev" source: hosted - version: "10.0.0" - version: "10.0.0" + version: "10.0.1" extended_image_library: dependency: transitive description: name: extended_image_library sha256: ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5 - sha256: ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5 url: "https://pub.dev" source: hosted version: "5.0.0" - version: "5.0.0" fake_async: dependency: transitive description: @@ -449,12 +445,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b" - sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b" + sha256: "09b474c0c8117484b80cbebc043801ff91e05cfbd2874d512825c899e1754694" url: "https://pub.dev" source: hosted - version: "9.2.1" - version: "9.2.1" + version: "9.2.3" fixnum: dependency: transitive description: @@ -484,8 +478,8 @@ packages: dependency: "direct main" description: path: "." - ref: "v1.0.263" - resolved-ref: "42579f45363029584c6fbe11f84b6aa0780339e7" + ref: "v1.0.269" + resolved-ref: "338eb9135ea24f1d936ec023511a22d6c409576d" url: "https://github.com/lppcg/fl_lib" source: git version: "0.0.1" @@ -599,10 +593,10 @@ packages: dependency: transitive description: name: flutter_markdown - sha256: e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5 + sha256: "634622a3a826d67cb05c0e3e576d1812c430fa98404e95b60b131775c73d76ec" url: "https://pub.dev" source: hosted - version: "0.7.6+2" + version: "0.7.7" flutter_markdown_latex: dependency: transitive description: @@ -623,18 +617,18 @@ packages: dependency: "direct dev" description: name: flutter_native_splash - sha256: edb09c35ee9230c4b03f13dd45bb3a276d0801865f0a4650b7e2a3bba61a803a + sha256: "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.6" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3" + sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e url: "https://pub.dev" source: hosted - version: "2.0.27" + version: "2.0.28" flutter_reorderable_grid_view: dependency: "direct main" description: @@ -655,10 +649,10 @@ packages: dependency: transitive description: name: flutter_svg - sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b + sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1 url: "https://pub.dev" source: hosted - version: "2.0.17" + version: "2.1.0" flutter_test: dependency: "direct dev" description: flutter @@ -745,10 +739,10 @@ packages: dependency: transitive description: name: html - sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" + sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602" url: "https://pub.dev" source: hosted - version: "0.15.5" + version: "0.15.6" http: dependency: transitive description: @@ -897,10 +891,10 @@ packages: dependency: transitive description: name: local_auth_android - sha256: "0abe4e72f55c785b28900de52a2522c86baba0988838b5dc22241b072ecccd74" + sha256: "63ad7ca6396290626dc0cb34725a939e4cfe965d80d36112f08d49cf13a8136e" url: "https://pub.dev" source: hosted - version: "1.0.48" + version: "1.0.49" local_auth_darwin: dependency: transitive description: @@ -1049,10 +1043,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12" + sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9 url: "https://pub.dev" source: hosted - version: "2.2.16" + version: "2.2.17" path_provider_foundation: dependency: transitive description: @@ -1146,26 +1140,26 @@ packages: dependency: transitive description: name: posix - sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + sha256: f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62 url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "6.0.2" pretty_qr_code: dependency: transitive description: name: pretty_qr_code - sha256: cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5 + sha256: b078bd5d51956dea4342378af1b092ad962b81bdbb55b10fffce03461da8db74 url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.4.0" provider: dependency: transitive description: name: provider - sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + sha256: "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310" url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.4" pub_semver: dependency: transitive description: @@ -1290,18 +1284,18 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a" + sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5" url: "https://pub.dev" source: hosted - version: "2.5.2" + version: "2.5.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad" + sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac" url: "https://pub.dev" source: hosted - version: "2.4.8" + version: "2.4.10" shared_preferences_foundation: dependency: transitive description: @@ -1495,18 +1489,18 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4" + sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79" url: "https://pub.dev" source: hosted - version: "6.3.15" + version: "6.3.16" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626" + sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb" url: "https://pub.dev" source: hosted - version: "6.3.2" + version: "6.3.3" url_launcher_linux: dependency: transitive description: @@ -1535,10 +1529,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9" + sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" url_launcher_windows: dependency: transitive description: @@ -1607,18 +1601,18 @@ packages: dependency: "direct main" description: name: wakelock_plus - sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e" + sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678 url: "https://pub.dev" source: hosted - version: "1.2.10" + version: "1.3.2" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a" + sha256: e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207 url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.3" watch_connectivity: dependency: "direct main" description: @@ -1648,18 +1642,18 @@ packages: dependency: transitive description: name: web_socket - sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + sha256: bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b url: "https://pub.dev" source: hosted - version: "0.1.6" + version: "1.0.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" webdav_client_plus: dependency: "direct main" description: @@ -1736,4 +1730,3 @@ packages: sdks: dart: ">=3.7.0 <4.0.0" flutter: ">=3.29.0" - flutter: ">=3.29.0" diff --git a/pubspec.yaml b/pubspec.yaml index d7c7c7dd..60bb0f89 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,6 +31,7 @@ dependencies: choice: ^2.3.2 flutter_reorderable_grid_view: ^5.1.0 webdav_client_plus: ^1.0.2 + flutter_adaptive_scaffold: ^0.3.2 dartssh2: git: url: https://github.com/lollipopkit/dartssh2 @@ -58,8 +59,7 @@ dependencies: fl_lib: git: url: https://github.com/lppcg/fl_lib - ref: v1.0.263 - flutter_adaptive_scaffold: ^0.3.2 + ref: v1.0.269 dependency_overrides: # webdav_client_plus: