From 002c9e4ac5403bdac0679f843075eb2c3a1aa0bc Mon Sep 17 00:00:00 2001 From: luckyrat Date: Thu, 8 Aug 2024 16:31:07 +0100 Subject: [PATCH 1/4] Upgrade to Flutter 3.24 --- .fvm/fvm_config.json | 2 +- .fvmrc | 2 +- .vscode/settings.json | 2 +- .../metadata/android/en-GB/changelogs/56.txt | 3 + pubspec.lock | 219 ++++++++++-------- pubspec.yaml | 10 +- 6 files changed, 139 insertions(+), 99 deletions(-) create mode 100644 android/fastlane/metadata/android/en-GB/changelogs/56.txt diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index 1e31cdd..7bfad02 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,3 +1,3 @@ { - "flutterSdkVersion": "3.22.2" + "flutterSdkVersion": "3.24.0" } \ No newline at end of file diff --git a/.fvmrc b/.fvmrc index 26d017c..64a9dcb 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,4 +1,4 @@ { - "flutter": "3.22.2", + "flutter": "3.24.0", "flavors": {} } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 15f07ba..fd68a95 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -57,7 +57,7 @@ "*.dll", "**/*.dll" ], - "dart.flutterSdkPath": ".fvm/versions/3.22.2", + "dart.flutterSdkPath": ".fvm/versions/3.24.0", "search.exclude": { "**/.fvm": true }, diff --git a/android/fastlane/metadata/android/en-GB/changelogs/56.txt b/android/fastlane/metadata/android/en-GB/changelogs/56.txt new file mode 100644 index 0000000..9731fca --- /dev/null +++ b/android/fastlane/metadata/android/en-GB/changelogs/56.txt @@ -0,0 +1,3 @@ +* Improved style of Autofill pinned button on some keyboards +* Additional minor bug fixes and improvements +* Improved performance from an updated Flutter version diff --git a/pubspec.lock b/pubspec.lock index efe5dca..3ef3a93 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,27 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + url: "https://pub.dev" + source: hosted + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + url: "https://pub.dev" + source: hosted + version: "6.7.0" animate_icons: dependency: "direct main" description: @@ -168,10 +189,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32" + sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" url: "https://pub.dev" source: hosted - version: "0.3.4+1" + version: "0.3.4+2" crypto: dependency: transitive description: @@ -208,10 +229,10 @@ packages: dependency: "direct dev" description: name: dependency_validator - sha256: f727a5627aa405965fab4aef4f468e50a9b632ba0737fd2f98c932fec6d712b9 + sha256: "16906f2137a312d0ffe754aee156436563a63d6ab7faaded83d401b5385d5d35" url: "https://pub.dev" source: hosted - version: "3.2.3" + version: "4.1.0" device_info_plus: dependency: "direct main" description: @@ -280,10 +301,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258" + sha256: "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3" url: "https://pub.dev" source: hosted - version: "8.0.6" + version: "8.0.7" fixnum: dependency: transitive description: @@ -360,10 +381,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "4.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -390,10 +411,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da + sha256: "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de" url: "https://pub.dev" source: hosted - version: "2.0.17" + version: "2.0.21" flutter_rating_bar: dependency: "direct main" description: @@ -465,10 +486,10 @@ packages: dependency: transitive description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" http_parser: dependency: transitive description: @@ -521,18 +542,18 @@ packages: dependency: transitive description: name: js - sha256: "4186c61b32f99e60f011f7160e32c89a758ae9b1d0c6d28e2c02ef0382300e2b" + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.1" json_annotation: dependency: transitive description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" kdbx: dependency: "direct main" description: @@ -546,18 +567,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -570,10 +591,10 @@ packages: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" localstorage: dependency: transitive description: @@ -587,10 +608,10 @@ packages: dependency: "direct main" description: name: logger - sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4 + sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.0" logging: dependency: "direct main" description: @@ -603,10 +624,18 @@ packages: dependency: transitive description: name: logging_appenders - sha256: "1fb8a008c04246f4677a0d034d69779a5975e56e02573a5162240239b247e239" + sha256: e329e7472f99416d0edaaf6451fe6c02dec91d34535bd252e284a0b94ab23d79 + url: "https://pub.dev" + source: hosted + version: "1.3.1" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" url: "https://pub.dev" source: hosted - version: "1.2.0+1" + version: "0.1.2-main.4" matcher: dependency: transitive description: @@ -619,10 +648,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" matomo_tracker: dependency: "direct main" description: @@ -635,10 +664,10 @@ packages: dependency: "direct main" description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: "direct main" description: @@ -675,18 +704,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 + sha256: "4de6c36df77ffbcef0a5aefe04669d33f2d18397fea228277b852a2d4e58e860" url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "8.0.1" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e + sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" path: dependency: "direct main" description: @@ -699,26 +728,26 @@ packages: dependency: "direct main" description: name: path_provider - sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" + sha256: "490539678396d4c3c0b06efdaab75ae60675c3e0c66f72bc04c2e2c1e0e2abeb" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.9" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.0" path_provider_linux: dependency: transitive description: @@ -739,10 +768,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" permission_handler: dependency: "direct main" description: @@ -755,10 +784,10 @@ packages: dependency: transitive description: name: permission_handler_android - sha256: "1acac6bae58144b442f11e66621c062aead9c99841093c38f5bcdcc24c1c3474" + sha256: eaf2a1ec4472775451e88ca6a7b86559ef2f1d1ed903942ed135e38ea0097dca url: "https://pub.dev" source: hosted - version: "12.0.5" + version: "12.0.8" permission_handler_apple: dependency: transitive description: @@ -771,18 +800,18 @@ packages: dependency: transitive description: name: permission_handler_html - sha256: "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d" + sha256: "6cac773d389e045a8d4f85418d07ad58ef9e42a56e063629ce14c4c26344de24" url: "https://pub.dev" source: hosted - version: "0.1.1" + version: "0.1.2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "23dfba8447c076ab5be3dee9ceb66aad345c4a648f0cac292c77b1eb0e800b78" + sha256: fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.2.2" permission_handler_windows: dependency: transitive description: @@ -835,10 +864,10 @@ packages: dependency: transitive description: name: provider - sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.2" pub_semver: dependency: transitive description: @@ -859,10 +888,10 @@ packages: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.0" punycode: dependency: transitive description: @@ -925,58 +954,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: c272f9cabca5a81adc9b0894381e9c1def363e980f960fa903c604c471b22f68 url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.1" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + sha256: "041be4d9d2dc6079cf342bc8b761b03787e3b71192d658220a56cac9c04a0294" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + sha256: "671e7a931f55a08aa45be2a13fe7247f2a41237897df434b30d2012388191833" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.0" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + sha256: "2ba0510d3017f91655b7543e9ee46d48619de2a2af38e5c790423f7007c7ccc1" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.0" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" + sha256: "59dc807b94d29d52ddbb1b3c0d3b9d0a67fc535a64e62a5542c8db0513fcb6c2" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.1" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + sha256: "398084b47b7f92110683cac45c6dc4aae853db47e470e5ddcd52cab7f7196ab2" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.0" sky_engine: dependency: transitive description: flutter @@ -1051,18 +1080,18 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" timezone: dependency: transitive description: name: timezone - sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0" + sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d" url: "https://pub.dev" source: hosted - version: "0.9.2" + version: "0.9.4" tuple: dependency: "direct main" description: @@ -1107,34 +1136,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745 + sha256: "94d8ad05f44c6d4e2ffe5567ab4d741b82d62e3c8e288cc1fcea45965edf47c9" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.8" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.3.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 + sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.0" url_launcher_platform_interface: dependency: transitive description: @@ -1147,26 +1176,26 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" uuid: dependency: "direct main" description: name: uuid - sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.4.2" vector_math: dependency: transitive description: @@ -1179,10 +1208,18 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + url: "https://pub.dev" + source: hosted + version: "14.2.4" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "1.1.0" web: dependency: transitive description: @@ -1195,18 +1232,18 @@ packages: dependency: transitive description: name: win32 - sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 + sha256: "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9" url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.5.3" win32_registry: dependency: transitive description: name: win32_registry - sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a" + sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.4" xdg_directories: dependency: transitive description: @@ -1241,4 +1278,4 @@ packages: version: "1.0.0" sdks: dart: ">=3.4.1 <4.0.0" - flutter: ">=3.19.0" + flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 9c26c94..da9513c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 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: 2.3.0+55 +version: 2.3.1+56 environment: sdk: '>=3.0.0 <4.0.0' @@ -23,7 +23,7 @@ environment: dependencies: flutter: sdk: flutter - logger: 2.3.0 + logger: ^2.4.0 logging: ^1.2.0 kdbx: git: @@ -101,7 +101,7 @@ dependencies: platform: ^3.1.5 email_validator: ^3.0.0 convert: ^3.1.1 - meta: ^1.12.0 + meta: ^1.15.0 argon2_ffi_base: ^1.1.1 uuid: ^4.4.0 clock: ^1.1.1 @@ -130,8 +130,8 @@ dev_dependencies: flutter_test: sdk: flutter flutter_launcher_icons: "^0.13.1" - flutter_lints: ^3.0.2 - dependency_validator: ^3.2.3 + flutter_lints: ^4.0.0 + dependency_validator: ^4.1.0 flutter_native_splash: ^2.4.1 #patrol: ^2.2.3 From 8b2404c1f240c3c18e5e116f6a36a4a95eb6760c Mon Sep 17 00:00:00 2001 From: luckyrat Date: Thu, 8 Aug 2024 16:42:54 +0100 Subject: [PATCH 2/4] Update lints for Flutter 3.24 --- analysis_options.yaml | 1 + lib/widgets/account_create.dart | 2 +- lib/widgets/entry.dart | 2 +- lib/widgets/kee_vault_app.dart | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index bf2166a..e9bfbaf 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -36,6 +36,7 @@ analyzer: errors: todo: ignore prefer_const_constructors: ignore # until an automated fix can resolve hundreds of issues + deprecated_member_use: ignore # until upgrade to MD3 components, colours, etc. exclude: - lib/generated/** - lib/phonetic.dart diff --git a/lib/widgets/account_create.dart b/lib/widgets/account_create.dart index 381716d..f877d23 100644 --- a/lib/widgets/account_create.dart +++ b/lib/widgets/account_create.dart @@ -797,7 +797,7 @@ class AccountCreateWrapperWidget extends StatelessWidget { ), body: PopScope( canPop: skipBackCheck, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, Object? result) async { if (didPop) { return; } diff --git a/lib/widgets/entry.dart b/lib/widgets/entry.dart index de83e10..55280e9 100644 --- a/lib/widgets/entry.dart +++ b/lib/widgets/entry.dart @@ -342,7 +342,7 @@ class EntryWidget extends StatelessWidget { ), body: PopScope( canPop: !entry.isDirty, - onPopInvoked: (bool didPop) async { + onPopInvokedWithResult: (bool didPop, Object? result) async { if (didPop) { return; } diff --git a/lib/widgets/kee_vault_app.dart b/lib/widgets/kee_vault_app.dart index aeeee14..42f214d 100644 --- a/lib/widgets/kee_vault_app.dart +++ b/lib/widgets/kee_vault_app.dart @@ -120,6 +120,10 @@ class KeeVaultAppState extends State with WidgetsBindingObserver, T l.e('Nav context unexpectedly missing. Autofill navigation is likely to fail in strange ways.'); return; } + if (!navContext.mounted) { + l.e('Nav context unexpectedly unmounted. Autofill navigation is likely to fail in strange ways.'); + return; + } final mode = intent?.extra?['autofill_mode']; if (mode?.startsWith('/autofill') ?? false) { BlocProvider.of(navContext).refresh(); From 7c473a7e8e3331e49a5832a8ef1a54b3e62e3c61 Mon Sep 17 00:00:00 2001 From: Chris Tomlinson Date: Thu, 8 Aug 2024 18:34:51 +0100 Subject: [PATCH 3/4] Update iOS to Flutter 3.24 Includes temporary hack for settings screen, etc. until we can change design to MD3 --- ios/.gitignore | 1 + ios/Podfile.lock | 29 +-- ios/Runner.xcodeproj/project.pbxproj | 38 +++- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- ios/Runner/AppDelegate.swift | 2 +- lib/widgets/settings.dart | 181 +++++++++--------- pubspec.lock | 9 +- pubspec.yaml | 5 +- 8 files changed, 159 insertions(+), 108 deletions(-) diff --git a/ios/.gitignore b/ios/.gitignore index e96ef60..298beff 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -24,6 +24,7 @@ Flutter/flutter_assets/ Flutter/flutter_export_environment.sh ServiceDefinitions.json Runner/GeneratedPluginRegistrant.* +**/dgph # Exceptions to above rules. !default.mode1v3 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 895cc5d..8fbe879 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -58,8 +58,9 @@ PODS: - FlutterMacOS - permission_handler_apple (9.3.0): - Flutter - - rate_my_app (2.0.0): + - rate_my_app (2.2.0): - Flutter + - FlutterMacOS - SDWebImage (5.16.0): - SDWebImage/Core (= 5.16.0) - SDWebImage/Core (5.16.0) @@ -88,7 +89,7 @@ DEPENDENCIES: - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - - rate_my_app (from `.symlinks/plugins/rate_my_app/ios`) + - rate_my_app (from `.symlinks/plugins/rate_my_app/darwin`) - sensitive_clipboard (from `.symlinks/plugins/sensitive_clipboard/ios`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) @@ -129,7 +130,7 @@ EXTERNAL SOURCES: permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" rate_my_app: - :path: ".symlinks/plugins/rate_my_app/ios" + :path: ".symlinks/plugins/rate_my_app/darwin" sensitive_clipboard: :path: ".symlinks/plugins/sensitive_clipboard/ios" share_plus: @@ -143,26 +144,26 @@ SPEC CHECKSUMS: argon2_ffi: 995b9260d81aa17f5d2a8a497f2d2763ba4c45f3 barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0 biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9 - device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 - file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_file_dialog: 4c014a45b105709a27391e266c277d7e588e9299 flutter_inapp_purchase: 5c6a1ac3f11b11d0c8c0321c0c41c1f05805e4c8 - flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef + flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c - permission_handler_apple: 036b856153a2b1f61f21030ff725f3e6fece2b78 - rate_my_app: 80fba94c4885cd31738231b7b1f51c1ad726f5c7 + package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 + rate_my_app: cd3e1c44d12f387482698ffaf6ea9bd669a69b94 SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6 sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986 - share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 - shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 + share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 SwiftProtobuf: 40bd808372cb8706108f22d28f8ab4a6b9bc6989 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe PODFILE CHECKSUM: 0658f7bb36458779f6da1691e33f9d925242f612 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8c9ce4a..bdf76af 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -313,6 +313,7 @@ 8BE5C69E2A3F8C1E0013856C /* Resources */, DE3599ACE908595EF90359B0 /* [CP] Embed Pods Frameworks */, 8BE5C6AD2A3F928A0013856C /* xcode_backend embed_and_thin */, + 694CA39CBC5B3880865BAAC5 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -337,6 +338,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, FF23F4DC409BF04CA9EF8E1D /* [CP] Embed Pods Frameworks */, + 284FECD7F90F2667384034A3 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -355,7 +357,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1340; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 8B253A1128BE694600AA6762 = { @@ -427,6 +429,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 284FECD7F90F2667384034A3 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -465,6 +484,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 694CA39CBC5B3880865BAAC5 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 8BE5C6AC2A3F921A0013856C /* xcode_backend build */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 6051218..9d54fc1 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ with TraceableClientMix return BlocBuilder(builder: (context, autofillState) { return ColouredSafeArea( - child: SettingsScreen( - title: str.settings, - children: [ - SettingsGroup( - title: str.setGenTheme, - children: [ - RadioSettingsTile( - title: str.setGenTheme, - showTitles: false, - settingKey: 'theme', - values: { - 'sys': str.setGenTitlebarStyleDefault, - 'lt': str.setGenThemeLt, - 'dk': str.setGenThemeDk, - }, - selected: 'sys', - onChange: (String value) { - BlocProvider.of(context).changeTheme(value); - }, - ), - ], - ), - SettingsGroup(title: str.deviceAutoFill, children: [ - Visibility( - visible: autofillState is AutofillAvailable, - child: autofillState is AutofillAvailable - ? SettingsContainer( - children: [ - AutofillStatusWidget( - isEnabled: autofillState.enabled, - isDeviceQuickUnlockEnabled: _isDeviceQuickUnlockEnabled), - ], - ) - : Container(), - ), - ]), - SettingsGroup(title: str.quickSignIn, children: [ - BiometricSettingWidget(isEnabledOnDevice: _isDeviceQuickUnlockEnabled), - ]), - SettingsGroup( - title: str.menuSetGeneral, - children: [ - SimpleSettingsTile( - title: str.genPsTitle, - subtitle: str.managePasswordPresets, - onTap: () async => await AppConfig.router.navigateTo( - context, - Routes.passwordPresetManager, - transition: TransitionType.inFromRight, + child: Theme( + data: Theme.of(context).copyWith(scaffoldBackgroundColor: Theme.of(context).canvasColor), + child: SettingsScreen( + title: str.settings, + children: [ + SettingsGroup( + title: str.setGenTheme, + children: [ + RadioSettingsTile( + title: str.setGenTheme, + showTitles: false, + settingKey: 'theme', + values: { + 'sys': str.setGenTitlebarStyleDefault, + 'lt': str.setGenThemeLt, + 'dk': str.setGenThemeDk, + }, + selected: 'sys', + onChange: (String value) { + BlocProvider.of(context).changeTheme(value); + }, ), + ], + ), + SettingsGroup(title: str.deviceAutoFill, children: [ + Visibility( + visible: autofillState is AutofillAvailable, + child: autofillState is AutofillAvailable + ? SettingsContainer( + children: [ + AutofillStatusWidget( + isEnabled: autofillState.enabled, + isDeviceQuickUnlockEnabled: _isDeviceQuickUnlockEnabled), + ], + ) + : Container(), ), - SwitchSettingsTile( - settingKey: 'expandGroups', - title: str.setGenShowSubgroups, - defaultValue: true, - onChange: (showChildren) { - BlocProvider.of(context).changeChildGroupInclusion(showChildren); - }, - ), - //TODO:f: Need to store group in DB so this should really be a DB-specific setting. - // SwitchSettingsTile( - // settingKey: 'rememberFilterGroup', - // title: str.rememberFilterGroup, - // defaultValue: false, - // ), - SimpleSettingsTile( - title: 'Access / Recovery', - child: SettingsScreen( + ]), + SettingsGroup(title: str.quickSignIn, children: [ + BiometricSettingWidget(isEnabledOnDevice: _isDeviceQuickUnlockEnabled), + ]), + SettingsGroup( + title: str.menuSetGeneral, + children: [ + SimpleSettingsTile( + title: str.genPsTitle, + subtitle: str.managePasswordPresets, + onTap: () async => await AppConfig.router.navigateTo( + context, + Routes.passwordPresetManager, + transition: TransitionType.inFromRight, + ), + ), + SwitchSettingsTile( + settingKey: 'expandGroups', + title: str.setGenShowSubgroups, + defaultValue: true, + onChange: (showChildren) { + BlocProvider.of(context).changeChildGroupInclusion(showChildren); + }, + ), + //TODO:f: Need to store group in DB so this should really be a DB-specific setting. + // SwitchSettingsTile( + // settingKey: 'rememberFilterGroup', + // title: str.rememberFilterGroup, + // defaultValue: false, + // ), + SimpleSettingsTile( title: 'Access / Recovery', - children: [...accessChildren], + child: Theme( + data: Theme.of(context).copyWith(scaffoldBackgroundColor: Theme.of(context).canvasColor), + child: SettingsScreen( + title: 'Access / Recovery', + children: [...accessChildren], + ), + ), ), - ), - SimpleSettingsTile( - title: 'Account / Subscription', - child: SettingsScreen( + SimpleSettingsTile( title: 'Account / Subscription', - children: [...accountChildren], + child: Theme( + data: Theme.of(context).copyWith(scaffoldBackgroundColor: Theme.of(context).canvasColor), + child: SettingsScreen( + title: 'Account / Subscription', + children: [...accountChildren], + ), + ), ), - ), - BlocBuilder(builder: (context, appRatingState) { - return SimpleSettingsTile( - enabled: appRatingState is AppRatingReady, - title: 'Provide Feedback', - onTap: () async { - final arc = BlocProvider.of(context); - await arc.showRatingDialog(context); - }, - ); - }), - ], - ), - ], + BlocBuilder(builder: (context, appRatingState) { + return SimpleSettingsTile( + enabled: appRatingState is AppRatingReady, + title: 'Provide Feedback', + onTap: () async { + final arc = BlocProvider.of(context); + await arc.showRatingDialog(context); + }, + ); + }), + ], + ), + ], + ), ), ); }); diff --git a/pubspec.lock b/pubspec.lock index 3ef3a93..e39c955 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -426,10 +426,11 @@ packages: flutter_settings_screens: dependency: "direct main" description: - name: flutter_settings_screens - sha256: b9e5ff87537fceeb67012560db6ef4bb0ff7d7a031e8184e1689538756ca99a0 - url: "https://pub.dev" - source: hosted + path: "." + ref: "52ac240b7ae0cf48b723818ee233565fd562bc13" + resolved-ref: "52ac240b7ae0cf48b723818ee233565fd562bc13" + url: "https://github.com/Juggler98/flutter_settings_screens.git" + source: git version: "0.3.4" flutter_speed_dial: dependency: "direct main" diff --git a/pubspec.yaml b/pubspec.yaml index da9513c..92b453d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,7 +37,10 @@ dependencies: package_info_plus: ^8.0.0 shared_preferences: ^2.2.3 - flutter_settings_screens: 0.3.4 + flutter_settings_screens: + git: + url: https://github.com/Juggler98/flutter_settings_screens.git + ref: 52ac240b7ae0cf48b723818ee233565fd562bc13 # 0.3.4 is incompatible with MD2 argon2_ffi: git: url: https://github.com/kee-org/argon2_ffi.git From eb590227bf7aad34d1703f7d0ec2fbc1a1c73b21 Mon Sep 17 00:00:00 2001 From: luckyrat Date: Fri, 9 Aug 2024 12:21:17 +0100 Subject: [PATCH 4/4] Upgrade receive_intent dependency to fix release build failure --- pubspec.lock | 9 +++++---- pubspec.yaml | 9 ++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index e39c955..dbc8e2f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -921,10 +921,11 @@ packages: receive_intent: dependency: "direct main" description: - name: receive_intent - sha256: "59afac5bcac8a0c6fc5067d03b4daeb260399cc8485256d6fe40a26640512cda" - url: "https://pub.dev" - source: hosted + path: "." + ref: master + resolved-ref: "13c662cbfb3a8f67984a8ffae1baf4e0f9e79aef" + url: "https://github.com/kee-org/receive_intent" + source: git version: "0.2.5" sensitive_clipboard: dependency: "direct main" diff --git a/pubspec.yaml b/pubspec.yaml index 92b453d..c45ebfc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -100,7 +100,10 @@ dependencies: flutter_file_dialog: ^3.0.2 base32: ^2.1.3 flutter_speed_dial: ^7.0.0 - receive_intent: ^0.2.5 + receive_intent: #^0.2.5 + git: + url: https://github.com/kee-org/receive_intent + ref: master platform: ^3.1.5 email_validator: ^3.0.0 convert: ^3.1.1 @@ -143,8 +146,8 @@ dependency_overrides: # path: ../flutter_autofill_service/ # barcode_scan2: # path: ../barcode_scan2/ - # rate_my_app: - # path: ../RateMyApp/ + # receive_intent: + # path: ../receive_intent/ # share_plus: # path: ../plus_plugins/packages/share_plus/share_plus/