From 82624b097903f0a1bc3f9847dbcb1abba0dde353 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 9 Mar 2025 20:30:58 -0500 Subject: [PATCH] chore(mobile): upgrade riverpod (#16742) --- mobile/lib/providers/activity.provider.g.dart | Bin 5886 -> 6008 bytes .../providers/activity_service.provider.dart | 3 +- .../activity_service.provider.g.dart | Bin 938 -> 1060 bytes .../activity_statistics.provider.g.dart | Bin 5904 -> 6026 bytes .../album_sort_by_options.provider.g.dart | Bin 1522 -> 1563 bytes .../album/current_album.provider.g.dart | Bin 913 -> 954 bytes mobile/lib/providers/api.provider.dart | 3 +- mobile/lib/providers/api.provider.g.dart | Bin 847 -> 969 bytes .../lib/providers/app_settings.provider.dart | 4 +- .../providers/app_settings.provider.g.dart | Bin 946 -> 1068 bytes mobile/lib/providers/asset.provider.dart | 2 +- .../asset_viewer/asset_people.provider.g.dart | Bin 5452 -> 5574 bytes .../asset_viewer/asset_stack.provider.dart | 2 +- .../asset_viewer/asset_stack.provider.g.dart | Bin 4361 -> 4483 bytes .../current_asset.provider.g.dart | Bin 913 -> 954 bytes .../backup_verification.provider.g.dart | Bin 979 -> 1020 bytes .../lib/providers/immich_logo_provider.dart | 3 +- .../lib/providers/immich_logo_provider.g.dart | Bin 887 -> 1009 bytes .../providers/infrastructure/db.provider.dart | 3 +- .../infrastructure/db.provider.g.dart | Bin 786 -> 908 bytes .../infrastructure/exif.provider.dart | 3 +- .../infrastructure/exif.provider.g.dart | Bin 904 -> 1026 bytes .../infrastructure/store.provider.dart | 3 +- .../infrastructure/store.provider.g.dart | Bin 929 -> 1051 bytes .../providers/map/map_marker.provider.dart | 3 +- .../providers/map/map_marker.provider.g.dart | Bin 898 -> 1020 bytes .../providers/map/map_service.provider.dart | 4 +- .../providers/map/map_service.provider.g.dart | Bin 877 -> 999 bytes .../providers/map/map_state.provider.g.dart | Bin 933 -> 974 bytes .../search/paginated_search.provider.dart | 2 +- .../search/paginated_search.provider.g.dart | Bin 1028 -> 1150 bytes .../lib/providers/search/people.provider.dart | 7 +- .../providers/search/people.provider.g.dart | Bin 8936 -> 9220 bytes .../search/search_filter.provider.dart | 3 +- .../search/search_filter.provider.g.dart | Bin 6882 -> 7004 bytes mobile/lib/routing/router.gr.dart | 81 ++++++++++-------- mobile/lib/services/person.service.dart | 3 +- mobile/lib/services/person.service.g.dart | Bin 907 -> 1029 bytes mobile/pubspec.lock | 32 +++---- mobile/pubspec.yaml | 10 +-- 40 files changed, 97 insertions(+), 74 deletions(-) diff --git a/mobile/lib/providers/activity.provider.g.dart b/mobile/lib/providers/activity.provider.g.dart index 9c20a09793cc2c7373dafc579a85139521c6ddab..af574b991aeee89e443e9c9d22110066afc67637 100644 GIT binary patch delta 136 zcmeyT`$KPooJfF!OKL$;YI0&pYKn$>cxFzHLQ<+iQEF~}S!#+xW}bqvo`If1XmP4S zP-+^GUtE%!n4+%9rLV7$nVy$llxn3=npaw!ni8LylbV~FSF%}F +ActivityService activityService(Ref ref) => ActivityService(ref.watch(activityApiRepositoryProvider)); diff --git a/mobile/lib/providers/activity_service.provider.g.dart b/mobile/lib/providers/activity_service.provider.g.dart index d42b2a39e45f7850e001a6d3679218ef41228e28..1a08a6f8aaba7c20d0edef43eb7dca8aa895c18d 100644 GIT binary patch delta 135 zcmZ3*zJz1Ld8Pmdm(+ry)a1mH)D#W%@XVYXg``x4qSV~{veXoX%sd5SJp(<3(Bf2u zpwu)VzqlkdF-2XIOJ83hGd(ZADAh`#G_SNcH6=bZCp9-UuVnH$rrTON3Mp_?<8xDU dlTwS~fr{eOit=;gixYEG;|mg#vlG)(xd4{tFwg)1 delta 13 UcmZ3&v5I}ed8Ww<%(oc103*W$dH?_b diff --git a/mobile/lib/providers/activity_statistics.provider.g.dart b/mobile/lib/providers/activity_statistics.provider.g.dart index 16a3c0e81b3748fb7f1478ce7d8a4dffafe4d172..d2de32c0aab1cc29439ea25933569567255bbc35 100644 GIT binary patch delta 136 zcmbQB*QLL~P$a;?CAFX^H94^)HAO=`JToUpAt_a%C^a{~EHy6t4_=3db?8Nj` FE&%+<6QTeB delta 9 QcmbQu^ND-IM^;8I02B)YRsaA1 diff --git a/mobile/lib/providers/album/current_album.provider.g.dart b/mobile/lib/providers/album/current_album.provider.g.dart index 50e88546378d58525284dc711608fafe2099e9fc..60ebe3e33329e7ff6df2102967aa5cec557e2801 100644 GIT binary patch delta 50 zcmbQpzKeas1ZFKAg_P8SqSWNXlGK#=+|=Bp)S~#(;?(%GqWs+W;>6t4_=3db?8Nj` FE&$w;67&E7 delta 9 QcmdnRK9POH1ZGAq01&YPr~m)} diff --git a/mobile/lib/providers/api.provider.dart b/mobile/lib/providers/api.provider.dart index 8e48324c9..a994dacf2 100644 --- a/mobile/lib/providers/api.provider.dart +++ b/mobile/lib/providers/api.provider.dart @@ -1,7 +1,8 @@ +import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/services/api.service.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'api.provider.g.dart'; @Riverpod(keepAlive: true) -ApiService apiService(ApiServiceRef ref) => ApiService(); +ApiService apiService(Ref ref) => ApiService(); diff --git a/mobile/lib/providers/api.provider.g.dart b/mobile/lib/providers/api.provider.g.dart index 421d554314a98c2c88b8101223bca0ec48bc27c5..2573f3d291d753fb5a721643435e568946747830 100644 GIT binary patch delta 135 zcmX@lc9MNVCsTlfOKL$;YI0&pYKn$>cxFzHLQ<+iQEF~}S!#+xW}bqvo`If1XmP4S zP-+^GUtE%!n4+%9rLV7$nVy$llxn3=npaw!ni8LylbV~FS2DSS>6n&|LJHi}_}tXo dq|~B#prZJ+qWs+W;>6t4_=3db?8Nj`E&zz!Fn0g| delta 13 UcmX@fex7YZC)4CxOh*~H04P)iAOHXW diff --git a/mobile/lib/providers/app_settings.provider.dart b/mobile/lib/providers/app_settings.provider.dart index a598be7a1..81c5c8e20 100644 --- a/mobile/lib/providers/app_settings.provider.dart +++ b/mobile/lib/providers/app_settings.provider.dart @@ -1,8 +1,8 @@ +import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/services/app_settings.service.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'app_settings.provider.g.dart'; @Riverpod(keepAlive: true) -AppSettingsService appSettingsService(AppSettingsServiceRef ref) => - AppSettingsService(); +AppSettingsService appSettingsService(Ref ref) => AppSettingsService(); diff --git a/mobile/lib/providers/app_settings.provider.g.dart b/mobile/lib/providers/app_settings.provider.g.dart index a9954382a7dfe12cee680c71b14642a820577b1f..1d2fe173b179503edae52d95d43513cff5800961 100644 GIT binary patch delta 135 zcmdnQzJ_DN9i{*Wm(+ry)a1mH)D#W%@XVYXg``x4qSV~{veXoX%sd5SJp(<3(Bf2u zpwu)VzqlkdF-2XIOJ83hGd(ZADAh`#G_SNcH6=bZCp9-UuVnIVrfXU{3Mp_?<8xDU dlTwS~fr{eOit=;gixYEG;|mg#vlG)(xd5kHF!cZc delta 13 UcmZ3(v59@d9j3{;%vTw?03{s+p8x;= diff --git a/mobile/lib/providers/asset.provider.dart b/mobile/lib/providers/asset.provider.dart index f093d9007..53fe0338c 100644 --- a/mobile/lib/providers/asset.provider.dart +++ b/mobile/lib/providers/asset.provider.dart @@ -31,7 +31,7 @@ class AssetNotifier extends StateNotifier { final SyncService _syncService; final ETagService _etagService; final ExifService _exifService; - final StateNotifierProviderRef _ref; + final Ref _ref; final log = Logger('AssetNotifier'); bool _getAllAssetInProgress = false; bool _deleteInProgress = false; diff --git a/mobile/lib/providers/asset_viewer/asset_people.provider.g.dart b/mobile/lib/providers/asset_viewer/asset_people.provider.g.dart index df6ee779cc52af604dbac9da89e1abe5e95fb342..ebe8a14186b4c61476e38a59e6da06de6ddd693d 100644 GIT binary patch delta 136 zcmX@3bxeE1A)x>Vm(+ry)a1mH)D#W%@XVYXg``x4qSV~{veXoX%sd5SJp(<3(Bf2u zpwu)VzqlkdF-2XIOJ83hGd(ZADAh`#G_SNcH6=bZCp9-UuVnK%!m>9VLdDRF9 diff --git a/mobile/lib/providers/asset_viewer/asset_stack.provider.dart b/mobile/lib/providers/asset_viewer/asset_stack.provider.dart index d7049e4e1..0edefde52 100644 --- a/mobile/lib/providers/asset_viewer/asset_stack.provider.dart +++ b/mobile/lib/providers/asset_viewer/asset_stack.provider.dart @@ -39,6 +39,6 @@ final assetStackStateProvider = StateNotifierProvider.autoDispose ); @riverpod -int assetStackIndex(AssetStackIndexRef ref, Asset asset) { +int assetStackIndex(Ref ref, Asset asset) { return -1; } diff --git a/mobile/lib/providers/asset_viewer/asset_stack.provider.g.dart b/mobile/lib/providers/asset_viewer/asset_stack.provider.g.dart index 142e46d32292f8f30a135d930c2ca43c263dba4e..da49c11429482f2f07556ebd5316be229497cef5 100644 GIT binary patch delta 146 zcmeBFYF6IB!5`+}l3Gxdnw(gYnxdf|o|%)Qkd&%Wl$x7gmYSlFnWtc^XP~DLTAZp7 zl$r+Q7nh_arl@Oj>FXi_@% delta 24 fcmZox?o`^q!OxnTS&^AHxsXG6b0Pl=Mn*0GV)O@z diff --git a/mobile/lib/providers/asset_viewer/current_asset.provider.g.dart b/mobile/lib/providers/asset_viewer/current_asset.provider.g.dart index 96628dab5897390c57fa0c92bdbea6039511ff0f..53b02c2ace832e484ab8afc76cb249935bb9d05d 100644 GIT binary patch delta 50 zcmbQpzKeas1ZFKAg_P8SqSWNXlGK#=+|=Bp)S~#(;?(%GqWs+W;>6t4_=3db?8Nj` FE&$w;67&E7 delta 9 QcmdnRK9POH1ZGAq01&YPr~m)} diff --git a/mobile/lib/providers/backup/backup_verification.provider.g.dart b/mobile/lib/providers/backup/backup_verification.provider.g.dart index 9b5269884796ccb5a96edc985f49d6b230a73177..bae3ec366bd4ef87025671286d3303acea8a824e 100644 GIT binary patch delta 50 zcmcc2{)c_TC1x!hg_P8SqSWNXlGK#=+|=Bp)S~#(;?(%GqWs+W;>6t4_=3db?8Nj` FE&u_46S@EZ delta 9 Qcmeyvewls4C1yr002SE-ZU6uP diff --git a/mobile/lib/providers/immich_logo_provider.dart b/mobile/lib/providers/immich_logo_provider.dart index c5c65fcfe..a52aba5f9 100644 --- a/mobile/lib/providers/immich_logo_provider.dart +++ b/mobile/lib/providers/immich_logo_provider.dart @@ -1,12 +1,13 @@ import 'dart:convert'; import 'package:flutter/services.dart'; +import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'immich_logo_provider.g.dart'; @riverpod -Future immichLogo(ImmichLogoRef ref) async { +Future immichLogo(Ref ref) async { final json = await rootBundle.loadString('assets/immich-logo.json'); final j = jsonDecode(json); return base64Decode(j['content']); diff --git a/mobile/lib/providers/immich_logo_provider.g.dart b/mobile/lib/providers/immich_logo_provider.g.dart index 1a95814e35c0b70a10ccff5e1b40fe693780b117..9f2d81b46ad5b64d0a32b0b7963e17ed02db6869 100644 GIT binary patch delta 135 zcmey)_K|(VLZ$!*m(+ry)a1mH)D#W%@XVYXg``x4qSV~{veXoX%sd5SJp(<3(Bf2u zpwu)VzqlkdF-2XIOJ83hGd(ZADAh`#G_SNcH6=bZCp9-UuVnH9rfXU{3Mp_?<8xDU dlTwS~fr{eOit=;gixYEG;|mg#vlG)(xd6rdF$Vwu delta 13 Vcmey!{+(^ZLZ-=|n65H%0RSz01+V}B diff --git a/mobile/lib/providers/infrastructure/db.provider.dart b/mobile/lib/providers/infrastructure/db.provider.dart index 447039478..84010b3b9 100644 --- a/mobile/lib/providers/infrastructure/db.provider.dart +++ b/mobile/lib/providers/infrastructure/db.provider.dart @@ -1,7 +1,8 @@ +import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:isar/isar.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'db.provider.g.dart'; @Riverpod(keepAlive: true) -Isar isar(IsarRef ref) => throw UnimplementedError('isar'); +Isar isar(Ref ref) => throw UnimplementedError('isar'); diff --git a/mobile/lib/providers/infrastructure/db.provider.g.dart b/mobile/lib/providers/infrastructure/db.provider.g.dart index 1bfe7b0ad59b4559865a6f9f75dcdd8f44a48a2a..d35c2202ecadcbc3d197ac6dc34e6a77bf0af5e4 100644 GIT binary patch delta 135 zcmbQl*2BIbf+@hkCAFX^H94^)HAO=`JToUpAt_a%C^a{~EHy +IExifInfoRepository exifRepository(Ref ref) => IsarExifRepository(ref.watch(isarProvider)); diff --git a/mobile/lib/providers/infrastructure/exif.provider.g.dart b/mobile/lib/providers/infrastructure/exif.provider.g.dart index a9e60ca463c23c0e8f72f9b6e8e6aede492be225..5eec1bd23ed39491dd839ed654b12e57bd69938e 100644 GIT binary patch delta 135 zcmeBRZ{panl_|i%CAFX^H94^)HAO=`JToUpAt_a%C^a{~EHy9UrNLJHi}_}tXo dq|~B#prZJ+qWs+W;>6t4_=3db?8Nj`E&yN-Fi-#h delta 13 UcmZqT=wRQlm1!~?^Cd`Tzg` diff --git a/mobile/lib/providers/infrastructure/store.provider.dart b/mobile/lib/providers/infrastructure/store.provider.dart index cb7024ad5..2712208e7 100644 --- a/mobile/lib/providers/infrastructure/store.provider.dart +++ b/mobile/lib/providers/infrastructure/store.provider.dart @@ -1,3 +1,4 @@ +import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/domain/interfaces/store.interface.dart'; import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'; import 'package:immich_mobile/providers/infrastructure/db.provider.dart'; @@ -6,5 +7,5 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'store.provider.g.dart'; @riverpod -IStoreRepository storeRepository(StoreRepositoryRef ref) => +IStoreRepository storeRepository(Ref ref) => IsarStoreRepository(ref.watch(isarProvider)); diff --git a/mobile/lib/providers/infrastructure/store.provider.g.dart b/mobile/lib/providers/infrastructure/store.provider.g.dart index f53d6773848222c41182e2f15493f84dd3230467..0551793b80e500bc87495487571a04af2c8907e2 100644 GIT binary patch delta 135 zcmZ3;KAU61QKkR~m(+ry)a1mH)D#W%@XVYXg``x4qSV~{veXoX%sd5SJp(<3(Bf2u zpwu)VzqlkdF-2XIOJ83hGd(ZADAh`#G_SNcH6=bZCp9-UuVnHOraM|X3Mp_?<8xDU dlTwS~fr{eOit=;gixYEG;|mg#vlG)(xd4X7FslFn delta 13 UcmbQuv5> mapMarkers(MapMarkersRef ref) async { +Future> mapMarkers(Ref ref) async { final service = ref.read(mapServiceProvider); final mapState = ref.read(mapStateNotifierProvider); DateTime? fileCreatedAfter; diff --git a/mobile/lib/providers/map/map_marker.provider.g.dart b/mobile/lib/providers/map/map_marker.provider.g.dart index ce11b4ebfff6845c37fe48e8396e9296768e7f87..c79292aa612d5d01aa0c062d6c7e402b7734a6de 100644 GIT binary patch delta 135 zcmZo-|HHmv8B>6ROKL$;YI0&pYKn$>cxFzHLQ<+iQEF~}S!#+xW}bqvo`If1XmP4S zP-+^GUtE%!n4+%9rLV7$nVy$llxn3=npaw!ni8LylbV~FS2B4i(;Y1xg%r4{@wutF dNvTEgKt=IsMfth$#fiD8@db&=*@@|?TmX{(Fs=Xq delta 13 Ucmeyv-o(CP8PnwNOt%@i04ZSwR{#J2 diff --git a/mobile/lib/providers/map/map_service.provider.dart b/mobile/lib/providers/map/map_service.provider.dart index 2773f7dcc..0d998c517 100644 --- a/mobile/lib/providers/map/map_service.provider.dart +++ b/mobile/lib/providers/map/map_service.provider.dart @@ -1,3 +1,4 @@ +import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/services/map.service.dart'; import 'package:immich_mobile/providers/api.provider.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; @@ -5,5 +6,4 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'map_service.provider.g.dart'; @riverpod -MapSerivce mapService(MapServiceRef ref) => - MapSerivce(ref.watch(apiServiceProvider)); +MapSerivce mapService(Ref ref) => MapSerivce(ref.watch(apiServiceProvider)); diff --git a/mobile/lib/providers/map/map_service.provider.g.dart b/mobile/lib/providers/map/map_service.provider.g.dart index 7b4e68eaee3b9ba77ae4858113547a246095ed39..b7adb96ab9bcc77cd9b1ee299c048b2178336565 100644 GIT binary patch delta 135 zcmaFM_MCmg9HsyVm(+ry)a1mH)D#W%@XVYXg``x4qSV~{veXoX%sd5SJp(<3(Bf2u zpwu)VzqlkdF-2XIOJ83hGd(ZADAh`#G_SNcH6=bZCp9-UuVnIUri)rS3Mp_?<8xDU dlTwS~fr{eOit=;gixYEG;|mg#vlG)(xd68~FysIL delta 13 VcmaFP{+4aS9Hz-{nJzGL0RSvK1&sgz diff --git a/mobile/lib/providers/map/map_state.provider.g.dart b/mobile/lib/providers/map/map_state.provider.g.dart index 23a570d1c8789f532cb1de51e8cddb0ecfcc5e67..85a237099c4f472167b9e3b4c82e08aa61216aed 100644 GIT binary patch delta 50 zcmZ3=evW;^5@szOg_P8SqSWNXlGK#=+|=Bp)S~#(;?(%GqWs+W;>6t4_=3db?8Nj` FE&%7g6EFY( delta 9 QcmX@dzLb5#5@tp&01`n0 { @riverpod Future paginatedSearchRenderList( - PaginatedSearchRenderListRef ref, + Ref ref, ) { final result = ref.watch(paginatedSearchProvider); final timelineService = ref.watch(timelineServiceProvider); diff --git a/mobile/lib/providers/search/paginated_search.provider.g.dart b/mobile/lib/providers/search/paginated_search.provider.g.dart index 5682795ea1a6f9b33ca17b0c944d94fdd239b03c..86061675dcb8ffed2a6af6b14b7cd3a435ef63f3 100644 GIT binary patch delta 135 zcmZqS_{Xt9jyb@=CAFX^H94^)HAO=`JToUpAt_a%C^a{~EHy> getAllPeople( - GetAllPeopleRef ref, + Ref ref, ) async { final PersonService personService = ref.read(personServiceProvider); @@ -19,7 +20,7 @@ Future> getAllPeople( } @riverpod -Future personAssets(PersonAssetsRef ref, String personId) async { +Future personAssets(Ref ref, String personId) async { final PersonService personService = ref.read(personServiceProvider); final assets = await personService.getPersonAssets(personId); @@ -31,7 +32,7 @@ Future personAssets(PersonAssetsRef ref, String personId) async { @riverpod Future updatePersonName( - UpdatePersonNameRef ref, + Ref ref, String personId, String updatedName, ) async { diff --git a/mobile/lib/providers/search/people.provider.g.dart b/mobile/lib/providers/search/people.provider.g.dart index c5ff6287cd7a82ad1bebd40ae98267e79394634f..51295f991a762fbbf98cd58da62aabb0dc7cdb12 100644 GIT binary patch delta 308 zcmaFi+TyWcEmMGlOKL$;YI0&pYKn$>cxFzHLQ<+iQEF~}S!#+xW}bqvo`If1XmP4S zP-+^GUtE%!n4+%9rLV7$nVy$llxn3=npaw!ni8LylbV~FSF(8xQ#c>>O=S|4=BK`? sG76`ev~(0w;6V_do0^-HS`-iTQG8laer|kmVs2`DL1J=tVtOhU0F_p1HUIzs delta 24 gcmZqic;UKXEz{> getSearchSuggestions( - GetSearchSuggestionsRef ref, + Ref ref, SearchSuggestionType type, { String? locationCountry, String? locationState, diff --git a/mobile/lib/providers/search/search_filter.provider.g.dart b/mobile/lib/providers/search/search_filter.provider.g.dart index d5cdaa0312040562ccdc8bcda411935fadcdf7fc..a5e70b01e80e92d92753fe625b592d4fd45fa2e6 100644 GIT binary patch delta 146 zcmaE4ddF$s1C+4Qc7bGTUC#I)z0RS&9HERF> delta 24 gcmca(_Q-U@Em79o%! { + FolderRoute({ + Key? key, + RecursiveFolder? folder, + List? children, + }) : super( + FolderRoute.name, + args: FolderRouteArgs( + key: key, + folder: folder, + ), + initialChildren: children, + ); + + static const String name = 'FolderRoute'; + + static PageInfo page = PageInfo( + name, + builder: (data) { + final args = + data.argsAs(orElse: () => const FolderRouteArgs()); + return FolderPage( + key: args.key, + folder: args.folder, + ); + }, + ); +} + +class FolderRouteArgs { + const FolderRouteArgs({ + this.key, + this.folder, + }); + + final Key? key; + + final RecursiveFolder? folder; + + @override + String toString() { + return 'FolderRouteArgs{key: $key, folder: $folder}'; + } +} + /// generated route for /// [GalleryViewerPage] class GalleryViewerRoute extends PageRouteInfo { @@ -1175,40 +1222,6 @@ class PartnerRoute extends PageRouteInfo { ); } -/// manually written (with love) route for -/// [FolderPage] -class FolderRoute extends PageRouteInfo { - FolderRoute({ - RecursiveFolder? folder, - List? children, - }) : super( - FolderRoute.name, - args: FolderRouteArgs(folder: folder), - initialChildren: children, - ); - - static const String name = 'FolderRoute'; - - static PageInfo page = PageInfo( - name, - builder: (data) { - final args = data.argsAs(); - return FolderPage(folder: args.folder); - }, - ); -} - -class FolderRouteArgs { - const FolderRouteArgs({this.folder}); - - final RecursiveFolder? folder; - - @override - String toString() { - return 'FolderRouteArgs{folder: $folder}'; - } -} - /// generated route for /// [PeopleCollectionPage] class PeopleCollectionRoute extends PageRouteInfo { diff --git a/mobile/lib/services/person.service.dart b/mobile/lib/services/person.service.dart index 5b325acdc..a8289ac37 100644 --- a/mobile/lib/services/person.service.dart +++ b/mobile/lib/services/person.service.dart @@ -1,3 +1,4 @@ +import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/interfaces/asset.interface.dart'; import 'package:immich_mobile/interfaces/asset_api.interface.dart'; @@ -11,7 +12,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; part 'person.service.g.dart'; @riverpod -PersonService personService(PersonServiceRef ref) => PersonService( +PersonService personService(Ref ref) => PersonService( ref.watch(personApiRepositoryProvider), ref.watch(assetApiRepositoryProvider), ref.read(assetRepositoryProvider), diff --git a/mobile/lib/services/person.service.g.dart b/mobile/lib/services/person.service.g.dart index 9a24069fbffa5cd514f77fd7d0a2c6401ce39fe6..c7352606b3b1b7c2303fae4edaa12cd15da7480e 100644 GIT binary patch delta 135 zcmeBXZ{^sqg(<+nCAFX^H94^)HAO=`JToUpAt_a%C^a{~EHyAIGVLJHi}_}tXo dq|~B#prZJ+qWs+W;>6t4_=3db?8Nj`E&yXPFjxQp delta 13 UcmZqW=w{!rg=sP?^EE~;03UD!0ssI2 diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index db1a335ad..44f8d1627 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -516,10 +516,10 @@ packages: dependency: "direct main" description: name: flutter_hooks - sha256: cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70 + sha256: b772e710d16d7a20c0740c4f855095026b31c7eb5ba3ab67d2bd52021cd9461d url: "https://pub.dev" source: hosted - version: "0.20.5" + version: "0.21.2" flutter_launcher_icons: dependency: "direct dev" description: @@ -585,10 +585,10 @@ packages: dependency: transitive description: name: flutter_riverpod - sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d" + sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" flutter_svg: dependency: "direct main" description: @@ -728,10 +728,10 @@ packages: dependency: "direct main" description: name: hooks_riverpod - sha256: "45b2030a18bcd6dbd680c2c91bc3b33e3fe7c323e3acb5ecec93a613e2fbaa8a" + sha256: "70bba33cfc5670c84b796e6929c54b8bc5be7d0fe15bb28c2560500b9ad06966" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" hotreloader: dependency: transitive description: @@ -1292,42 +1292,42 @@ packages: dependency: transitive description: name: riverpod - sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d + sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" riverpod_analyzer_utils: dependency: transitive description: name: riverpod_analyzer_utils - sha256: ee72770090078e6841d51355292335f1bc254907c6694283389dcb8156d99a4d + sha256: "0dcb0af32d561f8fa000c6a6d95633c9fb08ea8a8df46e3f9daca59f11218167" url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.5.6" riverpod_annotation: dependency: "direct main" description: name: riverpod_annotation - sha256: e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c + sha256: e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8 url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.6.1" riverpod_generator: dependency: "direct dev" description: name: riverpod_generator - sha256: "1ad626afbd8b01d168870b13c0b036f8a5bdb57c14cd426dc5b4595466bd6e2f" + sha256: "851aedac7ad52693d12af3bf6d92b1626d516ed6b764eb61bf19e968b5e0b931" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.6.1" riverpod_lint: dependency: "direct dev" description: name: riverpod_lint - sha256: b95a8cdc6102397f7d51037131c25ce7e51be900be021af4bf0c2d6f1b8f7aa7 + sha256: "0684c21a9a4582c28c897d55c7b611fa59a351579061b43f8c92c005804e63a8" url: "https://pub.dev" source: hosted - version: "2.3.12" + version: "2.6.1" rxdart: dependency: transitive description: diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 1d16359f9..2715c0cfd 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -17,9 +17,9 @@ dependencies: path_provider_ios: photo_manager: ^3.6.1 photo_manager_image_provider: ^2.2.0 - flutter_hooks: ^0.20.4 - hooks_riverpod: ^2.4.9 - riverpod_annotation: ^2.3.3 + flutter_hooks: ^0.21.2 + hooks_riverpod: ^2.6.1 + riverpod_annotation: ^2.6.1 cached_network_image: ^3.3.1 flutter_cache_manager: ^3.3.1 intl: ^0.19.0 @@ -108,8 +108,8 @@ dev_dependencies: integration_test: sdk: flutter custom_lint: ^0.6.4 - riverpod_lint: ^2.3.7 - riverpod_generator: ^2.3.9 + riverpod_lint: ^2.6.1 + riverpod_generator: ^2.6.1 mocktail: ^1.0.3 immich_mobile_immich_lint: path: './immich_lint'