High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor(mobile): move store settings and store into domain folder (#16201)
shenlong76d95cd3481f
diff --git a/mobile/lib/domain/interfaces/store.interface.dart b/mobile/lib/domain/interfaces/store.interface.dartindex cbcce1159c..a2d248e801 100644--- a/mobile/lib/domain/interfaces/store.interface.dart+++ b/mobile/lib/domain/interfaces/store.interface.dart@@ -1,4 +1,4 @@-import 'package:immich_mobile/entities/store.entity.dart';+import 'package:immich_mobile/domain/models/store.model.dart';abstract interface class IStoreRepository {Future<bool> insert<T>(StoreKey<T> key, T value);diff --git a/mobile/lib/domain/models/store.model.dart b/mobile/lib/domain/models/store.model.dartnew file mode 100644index 0000000000..4aca207c6f--- /dev/null+++ b/mobile/lib/domain/models/store.model.dart@@ -0,0 +1,80 @@+import 'package:immich_mobile/entities/user.entity.dart';++/// Key for each possible value in the `Store`.+/// Defines the data type for each value+enum StoreKey<T> {+ version<int>._(0),+ assetETag<String>._(1),+ currentUser<User>._(2),+ deviceIdHash<int>._(3),+ deviceId<String>._(4),+ backupFailedSince<DateTime>._(5),+ backupRequireWifi<bool>._(6),+ backupRequireCharging<bool>._(7),+ backupTriggerDelay<int>._(8),+ serverUrl<String>._(10),+ accessToken<String>._(11),+ serverEndpoint<String>._(12),+ autoBackup<bool>._(13),+ backgroundBackup<bool>._(14),+ sslClientCertData<String>._(15),+ sslClientPasswd<String>._(16),+ // user settings from [AppSettingsEnum] below:+ loadPreview<bool>._(100),+ loadOriginal<bool>._(101),+ themeMode<String>._(102),+ tilesPerRow<int>._(103),+ dynamicLayout<bool>._(104),+ groupAssetsBy<int>._(105),+ uploadErrorNotificationGracePeriod<int>._(106),+ backgroundBackupTotalProgress<bool>._(107),+ backgroundBackupSingleProgress<bool>._(108),+ storageIndicator<bool>._(109),+ thumbnailCacheSize<int>._(110),+ imageCacheSize<int>._(111),+ albumThumbnailCacheSize<int>._(112),+ selectedAlbumSortOrder<int>._(113),+ advancedTroubleshooting<bool>._(114),+ logLevel<int>._(115),+ preferRemoteImage<bool>._(116),+ loopVideo<bool>._(117),+ // map related settings+ mapShowFavoriteOnly<bool>._(118),+ mapRelativeDate<int>._(119),+ selfSignedCert<bool>._(120),+ mapIncludeArchived<bool>._(121),+ ignoreIcloudAssets<bool>._(122),+ selectedAlbumSortReverse<bool>._(123),+ mapThemeMode<int>._(124),+ mapwithPartners<bool>._(125),+ enableHapticFeedback<bool>._(126),+ customHeaders<String>._(127),++ // theme settings+ primaryColor<String>._(128),+ dynamicTheme<bool>._(129),+ colorfulInterface<bool>._(130),++ syncAlbums<bool>._(131),++ // Auto endpoint switching+ autoEndpointSwitching<bool>._(132),+ preferredWifiName<String>._(133),+ localEndpoint<String>._(134),+ externalEndpointList<String>._(135),++ // Video settings+ loadOriginalVideo<bool>._(136),+ ;++ const StoreKey._(this.id);+ final int id;+ Type get type => T;+}++class StoreUpdateEvent<T> {+ final StoreKey<T> key;+ final T? value;++ const StoreUpdateEvent(this.key, this.value);+}diff --git a/mobile/lib/domain/services/store.service.dart b/mobile/lib/domain/services/store.service.dartindex ac127b8ee6..de79e9b71d 100644--- a/mobile/lib/domain/services/store.service.dart+++ b/mobile/lib/domain/services/store.service.dart@@ -1,7 +1,7 @@import 'dart:async';import 'package:immich_mobile/domain/interfaces/store.interface.dart';-import 'package:immich_mobile/entities/store.entity.dart';+import 'package:immich_mobile/domain/models/store.model.dart';class StoreService {final IStoreRepository _storeRepository;diff --git a/mobile/lib/entities/store.entity.dart b/mobile/lib/entities/store.entity.dartindex f6f78d9d9c..ed955352e2 100644--- a/mobile/lib/entities/store.entity.dart+++ b/mobile/lib/entities/store.entity.dart@@ -1,8 +1,8 @@import 'dart:convert';import 'dart:typed_data';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/domain/services/store.service.dart';-import 'package:immich_mobile/entities/user.entity.dart';// ignore: non_constant_identifier_namesfinal Store = StoreService.I;@@ -36,82 +36,3 @@ class SSLClientCertStoreVal {Store.delete(StoreKey.sslClientPasswd);}}--/// Key for each possible value in the `Store`.-/// Defines the data type for each value-enum StoreKey<T> {- version<int>._(0),- assetETag<String>._(1),- currentUser<User>._(2),- deviceIdHash<int>._(3),- deviceId<String>._(4),- backupFailedSince<DateTime>._(5),- backupRequireWifi<bool>._(6),- backupRequireCharging<bool>._(7),- backupTriggerDelay<int>._(8),- serverUrl<String>._(10),- accessToken<String>._(11),- serverEndpoint<String>._(12),- autoBackup<bool>._(13),- backgroundBackup<bool>._(14),- sslClientCertData<String>._(15),- sslClientPasswd<String>._(16),- // user settings from [AppSettingsEnum] below:- loadPreview<bool>._(100),- loadOriginal<bool>._(101),- themeMode<String>._(102),- tilesPerRow<int>._(103),- dynamicLayout<bool>._(104),- groupAssetsBy<int>._(105),- uploadErrorNotificationGracePeriod<int>._(106),- backgroundBackupTotalProgress<bool>._(107),- backgroundBackupSingleProgress<bool>._(108),- storageIndicator<bool>._(109),- thumbnailCacheSize<int>._(110),- imageCacheSize<int>._(111),- albumThumbnailCacheSize<int>._(112),- selectedAlbumSortOrder<int>._(113),- advancedTroubleshooting<bool>._(114),- logLevel<int>._(115),- preferRemoteImage<bool>._(116),- loopVideo<bool>._(117),- // map related settings- mapShowFavoriteOnly<bool>._(118),- mapRelativeDate<int>._(119),- selfSignedCert<bool>._(120),- mapIncludeArchived<bool>._(121),- ignoreIcloudAssets<bool>._(122),- selectedAlbumSortReverse<bool>._(123),- mapThemeMode<int>._(124),- mapwithPartners<bool>._(125),- enableHapticFeedback<bool>._(126),- customHeaders<String>._(127),-- // theme settings- primaryColor<String>._(128),- dynamicTheme<bool>._(129),- colorfulInterface<bool>._(130),-- syncAlbums<bool>._(131),-- // Auto endpoint switching- autoEndpointSwitching<bool>._(132),- preferredWifiName<String>._(133),- localEndpoint<String>._(134),- externalEndpointList<String>._(135),-- // Video settings- loadOriginalVideo<bool>._(136),- ;-- const StoreKey._(this.id);- final int id;- Type get type => T;-}--class StoreUpdateEvent<T> {- final StoreKey<T> key;- final T? value;-- const StoreUpdateEvent(this.key, this.value);-}diff --git a/mobile/lib/infrastructure/repositories/store.repository.dart b/mobile/lib/infrastructure/repositories/store.repository.dartindex a160a3b48f..f22f0f987e 100644--- a/mobile/lib/infrastructure/repositories/store.repository.dart+++ b/mobile/lib/infrastructure/repositories/store.repository.dart@@ -1,5 +1,5 @@import 'package:immich_mobile/domain/interfaces/store.interface.dart';-import 'package:immich_mobile/entities/store.entity.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/user.entity.dart';import 'package:immich_mobile/infrastructure/entities/store.entity.dart';import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';diff --git a/mobile/lib/pages/common/headers_settings.page.dart b/mobile/lib/pages/common/headers_settings.page.dartindex 7f6ee3e4e2..8674a3cbde 100644--- a/mobile/lib/pages/common/headers_settings.page.dart+++ b/mobile/lib/pages/common/headers_settings.page.dart@@ -3,9 +3,10 @@ import 'dart:convert';import 'package:auto_route/auto_route.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';-import 'package:flutter_hooks/flutter_hooks.dart';-import 'package:immich_mobile/entities/store.entity.dart' as store_keys;+import 'package:flutter_hooks/flutter_hooks.dart' hide Store;import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/store.entity.dart';class SettingsHeader {String key = "";@@ -22,8 +23,7 @@ class HeaderSettingsPage extends HookConsumerWidget {final headers = useState<List<SettingsHeader>>([]);final setInitialHeaders = useState(false);- var headersStr =- store_keys.Store.get(store_keys.StoreKey.customHeaders, "");+ var headersStr = Store.get(StoreKey.customHeaders, "");if (!setInitialHeaders.value) {if (headersStr.isNotEmpty) {var customHeaders = jsonDecode(headersStr) as Map;@@ -99,7 +99,7 @@ class HeaderSettingsPage extends HookConsumerWidget {}var encoded = jsonEncode(headersMap);- store_keys.Store.put(store_keys.StoreKey.customHeaders, encoded);+ Store.put(StoreKey.customHeaders, encoded);}}diff --git a/mobile/lib/pages/common/native_video_viewer.page.dart b/mobile/lib/pages/common/native_video_viewer.page.dartindex 8ab0da1b44..23685db274 100644--- a/mobile/lib/pages/common/native_video_viewer.page.dart+++ b/mobile/lib/pages/common/native_video_viewer.page.dart@@ -5,6 +5,7 @@ import 'package:auto_route/auto_route.dart';import 'package:flutter/material.dart';import 'package:flutter_hooks/flutter_hooks.dart' hide Store;import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/providers/app_settings.provider.dart';diff --git a/mobile/lib/pages/common/splash_screen.page.dart b/mobile/lib/pages/common/splash_screen.page.dartindex 6a060e19f0..5ea9351c0e 100644--- a/mobile/lib/pages/common/splash_screen.page.dart+++ b/mobile/lib/pages/common/splash_screen.page.dart@@ -1,11 +1,12 @@import 'package:auto_route/auto_route.dart';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/providers/backup/backup.provider.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/providers/auth.provider.dart';+import 'package:immich_mobile/providers/backup/backup.provider.dart';import 'package:immich_mobile/providers/gallery_permission.provider.dart';import 'package:immich_mobile/routing/router.dart';-import 'package:immich_mobile/entities/store.entity.dart';import 'package:logging/logging.dart';@RoutePage()diff --git a/mobile/lib/pages/library/places/places_collection.page.dart b/mobile/lib/pages/library/places/places_collection.page.dartindex f42febc373..d4da3ff37e 100644--- a/mobile/lib/pages/library/places/places_collection.page.dart+++ b/mobile/lib/pages/library/places/places_collection.page.dart@@ -3,6 +3,7 @@ import 'package:cached_network_image/cached_network_image.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';diff --git a/mobile/lib/pages/share_intent/share_intent.page.dart b/mobile/lib/pages/share_intent/share_intent.page.dartindex 56d093b761..d18fd15b6d 100644--- a/mobile/lib/pages/share_intent/share_intent.page.dart+++ b/mobile/lib/pages/share_intent/share_intent.page.dart@@ -1,14 +1,14 @@import 'package:auto_route/auto_route.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';-import 'package:flutter_hooks/flutter_hooks.dart';+import 'package:flutter_hooks/flutter_hooks.dart' hide Store;import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/models/upload/share_intent_attachment.model.dart';-import 'package:immich_mobile/pages/common/large_leading_tile.dart';import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';-import 'package:immich_mobile/entities/store.entity.dart' as db_store;@RoutePage()class ShareIntentPage extends HookConsumerWidget {@@ -18,8 +18,7 @@ class ShareIntentPage extends HookConsumerWidget {@overrideWidget build(BuildContext context, WidgetRef ref) {- final currentEndpoint =- db_store.Store.get(db_store.StoreKey.serverEndpoint);+ final currentEndpoint = Store.get(StoreKey.serverEndpoint);final candidates = ref.watch(shareIntentUploadProvider);final isUploaded = useState(false);diff --git a/mobile/lib/providers/asset.provider.dart b/mobile/lib/providers/asset.provider.dartindex bfc03cdd00..1c12eda6b7 100644--- a/mobile/lib/providers/asset.provider.dart+++ b/mobile/lib/providers/asset.provider.dart@@ -1,19 +1,20 @@import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/providers/locale_provider.dart';-import 'package:immich_mobile/providers/memory.provider.dart';-import 'package:immich_mobile/services/album.service.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/providers/db.provider.dart';+import 'package:immich_mobile/providers/locale_provider.dart';+import 'package:immich_mobile/providers/memory.provider.dart';import 'package:immich_mobile/providers/user.provider.dart';+import 'package:immich_mobile/services/album.service.dart';import 'package:immich_mobile/services/asset.service.dart';import 'package:immich_mobile/services/etag.service.dart';import 'package:immich_mobile/services/exif.service.dart';-import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';-import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/services/sync.service.dart';import 'package:immich_mobile/services/user.service.dart';import 'package:immich_mobile/utils/renderlist_generator.dart';+import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';import 'package:isar/isar.dart';import 'package:logging/logging.dart';diff --git a/mobile/lib/providers/auth.provider.dart b/mobile/lib/providers/auth.provider.dartindex 573c490e7c..e2b15753a9 100644--- a/mobile/lib/providers/auth.provider.dart+++ b/mobile/lib/providers/auth.provider.dart@@ -1,6 +1,7 @@import 'package:flutter/foundation.dart';import 'package:flutter_udid/flutter_udid.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/entities/user.entity.dart';import 'package:immich_mobile/models/auth/auth_state.model.dart';diff --git a/mobile/lib/providers/backup/backup.provider.dart b/mobile/lib/providers/backup/backup.provider.dartindex aab367485c..3b0f724411 100644--- a/mobile/lib/providers/backup/backup.provider.dart+++ b/mobile/lib/providers/backup/backup.provider.dart@@ -5,30 +5,31 @@ import 'package:collection/collection.dart';import 'package:flutter/foundation.dart';import 'package:flutter/widgets.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/album.entity.dart';+import 'package:immich_mobile/entities/backup_album.entity.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/interfaces/album_media.interface.dart';import 'package:immich_mobile/interfaces/backup.interface.dart';import 'package:immich_mobile/interfaces/file_media.interface.dart';+import 'package:immich_mobile/models/auth/auth_state.model.dart';import 'package:immich_mobile/models/backup/available_album.model.dart';-import 'package:immich_mobile/entities/backup_album.entity.dart';import 'package:immich_mobile/models/backup/backup_candidate.model.dart';import 'package:immich_mobile/models/backup/backup_state.model.dart';import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';import 'package:immich_mobile/models/backup/error_upload_asset.model.dart';import 'package:immich_mobile/models/backup/success_upload_asset.model.dart';+import 'package:immich_mobile/models/server_info/server_disk_info.model.dart';+import 'package:immich_mobile/providers/app_life_cycle.provider.dart';+import 'package:immich_mobile/providers/auth.provider.dart';import 'package:immich_mobile/providers/backup/error_backup_list.provider.dart';+import 'package:immich_mobile/providers/db.provider.dart';+import 'package:immich_mobile/providers/gallery_permission.provider.dart';import 'package:immich_mobile/repositories/album_media.repository.dart';import 'package:immich_mobile/repositories/backup.repository.dart';import 'package:immich_mobile/repositories/file_media.repository.dart';import 'package:immich_mobile/services/background.service.dart';import 'package:immich_mobile/services/backup.service.dart';-import 'package:immich_mobile/models/auth/auth_state.model.dart';-import 'package:immich_mobile/providers/auth.provider.dart';-import 'package:immich_mobile/providers/gallery_permission.provider.dart';-import 'package:immich_mobile/models/server_info/server_disk_info.model.dart';-import 'package:immich_mobile/entities/store.entity.dart';-import 'package:immich_mobile/providers/app_life_cycle.provider.dart';-import 'package:immich_mobile/providers/db.provider.dart';import 'package:immich_mobile/services/server_info.service.dart';import 'package:immich_mobile/utils/backup_progress.dart';import 'package:immich_mobile/utils/diff.dart';diff --git a/mobile/lib/providers/user.provider.dart b/mobile/lib/providers/user.provider.dartindex 73fc283109..c69245ea98 100644--- a/mobile/lib/providers/user.provider.dart+++ b/mobile/lib/providers/user.provider.dart@@ -1,6 +1,7 @@import 'dart:async';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/entities/user.entity.dart';import 'package:immich_mobile/providers/api.provider.dart';diff --git a/mobile/lib/providers/websocket.provider.dart b/mobile/lib/providers/websocket.provider.dartindex 6889db7b7f..f92d2c8421 100644--- a/mobile/lib/providers/websocket.provider.dart+++ b/mobile/lib/providers/websocket.provider.dart@@ -4,11 +4,12 @@ import 'package:collection/collection.dart';import 'package:flutter/foundation.dart';import 'package:flutter/widgets.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/providers/auth.provider.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/asset.entity.dart';-import 'package:immich_mobile/models/server_info/server_version.model.dart';import 'package:immich_mobile/entities/store.entity.dart';+import 'package:immich_mobile/models/server_info/server_version.model.dart';import 'package:immich_mobile/providers/asset.provider.dart';+import 'package:immich_mobile/providers/auth.provider.dart';import 'package:immich_mobile/providers/db.provider.dart';import 'package:immich_mobile/providers/server_info.provider.dart';import 'package:immich_mobile/services/api.service.dart';diff --git a/mobile/lib/repositories/album.repository.dart b/mobile/lib/repositories/album.repository.dartindex 66104e95a5..0f1cf64865 100644--- a/mobile/lib/repositories/album.repository.dart+++ b/mobile/lib/repositories/album.repository.dart@@ -1,5 +1,6 @@import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/album.entity.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';diff --git a/mobile/lib/repositories/album_media.repository.dart b/mobile/lib/repositories/album_media.repository.dartindex c3795f75df..f4f31cf14e 100644--- a/mobile/lib/repositories/album_media.repository.dart+++ b/mobile/lib/repositories/album_media.repository.dart@@ -1,4 +1,5 @@import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/album.entity.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';diff --git a/mobile/lib/repositories/asset_media.repository.dart b/mobile/lib/repositories/asset_media.repository.dartindex 68fffa08a6..4f8272b44f 100644--- a/mobile/lib/repositories/asset_media.repository.dart+++ b/mobile/lib/repositories/asset_media.repository.dart@@ -1,4 +1,5 @@import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/exif_info.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dartindex fa504e6ac3..491db3c8a8 100644--- a/mobile/lib/repositories/auth.repository.dart+++ b/mobile/lib/repositories/auth.repository.dart@@ -1,6 +1,7 @@import 'dart:convert';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/album.entity.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/etag.entity.dart';diff --git a/mobile/lib/repositories/user.repository.dart b/mobile/lib/repositories/user.repository.dartindex 4f1a9e7267..ea67b30e0d 100644--- a/mobile/lib/repositories/user.repository.dart+++ b/mobile/lib/repositories/user.repository.dart@@ -1,4 +1,5 @@import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/entities/user.entity.dart';import 'package:immich_mobile/interfaces/user.interface.dart';diff --git a/mobile/lib/routing/auth_guard.dart b/mobile/lib/routing/auth_guard.dartindex 65631911ec..33eb8e81ad 100644--- a/mobile/lib/routing/auth_guard.dart+++ b/mobile/lib/routing/auth_guard.dart@@ -1,6 +1,7 @@import 'dart:io';import 'package:auto_route/auto_route.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/domain/services/store.service.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/routing/router.dart';diff --git a/mobile/lib/routing/tab_navigation_observer.dart b/mobile/lib/routing/tab_navigation_observer.dartindex f48e35c813..b6a845a0b3 100644--- a/mobile/lib/routing/tab_navigation_observer.dart+++ b/mobile/lib/routing/tab_navigation_observer.dart@@ -1,6 +1,7 @@import 'package:auto_route/auto_route.dart';import 'package:flutter/foundation.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/entities/user.entity.dart';import 'package:immich_mobile/providers/api.provider.dart';diff --git a/mobile/lib/services/album.service.dart b/mobile/lib/services/album.service.dartindex 778b47a7c9..e189dbe245 100644--- a/mobile/lib/services/album.service.dart+++ b/mobile/lib/services/album.service.dart@@ -6,23 +6,24 @@ import 'package:collection/collection.dart';import 'package:flutter/foundation.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/album.entity.dart';+import 'package:immich_mobile/entities/asset.entity.dart';+import 'package:immich_mobile/entities/backup_album.entity.dart';+import 'package:immich_mobile/entities/store.entity.dart';+import 'package:immich_mobile/entities/user.entity.dart';import 'package:immich_mobile/interfaces/album.interface.dart';import 'package:immich_mobile/interfaces/album_api.interface.dart';import 'package:immich_mobile/interfaces/album_media.interface.dart';import 'package:immich_mobile/interfaces/asset.interface.dart';import 'package:immich_mobile/interfaces/backup.interface.dart';import 'package:immich_mobile/models/albums/album_add_asset_response.model.dart';-import 'package:immich_mobile/entities/backup_album.entity.dart';-import 'package:immich_mobile/entities/album.entity.dart';-import 'package:immich_mobile/entities/asset.entity.dart';-import 'package:immich_mobile/entities/store.entity.dart';-import 'package:immich_mobile/entities/user.entity.dart';import 'package:immich_mobile/models/albums/album_search.model.dart';import 'package:immich_mobile/repositories/album.repository.dart';import 'package:immich_mobile/repositories/album_api.repository.dart';+import 'package:immich_mobile/repositories/album_media.repository.dart';import 'package:immich_mobile/repositories/asset.repository.dart';import 'package:immich_mobile/repositories/backup.repository.dart';-import 'package:immich_mobile/repositories/album_media.repository.dart';import 'package:immich_mobile/services/entity.service.dart';import 'package:immich_mobile/services/sync.service.dart';import 'package:immich_mobile/services/user.service.dart';diff --git a/mobile/lib/services/api.service.dart b/mobile/lib/services/api.service.dartindex 17e90cd009..823ef6a001 100644--- a/mobile/lib/services/api.service.dart+++ b/mobile/lib/services/api.service.dart@@ -5,6 +5,7 @@ import 'dart:io';import 'package:device_info_plus/device_info_plus.dart';import 'package:flutter/material.dart';import 'package:http/http.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/utils/url_helper.dart';import 'package:logging/logging.dart';diff --git a/mobile/lib/services/app_settings.service.dart b/mobile/lib/services/app_settings.service.dartindex 19e7093faf..1870a61d7a 100644--- a/mobile/lib/services/app_settings.service.dart+++ b/mobile/lib/services/app_settings.service.dart@@ -1,4 +1,5 @@import 'package:immich_mobile/constants/colors.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';enum AppSettingsEnum<T> {diff --git a/mobile/lib/services/auth.service.dart b/mobile/lib/services/auth.service.dartindex 08741a15db..be6c64bc43 100644--- a/mobile/lib/services/auth.service.dart+++ b/mobile/lib/services/auth.service.dart@@ -2,6 +2,7 @@ import 'dart:async';import 'dart:io';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/interfaces/auth.interface.dart';import 'package:immich_mobile/interfaces/auth_api.interface.dart';diff --git a/mobile/lib/services/background.service.dart b/mobile/lib/services/background.service.dartindex c059f48f0e..81619bdca1 100644--- a/mobile/lib/services/background.service.dart+++ b/mobile/lib/services/background.service.dart@@ -3,6 +3,7 @@ import 'dart:developer';import 'dart:io';import 'dart:isolate';import 'dart:ui' show DartPluginRegistrant, IsolateNameServer, PluginUtilities;+import 'package:cancellation_token_http/http.dart';import 'package:collection/collection.dart';import 'package:easy_localization/easy_localization.dart';@@ -10,18 +11,23 @@ import 'package:flutter/foundation.dart';import 'package:flutter/services.dart';import 'package:flutter/widgets.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/backup_album.entity.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/interfaces/backup.interface.dart';import 'package:immich_mobile/main.dart';import 'package:immich_mobile/models/backup/backup_candidate.model.dart';+import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';+import 'package:immich_mobile/models/backup/error_upload_asset.model.dart';import 'package:immich_mobile/models/backup/success_upload_asset.model.dart';import 'package:immich_mobile/repositories/album.repository.dart';import 'package:immich_mobile/repositories/album_api.repository.dart';+import 'package:immich_mobile/repositories/album_media.repository.dart';import 'package:immich_mobile/repositories/asset.repository.dart';import 'package:immich_mobile/repositories/asset_media.repository.dart';import 'package:immich_mobile/repositories/auth.repository.dart';import 'package:immich_mobile/repositories/auth_api.repository.dart';import 'package:immich_mobile/repositories/backup.repository.dart';-import 'package:immich_mobile/repositories/album_media.repository.dart';import 'package:immich_mobile/repositories/etag.repository.dart';import 'package:immich_mobile/repositories/exif_info.repository.dart';import 'package:immich_mobile/repositories/file_media.repository.dart';@@ -31,17 +37,13 @@ import 'package:immich_mobile/repositories/permission.repository.dart';import 'package:immich_mobile/repositories/user.repository.dart';import 'package:immich_mobile/repositories/user_api.repository.dart';import 'package:immich_mobile/services/album.service.dart';+import 'package:immich_mobile/services/api.service.dart';+import 'package:immich_mobile/services/app_settings.service.dart';import 'package:immich_mobile/services/auth.service.dart';+import 'package:immich_mobile/services/backup.service.dart';import 'package:immich_mobile/services/entity.service.dart';import 'package:immich_mobile/services/hash.service.dart';import 'package:immich_mobile/services/localization.service.dart';-import 'package:immich_mobile/entities/backup_album.entity.dart';-import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';-import 'package:immich_mobile/models/backup/error_upload_asset.model.dart';-import 'package:immich_mobile/services/backup.service.dart';-import 'package:immich_mobile/services/app_settings.service.dart';-import 'package:immich_mobile/entities/store.entity.dart';-import 'package:immich_mobile/services/api.service.dart';import 'package:immich_mobile/services/network.service.dart';import 'package:immich_mobile/services/sync.service.dart';import 'package:immich_mobile/services/user.service.dart';diff --git a/mobile/lib/services/backup.service.dart b/mobile/lib/services/backup.service.dartindex 802a98571e..a6468f249b 100644--- a/mobile/lib/services/backup.service.dart+++ b/mobile/lib/services/backup.service.dart@@ -6,6 +6,7 @@ import 'package:cancellation_token_http/http.dart' as http;import 'package:collection/collection.dart';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/album.entity.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/backup_album.entity.dart';diff --git a/mobile/lib/services/backup_verification.service.dart b/mobile/lib/services/backup_verification.service.dartindex 82cfb8347a..5938cd7813 100644--- a/mobile/lib/services/backup_verification.service.dart+++ b/mobile/lib/services/backup_verification.service.dart@@ -5,6 +5,7 @@ import 'package:collection/collection.dart';import 'package:flutter/foundation.dart';import 'package:flutter/services.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/exif_info.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';diff --git a/mobile/lib/services/device.service.dart b/mobile/lib/services/device.service.dartindex e1676d5683..393274608b 100644--- a/mobile/lib/services/device.service.dart+++ b/mobile/lib/services/device.service.dart@@ -1,5 +1,6 @@import 'package:flutter_udid/flutter_udid.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';final deviceServiceProvider = Provider((ref) => DeviceService());diff --git a/mobile/lib/services/download.service.dart b/mobile/lib/services/download.service.dartindex 7cf6f309e9..45297853f6 100644--- a/mobile/lib/services/download.service.dart+++ b/mobile/lib/services/download.service.dart@@ -3,8 +3,9 @@ import 'dart:io';import 'package:background_downloader/background_downloader.dart';import 'package:flutter/services.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/entities/store.entity.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/asset.entity.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/interfaces/download.interface.dart';import 'package:immich_mobile/interfaces/file_media.interface.dart';import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';diff --git a/mobile/lib/services/immich_logger.service.dart b/mobile/lib/services/immich_logger.service.dartindex c46fdc21d7..952e8b191e 100644--- a/mobile/lib/services/immich_logger.service.dart+++ b/mobile/lib/services/immich_logger.service.dart@@ -2,6 +2,7 @@ import 'dart:async';import 'dart:io';import 'package:flutter/widgets.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/logger_message.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:isar/isar.dart';diff --git a/mobile/lib/services/upload.service.dart b/mobile/lib/services/upload.service.dartindex 1ffe01bb93..0734e57212 100644--- a/mobile/lib/services/upload.service.dart+++ b/mobile/lib/services/upload.service.dart@@ -2,6 +2,7 @@ import 'dart:io';import 'package:background_downloader/background_downloader.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/interfaces/upload.interface.dart';import 'package:immich_mobile/repositories/upload.repository.dart';diff --git a/mobile/lib/utils/http_ssl_cert_override.dart b/mobile/lib/utils/http_ssl_cert_override.dartindex 9ce7334be2..ce0384b998 100644--- a/mobile/lib/utils/http_ssl_cert_override.dart+++ b/mobile/lib/utils/http_ssl_cert_override.dart@@ -1,6 +1,8 @@import 'dart:io';-import 'package:immich_mobile/services/app_settings.service.dart';++import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';+import 'package:immich_mobile/services/app_settings.service.dart';import 'package:logging/logging.dart';class HttpSSLCertOverride extends HttpOverrides {diff --git a/mobile/lib/utils/image_url_builder.dart b/mobile/lib/utils/image_url_builder.dartindex 9fc7b13eed..d063b3aa91 100644--- a/mobile/lib/utils/image_url_builder.dart+++ b/mobile/lib/utils/image_url_builder.dart@@ -1,4 +1,5 @@import 'package:immich_mobile/constants/constants.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/album.entity.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dartindex ecbda2f266..eedf8f40f8 100644--- a/mobile/lib/utils/migration.dart+++ b/mobile/lib/utils/migration.dart@@ -1,5 +1,6 @@import 'dart:async';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/album.entity.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/etag.entity.dart';diff --git a/mobile/lib/utils/url_helper.dart b/mobile/lib/utils/url_helper.dartindex d351cb5816..6b355e362f 100644--- a/mobile/lib/utils/url_helper.dart+++ b/mobile/lib/utils/url_helper.dart@@ -1,3 +1,4 @@+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';String sanitizeUrl(String url) {diff --git a/mobile/lib/widgets/album/album_thumbnail_card.dart b/mobile/lib/widgets/album/album_thumbnail_card.dartindex b728f2b541..ac62ecee03 100644--- a/mobile/lib/widgets/album/album_thumbnail_card.dart+++ b/mobile/lib/widgets/album/album_thumbnail_card.dart@@ -1,8 +1,9 @@import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';-import 'package:immich_mobile/extensions/build_context_extensions.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/album.entity.dart';import 'package:immich_mobile/entities/store.entity.dart';+import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/extensions/theme_extensions.dart';import 'package:immich_mobile/widgets/common/immich_thumbnail.dart';diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dartindex bf01d8643a..d51e122954 100644--- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart+++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart@@ -1,6 +1,7 @@import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:image_picker/image_picker.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/extensions/theme_extensions.dart';diff --git a/mobile/lib/widgets/common/immich_app_bar.dart b/mobile/lib/widgets/common/immich_app_bar.dartindex 1831a2d168..7a42606797 100644--- a/mobile/lib/widgets/common/immich_app_bar.dart+++ b/mobile/lib/widgets/common/immich_app_bar.dart@@ -3,17 +3,17 @@ import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';import 'package:flutter_svg/svg.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/extensions/build_context_extensions.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';-import 'package:immich_mobile/providers/immich_logo_provider.dart';-import 'package:immich_mobile/widgets/common/app_bar_dialog/app_bar_dialog.dart';-import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';--import 'package:immich_mobile/routing/router.dart';+import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/models/backup/backup_state.model.dart';import 'package:immich_mobile/models/server_info/server_info.model.dart';import 'package:immich_mobile/providers/backup/backup.provider.dart';+import 'package:immich_mobile/providers/immich_logo_provider.dart';import 'package:immich_mobile/providers/server_info.provider.dart';+import 'package:immich_mobile/routing/router.dart';+import 'package:immich_mobile/widgets/common/app_bar_dialog/app_bar_dialog.dart';+import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {@overridediff --git a/mobile/lib/widgets/common/immich_image.dart b/mobile/lib/widgets/common/immich_image.dartindex ab0f2584b5..243ef55412 100644--- a/mobile/lib/widgets/common/immich_image.dart+++ b/mobile/lib/widgets/common/immich_image.dart@@ -1,11 +1,12 @@import 'package:flutter/material.dart';import 'package:flutter/services.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/asset.entity.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/providers/image/immich_local_image_provider.dart';import 'package:immich_mobile/providers/image/immich_remote_image_provider.dart';import 'package:immich_mobile/widgets/asset_grid/thumbnail_placeholder.dart';-import 'package:immich_mobile/entities/asset.entity.dart';-import 'package:immich_mobile/entities/store.entity.dart';import 'package:octo_image/octo_image.dart';class ImmichImage extends StatelessWidget {diff --git a/mobile/lib/widgets/common/user_avatar.dart b/mobile/lib/widgets/common/user_avatar.dartindex 9a577d94b3..62491210c9 100644--- a/mobile/lib/widgets/common/user_avatar.dart+++ b/mobile/lib/widgets/common/user_avatar.dart@@ -1,8 +1,9 @@import 'package:cached_network_image/cached_network_image.dart';import 'package:flutter/material.dart';-import 'package:immich_mobile/extensions/build_context_extensions.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/entities/user.entity.dart';+import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/services/api.service.dart';Widget userAvatar(BuildContext context, User u, {double? radius}) {diff --git a/mobile/lib/widgets/common/user_circle_avatar.dart b/mobile/lib/widgets/common/user_circle_avatar.dartindex f90da6097b..2b7eadf04b 100644--- a/mobile/lib/widgets/common/user_circle_avatar.dart+++ b/mobile/lib/widgets/common/user_circle_avatar.dart@@ -3,6 +3,7 @@ import 'dart:math';import 'package:cached_network_image/cached_network_image.dart';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/entities/user.entity.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';diff --git a/mobile/lib/widgets/search/curated_places_row.dart b/mobile/lib/widgets/search/curated_places_row.dartindex c4cfdedc27..502b09bc4b 100644--- a/mobile/lib/widgets/search/curated_places_row.dart+++ b/mobile/lib/widgets/search/curated_places_row.dart@@ -1,8 +1,9 @@import 'package:flutter/material.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/models/search/search_curated_content.model.dart';import 'package:immich_mobile/widgets/search/search_map_thumbnail.dart';import 'package:immich_mobile/widgets/search/thumbnail_with_info.dart';-import 'package:immich_mobile/entities/store.entity.dart';class CuratedPlacesRow extends StatelessWidget {const CuratedPlacesRow({diff --git a/mobile/lib/widgets/search/explore_grid.dart b/mobile/lib/widgets/search/explore_grid.dartindex cd937a6a42..1841f7f051 100644--- a/mobile/lib/widgets/search/explore_grid.dart+++ b/mobile/lib/widgets/search/explore_grid.dart@@ -1,12 +1,13 @@import 'package:auto_route/auto_route.dart';import 'package:flutter/material.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/asset.entity.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/models/search/search_curated_content.model.dart';import 'package:immich_mobile/models/search/search_filter.model.dart';-import 'package:immich_mobile/widgets/search/thumbnail_with_info.dart';import 'package:immich_mobile/routing/router.dart';-import 'package:immich_mobile/entities/asset.entity.dart';-import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/utils/image_url_builder.dart';+import 'package:immich_mobile/widgets/search/thumbnail_with_info.dart';class ExploreGrid extends StatelessWidget {final List<SearchCuratedContent> curatedContent;diff --git a/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart b/mobile/lib/widgets/settings/networking_settings/external_network_preference.dartindex 13c109fa0e..09f2617152 100644--- a/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart+++ b/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart@@ -2,11 +2,12 @@ import 'dart:convert';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';-import 'package:flutter_hooks/flutter_hooks.dart';+import 'package:flutter_hooks/flutter_hooks.dart' hide Store;import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';-import 'package:immich_mobile/entities/store.entity.dart' as db_store;import 'package:immich_mobile/widgets/settings/networking_settings/endpoint_input.dart';class ExternalNetworkPreference extends HookConsumerWidget {@@ -30,8 +31,8 @@ class ExternalNetworkPreference extends HookConsumerWidget {final jsonString = jsonEncode(endpointList);- db_store.Store.put(- db_store.StoreKey.externalEndpointList,+ Store.put(+ StoreKey.externalEndpointList,jsonString,);}@@ -81,8 +82,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {useEffect(() {- final jsonString =- db_store.Store.tryGet(db_store.StoreKey.externalEndpointList);+ final jsonString = Store.tryGet(StoreKey.externalEndpointList);if (jsonString == null) {return null;diff --git a/mobile/lib/widgets/settings/networking_settings/networking_settings.dart b/mobile/lib/widgets/settings/networking_settings/networking_settings.dartindex d241792d95..1089029947 100644--- a/mobile/lib/widgets/settings/networking_settings/networking_settings.dart+++ b/mobile/lib/widgets/settings/networking_settings/networking_settings.dart@@ -1,7 +1,10 @@import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';-import 'package:flutter_hooks/flutter_hooks.dart';+import 'package:flutter_hooks/flutter_hooks.dart' hide Store;import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/store.entity.dart';+import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';import 'package:immich_mobile/providers/network.provider.dart';import 'package:immich_mobile/services/app_settings.service.dart';@@ -10,16 +13,12 @@ import 'package:immich_mobile/widgets/settings/networking_settings/external_netwimport 'package:immich_mobile/widgets/settings/networking_settings/local_network_preference.dart';import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';-import 'package:immich_mobile/entities/store.entity.dart' as db_store;-import 'package:immich_mobile/extensions/build_context_extensions.dart';-class NetworkingSettings extends HookConsumerWidget {const NetworkingSettings({super.key});@overrideWidget build(BuildContext context, WidgetRef ref) {- final currentEndpoint =- db_store.Store.get(db_store.StoreKey.serverEndpoint);+ final currentEndpoint = Store.get(StoreKey.serverEndpoint);final featureEnabled =useAppSettingsState(AppSettingsEnum.autoEndpointSwitching);diff --git a/mobile/test/modules/activity/activities_page_test.dart b/mobile/test/modules/activity/activities_page_test.dartindex 38070966c8..6b20692bcd 100644--- a/mobile/test/modules/activity/activities_page_test.dart+++ b/mobile/test/modules/activity/activities_page_test.dart@@ -4,6 +4,7 @@ library;import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/domain/services/store.service.dart';import 'package:immich_mobile/entities/album.entity.dart';import 'package:immich_mobile/entities/asset.entity.dart';diff --git a/mobile/test/modules/activity/activity_text_field_test.dart b/mobile/test/modules/activity/activity_text_field_test.dartindex 1e94f1ddeb..a124af0db9 100644--- a/mobile/test/modules/activity/activity_text_field_test.dart+++ b/mobile/test/modules/activity/activity_text_field_test.dart@@ -4,6 +4,7 @@ library;import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/domain/services/store.service.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';diff --git a/mobile/test/modules/activity/activity_tile_test.dart b/mobile/test/modules/activity/activity_tile_test.dartindex fb48359dd5..22dd606540 100644--- a/mobile/test/modules/activity/activity_tile_test.dart+++ b/mobile/test/modules/activity/activity_tile_test.dart@@ -5,6 +5,7 @@ library;import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/domain/services/store.service.dart';import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';diff --git a/mobile/test/modules/shared/sync_service_test.dart b/mobile/test/modules/shared/sync_service_test.dartindex a87d422b40..464dafc82b 100644--- a/mobile/test/modules/shared/sync_service_test.dart+++ b/mobile/test/modules/shared/sync_service_test.dart@@ -1,5 +1,6 @@import 'package:flutter/widgets.dart';import 'package:flutter_test/flutter_test.dart';+import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/domain/services/store.service.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/entities/etag.entity.dart';