From 7f83740b351aec2f70e95990daff91822689d193 Mon Sep 17 00:00:00 2001 From: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Date: Thu, 22 Aug 2024 00:22:08 +0530 Subject: [PATCH] chore: upgrade deps --- .../lib/domain/services/login.service.dart | 2 +- .../domain/services/server_info.service.dart | 2 +- .../presentation/router/duplicate_guard.dart | 10 ++ mobile-v2/lib/presentation/router/router.dart | 16 +- mobile-v2/pubspec.lock | 153 ++++++++++-------- mobile-v2/pubspec.yaml | 38 ++--- 6 files changed, 122 insertions(+), 99 deletions(-) create mode 100644 mobile-v2/lib/presentation/router/duplicate_guard.dart diff --git a/mobile-v2/lib/domain/services/login.service.dart b/mobile-v2/lib/domain/services/login.service.dart index b419c209ab..2570d2ffd2 100644 --- a/mobile-v2/lib/domain/services/login.service.dart +++ b/mobile-v2/lib/domain/services/login.service.dart @@ -18,7 +18,7 @@ class LoginService with LogContext { final serverAPI = Openapi(dio: dio, basePathOverride: baseUrl, interceptors: []) - .getServerInfoApi(); + .getServerApi(); try { await serverAPI.pingServer(validateStatus: (status) => status == 200); } catch (e) { diff --git a/mobile-v2/lib/domain/services/server_info.service.dart b/mobile-v2/lib/domain/services/server_info.service.dart index bf32191aee..5803975f85 100644 --- a/mobile-v2/lib/domain/services/server_info.service.dart +++ b/mobile-v2/lib/domain/services/server_info.service.dart @@ -6,7 +6,7 @@ import 'package:openapi/openapi.dart'; class ServerInfoService with LogContext { final Openapi _api; - ServerInfoApi get _serverInfo => _api.getServerInfoApi(); + ServerApi get _serverInfo => _api.getServerApi(); ServerInfoService(this._api); diff --git a/mobile-v2/lib/presentation/router/duplicate_guard.dart b/mobile-v2/lib/presentation/router/duplicate_guard.dart new file mode 100644 index 0000000000..de47d52b1b --- /dev/null +++ b/mobile-v2/lib/presentation/router/duplicate_guard.dart @@ -0,0 +1,10 @@ +import 'package:auto_route/auto_route.dart'; + +class DuplicateGuard extends AutoRouteGuard { + const DuplicateGuard(); + + @override + void onNavigation(NavigationResolver resolver, StackRouter router) { + resolver.next(resolver.route.name != router.current.name); + } +} diff --git a/mobile-v2/lib/presentation/router/router.dart b/mobile-v2/lib/presentation/router/router.dart index 97fd4619f6..07476bb1f7 100644 --- a/mobile-v2/lib/presentation/router/router.dart +++ b/mobile-v2/lib/presentation/router/router.dart @@ -9,15 +9,22 @@ import 'package:immich_mobile/presentation/modules/settings/pages/advance_settin import 'package:immich_mobile/presentation/modules/settings/pages/general_settings.page.dart'; import 'package:immich_mobile/presentation/modules/settings/pages/settings.page.dart'; import 'package:immich_mobile/presentation/modules/sharing/pages/sharing.page.dart'; +import 'package:immich_mobile/presentation/router/duplicate_guard.dart'; import 'package:immich_mobile/presentation/router/pages/splash_screen.page.dart'; import 'package:immich_mobile/presentation/router/pages/tab_controller.page.dart'; part 'router.gr.dart'; @AutoRouterConfig(replaceInRouteName: 'Page,Route') -class AppRouter extends _$AppRouter implements AutoRouteGuard { +class AppRouter extends RootStackRouter { AppRouter(); + final _duplicateGuard = const DuplicateGuard(); + + // Global guards + @override + late final List guards = [_duplicateGuard]; + @override List get routes => [ AutoRoute( @@ -42,11 +49,4 @@ class AppRouter extends _$AppRouter implements AutoRouteGuard { AutoRoute(page: AdvanceSettingsRoute.page), ]), ]; - - // Global guards - @override - void onNavigation(NavigationResolver resolver, StackRouter router) { - // Prevent duplicates - resolver.next(resolver.route.name != router.current.name); - } } diff --git a/mobile-v2/pubspec.lock b/mobile-v2/pubspec.lock index 500bbb6970..acfc59d9b9 100644 --- a/mobile-v2/pubspec.lock +++ b/mobile-v2/pubspec.lock @@ -5,18 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" analyzer: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.7.0" analyzer_plugin: dependency: transitive description: @@ -45,18 +50,18 @@ packages: dependency: "direct main" description: name: auto_route - sha256: a9001a90539ca3effc168f7e1029a5885c7326b9032c09ac895e303c1d137704 + sha256: b83e8ce46da7228cdd019b5a11205454847f0a971bca59a7529b98df9876889b url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "9.2.2" auto_route_generator: dependency: "direct dev" description: name: auto_route_generator - sha256: a21d7a936c917488653c972f62d884d8adcf8c5d37acc7cd24da33cf784546c0 + sha256: c9086eb07271e51b44071ad5cff34e889f3156710b964a308c2ab590769e79e6 url: "https://pub.dev" source: hosted - version: "8.1.0" + version: "9.0.0" bloc: dependency: transitive description: @@ -109,18 +114,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04 url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.12" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "7.3.2" built_collection: dependency: transitive description: @@ -213,10 +218,10 @@ packages: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" csv: dependency: transitive description: @@ -245,50 +250,50 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91 + sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 url: "https://pub.dev" source: hosted - version: "10.1.0" + version: "10.1.2" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64 + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" dio: dependency: "direct main" description: name: dio - sha256: e17f6b3097b8c51b72c74c9f071a605c47bcc8893839bd66732457a5ebe73714 + sha256: "0dfb6b6a1979dac1c1245e17cef824d7b452ea29bd33d3467269f9bef3715fb0" url: "https://pub.dev" source: hosted - version: "5.5.0+1" + version: "5.6.0" dio_web_adapter: dependency: transitive description: name: dio_web_adapter - sha256: "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac" + sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0" drift: dependency: "direct main" description: name: drift - sha256: "4e0ffee40d23f0b809e6cff1ad202886f51d629649073ed42d9cd1d194ea943e" + sha256: "15b51e0ee1970455c0c3f7e560f3ac02ecb9c04711a9657586e470b234659dba" url: "https://pub.dev" source: hosted - version: "2.19.1+1" + version: "2.20.0" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: ac7647c6cedca99724ca300cff9181f6dd799428f8ed71f94159ed0528eaec26 + sha256: b9ec6159a731288e805a44225ccbebad507dd84d52ab71352c52584f13199d2d url: "https://pub.dev" source: hosted - version: "2.19.1" + version: "2.20.1" dynamic_color: dependency: "direct main" description: @@ -309,10 +314,10 @@ packages: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" file: dependency: transitive description: @@ -338,10 +343,10 @@ packages: dependency: "direct main" description: name: flutter_adaptive_scaffold - sha256: "56d4d81fe88ecffe8ae96b8d89a1ae793c0a85035bb9b74ff28f20eea0cdbdc2" + sha256: "3b8f56e0282659db2ebb2edacf61332c1178e8dc03d933709c5af88f92f31dd5" url: "https://pub.dev" source: hosted - version: "0.1.11+1" + version: "0.2.2" flutter_bloc: dependency: "direct main" description: @@ -521,18 +526,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: @@ -557,6 +562,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" matcher: dependency: transitive description: @@ -569,26 +582,26 @@ 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" material_symbols_icons: dependency: "direct main" description: name: material_symbols_icons - sha256: "37f88057af06224cd99242bd9b5ceda8c1ebddfff67bd5e8432521910a3d4598" + sha256: "8f4abdb6bc714526ccf66e825b7391d7ca65239484ad92be71980fe73a57521c" url: "https://pub.dev" source: hosted - version: "4.2771.0" + version: "4.2780.0" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: transitive description: @@ -640,18 +653,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 + sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "8.0.2" 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: @@ -672,18 +685,18 @@ 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: "30c5aa827a6ae95ce2853cdc5fe3971daaac00f6f081c419c013f7f57bff2f5e" + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" url: "https://pub.dev" source: hosted - version: "2.2.7" + version: "2.2.10" path_provider_foundation: dependency: transitive description: @@ -728,10 +741,10 @@ packages: dependency: "direct main" description: name: photo_manager - sha256: "2f98fed8fede27eaf55021a1ce382609a715b52096a94a315f99ae33b6d2eaab" + sha256: "1e8bbe46a6858870e34c976aafd85378bed221ce31c1201961eba9ad3d94df9f" url: "https://pub.dev" source: hosted - version: "3.2.2" + version: "3.2.3" photo_manager_image_provider: dependency: "direct main" description: @@ -869,10 +882,10 @@ packages: dependency: "direct main" description: name: sqlite3 - sha256: "6d17989c0b06a5870b2190d391925186f944cb943e5262d0d3f778fcfca3bc6e" + sha256: "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.6" sqlite3_flutter_libs: dependency: "direct main" description: @@ -933,10 +946,10 @@ 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" time: dependency: transitive description: @@ -973,10 +986,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "95d8027db36a0e52caf55680f91e33ea6aa12a3ce608c90b06f4e429a21067ac" + sha256: e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab url: "https://pub.dev" source: hosted - version: "6.3.5" + version: "6.3.10" url_launcher_ios: dependency: transitive description: @@ -989,10 +1002,10 @@ packages: 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: @@ -1013,10 +1026,10 @@ 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: @@ -1053,10 +1066,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" watcher: dependency: transitive description: @@ -1069,10 +1082,10 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.0.0" web_socket: dependency: transitive description: @@ -1093,18 +1106,18 @@ packages: dependency: transitive description: name: win32 - sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 + sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" url: "https://pub.dev" source: hosted - version: "5.5.1" + version: "5.5.4" win32_registry: dependency: transitive description: name: win32_registry - sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb" + sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.1.4" window_to_front: dependency: transitive description: @@ -1138,5 +1151,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/mobile-v2/pubspec.yaml b/mobile-v2/pubspec.yaml index 20c93cd6d0..559703d0fa 100644 --- a/mobile-v2/pubspec.yaml +++ b/mobile-v2/pubspec.yaml @@ -14,18 +14,18 @@ dependencies: sdk: flutter # OS specific path - path_provider: ^2.0.0 + path_provider: ^2.1.4 path: ^1.9.0 # Bloc - flutter_bloc: ^8.1.5 + flutter_bloc: ^8.1.6 # Database - drift: ^2.18.0 - sqlite3: ^2.4.2 - sqlite3_flutter_libs: ^0.5.0 + drift: ^2.20.0 + sqlite3: ^2.4.6 + sqlite3_flutter_libs: ^0.5.24 # Network - dio: ^5.2.0 + dio: ^5.6.0 # Route handling - auto_route: ^8.1.0 + auto_route: ^9.2.2 # Logging logging: ^1.2.0 # Collection Utils @@ -33,22 +33,22 @@ dependencies: # service_locator get_it: ^7.7.0 # Photo Manager - photo_manager: ^3.0.0 - photo_manager_image_provider: ^2.1.0 + photo_manager: ^3.2.3 + photo_manager_image_provider: ^2.1.1 # Dynamic colors - Android dynamic_color: ^1.7.0 # Material symbols - material_symbols_icons: ^4.2719.3 + material_symbols_icons: ^4.2780.0 # Localization - slang: ^3.30.2 - slang_flutter: ^3.30.0 + slang: ^3.31.1 + slang_flutter: ^3.31.0 # Adaptive scaffold - flutter_adaptive_scaffold: ^0.1.10+2 + flutter_adaptive_scaffold: ^0.2.2 # URL launching url_launcher: ^6.3.0 # plus_extensions - package_info_plus: ^8.0.0 - device_info_plus: ^10.1.0 + package_info_plus: ^8.0.2 + device_info_plus: ^10.1.2 # oauth login flutter_web_auth_2: ^3.1.2 @@ -62,13 +62,13 @@ dev_dependencies: # Recommended lints flutter_lints: ^4.0.0 # Code generator - build_runner: ^2.4.9 + build_runner: ^2.4.12 # Database helper - drift_dev: ^2.18.0 + drift_dev: ^2.20.1 # Route helper - auto_route_generator: ^8.0.0 + auto_route_generator: ^9.0.0 # Localization generator - slang_build_runner: ^3.30.0 + slang_build_runner: ^3.31.0 # Assets constant generator flutter_gen_runner: ^5.6.0