From 615893be386bd3d61d6ee2e858258132bc47f143 Mon Sep 17 00:00:00 2001 From: Fynn Petersen-Frey <10599762+fyfrey@users.noreply.github.com> Date: Sat, 1 Jul 2023 03:47:44 +0200 Subject: [PATCH] fix(mobile): setting to always display remote assets (#3044) --- mobile/assets/i18n/en-US.json | 4 +++- .../modules/asset_viewer/views/gallery_viewer.dart | 10 +++++++--- .../settings/services/app_settings.service.dart | 3 ++- .../ui/advanced_settings/advanced_settings.dart | 11 +++++++++++ mobile/lib/shared/models/store.dart | 1 + mobile/lib/shared/ui/immich_image.dart | 3 ++- 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/mobile/assets/i18n/en-US.json b/mobile/assets/i18n/en-US.json index 074f3e1648..3158f79ba9 100644 --- a/mobile/assets/i18n/en-US.json +++ b/mobile/assets/i18n/en-US.json @@ -5,6 +5,8 @@ "advanced_settings_tile_title": "Advanced", "advanced_settings_troubleshooting_subtitle": "Enable additional features for troubleshooting", "advanced_settings_troubleshooting_title": "Troubleshooting", + "advanced_settings_prefer_remote_title": "Prefer remote images", + "advanced_settings_prefer_remote_subtitle": "Some devices are painfully slow to load thumbnails from assets on the device. Activate this setting to load remote images instead.", "album_info_card_backup_album_excluded": "EXCLUDED", "album_info_card_backup_album_included": "INCLUDED", "album_thumbnail_card_item": "1 item", @@ -288,4 +290,4 @@ "version_announcement_overlay_text_3": " and ensure your docker-compose and .env setup is up-to-date to prevent any misconfigurations, especially if you use WatchTower or any mechanism that handles updating your server application automatically.", "version_announcement_overlay_title": "New Server Version Available \uD83C\uDF89", "all_people_page_title": "People" -} +} \ No newline at end of file diff --git a/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart b/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart index add28eae46..6df20fe0c8 100644 --- a/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart +++ b/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart @@ -131,7 +131,8 @@ class GalleryViewerPage extends HookConsumerWidget { if (index < totalAssets && index >= 0) { final asset = loadAsset(index); - if (asset.isLocal) { + if (!asset.isRemote || + asset.isLocal && !Store.get(StoreKey.preferRemoteImage, false)) { // Preload the local asset precacheImage(localImageProvider(asset), context); } else { @@ -459,7 +460,8 @@ class GalleryViewerPage extends HookConsumerWidget { }); ImageProvider imageProvider(Asset asset) { - if (asset.isLocal) { + if (!asset.isRemote || + asset.isLocal && !Store.get(StoreKey.preferRemoteImage, false)) { return localImageProvider(asset); } else { if (isLoadOriginal.value) { @@ -518,7 +520,9 @@ class GalleryViewerPage extends HookConsumerWidget { loadingBuilder: isLoadPreview.value ? (context, event) { final a = asset(); - if (!a.isLocal) { + if (!a.isLocal || + (a.isRemote && + Store.get(StoreKey.preferRemoteImage, false))) { // Use the WEBP Thumbnail as a placeholder for the JPEG thumbnail to achieve // Three-Stage Loading (WEBP -> JPEG -> Original) final webPThumbnail = CachedNetworkImage( diff --git a/mobile/lib/modules/settings/services/app_settings.service.dart b/mobile/lib/modules/settings/services/app_settings.service.dart index 43b4b142d1..e54e6b60e0 100644 --- a/mobile/lib/modules/settings/services/app_settings.service.dart +++ b/mobile/lib/modules/settings/services/app_settings.service.dart @@ -44,7 +44,8 @@ enum AppSettingsEnum { 0, ), advancedTroubleshooting(StoreKey.advancedTroubleshooting, null, false), - logLevel(StoreKey.logLevel, null, 5) // Level.INFO = 5 + logLevel(StoreKey.logLevel, null, 5), // Level.INFO = 5 + preferRemoteImage(StoreKey.preferRemoteImage, null, false), ; const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue); diff --git a/mobile/lib/modules/settings/ui/advanced_settings/advanced_settings.dart b/mobile/lib/modules/settings/ui/advanced_settings/advanced_settings.dart index ee548d1c88..838bb46602 100644 --- a/mobile/lib/modules/settings/ui/advanced_settings/advanced_settings.dart +++ b/mobile/lib/modules/settings/ui/advanced_settings/advanced_settings.dart @@ -16,6 +16,8 @@ class AdvancedSettings extends HookConsumerWidget { final isEnabled = useState(AppSettingsEnum.advancedTroubleshooting.defaultValue); final levelId = useState(AppSettingsEnum.logLevel.defaultValue); + final preferRemote = + useState(AppSettingsEnum.preferRemoteImage.defaultValue); useEffect( () { @@ -23,6 +25,8 @@ class AdvancedSettings extends HookConsumerWidget { AppSettingsEnum.advancedTroubleshooting, ); levelId.value = appSettingService.getSetting(AppSettingsEnum.logLevel); + preferRemote.value = + appSettingService.getSetting(AppSettingsEnum.preferRemoteImage); return null; }, [], @@ -77,6 +81,13 @@ class AdvancedSettings extends HookConsumerWidget { activeColor: Theme.of(context).primaryColor, ), ), + SettingsSwitchListTile( + appSettingService: appSettingService, + valueNotifier: preferRemote, + settingsEnum: AppSettingsEnum.preferRemoteImage, + title: "advanced_settings_prefer_remote_title".tr(), + subtitle: "advanced_settings_prefer_remote_subtitle".tr(), + ), ], ); } diff --git a/mobile/lib/shared/models/store.dart b/mobile/lib/shared/models/store.dart index 7a07e62719..ebbef904e8 100644 --- a/mobile/lib/shared/models/store.dart +++ b/mobile/lib/shared/models/store.dart @@ -173,6 +173,7 @@ enum StoreKey { selectedAlbumSortOrder(113, type: int), advancedTroubleshooting(114, type: bool), logLevel(115, type: int), + preferRemoteImage(116, type: bool), ; const StoreKey( diff --git a/mobile/lib/shared/ui/immich_image.dart b/mobile/lib/shared/ui/immich_image.dart index 3259f58bc0..bcc7a3d46b 100644 --- a/mobile/lib/shared/ui/immich_image.dart +++ b/mobile/lib/shared/ui/immich_image.dart @@ -43,7 +43,8 @@ class ImmichImage extends StatelessWidget { ); } final Asset asset = this.asset!; - if (asset.isLocal) { + if (!asset.isRemote || + (asset.isLocal && !Store.get(StoreKey.preferRemoteImage, false))) { return Image( image: AssetEntityImageProvider( asset.local!,