mirror of
https://github.com/immich-app/immich.git
synced 2026-07-23 13:54:05 +03:00
Compare commits
1 Commits
fix/auto-h
...
fix-29727
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4926a2039 |
@@ -10,6 +10,7 @@ import 'package:immich_mobile/constants/aspect_ratios.dart';
|
|||||||
import 'package:immich_mobile/domain/models/asset_edit.model.dart';
|
import 'package:immich_mobile/domain/models/asset_edit.model.dart';
|
||||||
import 'package:immich_mobile/extensions/build_context_extensions.dart';
|
import 'package:immich_mobile/extensions/build_context_extensions.dart';
|
||||||
import 'package:immich_mobile/presentation/pages/edit/editor.provider.dart';
|
import 'package:immich_mobile/presentation/pages/edit/editor.provider.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/progressive_image_guard.dart';
|
||||||
import 'package:immich_mobile/providers/theme.provider.dart';
|
import 'package:immich_mobile/providers/theme.provider.dart';
|
||||||
import 'package:immich_mobile/theme/theme_data.dart';
|
import 'package:immich_mobile/theme/theme_data.dart';
|
||||||
import 'package:immich_mobile/utils/editor.utils.dart';
|
import 'package:immich_mobile/utils/editor.utils.dart';
|
||||||
@@ -117,7 +118,9 @@ class _DriftEditImagePageState extends ConsumerState<DriftEditImagePage> with Ti
|
|||||||
bottom: false,
|
bottom: false,
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
Expanded(child: _EditorPreview(image: widget.image)),
|
Expanded(
|
||||||
|
child: ProgressiveImageGuard(child: _EditorPreview(image: widget.image)),
|
||||||
|
),
|
||||||
AnimatedSize(
|
AnimatedSize(
|
||||||
duration: const Duration(milliseconds: 250),
|
duration: const Duration(milliseconds: 250),
|
||||||
curve: Curves.easeInOut,
|
curve: Curves.easeInOut,
|
||||||
@@ -427,10 +430,12 @@ class _EditorPreviewState extends ConsumerState<_EditorPreview> with TickerProvi
|
|||||||
padding: const EdgeInsets.all(10),
|
padding: const EdgeInsets.all(10),
|
||||||
width: (editorState.rotationAngle % 180 == 0) ? baseWidth : baseHeight,
|
width: (editorState.rotationAngle % 180 == 0) ? baseWidth : baseHeight,
|
||||||
height: (editorState.rotationAngle % 180 == 0) ? baseHeight : baseWidth,
|
height: (editorState.rotationAngle % 180 == 0) ? baseHeight : baseWidth,
|
||||||
|
child: ProgressiveImageGuard(
|
||||||
child: CropImage(controller: cropController, image: widget.image, gridColor: Colors.white),
|
child: CropImage(controller: cropController, image: widget.image, gridColor: Colors.white),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import 'package:image_picker/image_picker.dart';
|
|||||||
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
|
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
|
||||||
import 'package:immich_mobile/extensions/build_context_extensions.dart';
|
import 'package:immich_mobile/extensions/build_context_extensions.dart';
|
||||||
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/progressive_image_guard.dart';
|
||||||
import 'package:immich_mobile/providers/auth.provider.dart';
|
import 'package:immich_mobile/providers/auth.provider.dart';
|
||||||
import 'package:immich_mobile/providers/backup/backup.provider.dart';
|
import 'package:immich_mobile/providers/backup/backup.provider.dart';
|
||||||
import 'package:immich_mobile/providers/upload_profile_image.provider.dart';
|
import 'package:immich_mobile/providers/upload_profile_image.provider.dart';
|
||||||
@@ -170,10 +171,12 @@ class _ProfilePictureCropPageState extends ConsumerState<ProfilePictureCropPage>
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
child: ClipRRect(
|
child: ClipRRect(
|
||||||
|
child: ProgressiveImageGuard(
|
||||||
child: CropImage(controller: _cropController, image: image, gridColor: Colors.white),
|
child: CropImage(controller: _cropController, image: image, gridColor: Colors.white),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
|
|||||||
import 'package:immich_mobile/entities/store.entity.dart';
|
import 'package:immich_mobile/entities/store.entity.dart';
|
||||||
import 'package:immich_mobile/extensions/platform_extensions.dart';
|
import 'package:immich_mobile/extensions/platform_extensions.dart';
|
||||||
import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
|
import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/progressive_image_guard.dart';
|
||||||
import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
|
import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
|
||||||
import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
|
import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
|
||||||
import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
|
import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
|
||||||
@@ -301,7 +302,8 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
|
|||||||
return IgnorePointer(
|
return IgnorePointer(
|
||||||
child: Stack(
|
child: Stack(
|
||||||
children: [
|
children: [
|
||||||
if (!_isVideoReady || widget.asset.isMotionPhoto || isCasting) Center(child: widget.image),
|
if (!_isVideoReady || widget.asset.isMotionPhoto || isCasting)
|
||||||
|
Center(child: ProgressiveImageGuard(child: widget.image)),
|
||||||
if (!isCasting) ...[
|
if (!isCasting) ...[
|
||||||
Visibility.maintain(
|
Visibility.maintain(
|
||||||
visible: _isVideoReady,
|
visible: _isVideoReady,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
|
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
|
||||||
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/progressive_image_guard.dart';
|
||||||
import 'package:immich_mobile/widgets/asset_grid/thumbnail_placeholder.dart';
|
import 'package:immich_mobile/widgets/asset_grid/thumbnail_placeholder.dart';
|
||||||
import 'package:octo_image/octo_image.dart';
|
import 'package:octo_image/octo_image.dart';
|
||||||
|
|
||||||
@@ -21,7 +22,8 @@ class FullImage extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final provider = getFullImageProvider(asset, size: size);
|
final provider = getFullImageProvider(asset, size: size);
|
||||||
return OctoImage(
|
return ProgressiveImageGuard(
|
||||||
|
child: OctoImage(
|
||||||
fadeInDuration: const Duration(milliseconds: 0),
|
fadeInDuration: const Duration(milliseconds: 0),
|
||||||
fadeOutDuration: const Duration(milliseconds: 100),
|
fadeOutDuration: const Duration(milliseconds: 100),
|
||||||
placeholderBuilder: placeholder != null ? (_) => placeholder! : null,
|
placeholderBuilder: placeholder != null ? (_) => placeholder! : null,
|
||||||
@@ -33,6 +35,7 @@ class FullImage extends StatelessWidget {
|
|||||||
provider.evict();
|
provider.evict();
|
||||||
return const Icon(Icons.image_not_supported_outlined, size: 32);
|
return const Icon(Icons.image_not_supported_outlined, size: 32);
|
||||||
},
|
},
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import 'package:flutter/widgets.dart';
|
||||||
|
|
||||||
|
/// Keeps progressive image streams delivering frames when the platform
|
||||||
|
/// requests reduced animations.
|
||||||
|
///
|
||||||
|
/// The full-image providers emit multiple, increasingly higher-quality images
|
||||||
|
/// (thumbnail -> preview -> original) as successive frames of a single image
|
||||||
|
/// stream. Since Flutter 3.44, [Image] stops listening to its stream after the
|
||||||
|
/// first frame when [MediaQueryData.disableAnimations] is set (e.g. Android's
|
||||||
|
/// "Remove animations" accessibility setting or an animator duration scale of
|
||||||
|
/// zero), which would freeze these images at their low-res first frame.
|
||||||
|
/// Photos are not animations, so clear the flag for this subtree.
|
||||||
|
class ProgressiveImageGuard extends StatelessWidget {
|
||||||
|
const ProgressiveImageGuard({required this.child, super.key});
|
||||||
|
|
||||||
|
final Widget child;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final disableAnimations = MediaQuery.maybeDisableAnimationsOf(context) ?? false;
|
||||||
|
if (!disableAnimations) {
|
||||||
|
return child;
|
||||||
|
}
|
||||||
|
return MediaQuery(data: MediaQuery.of(context).copyWith(disableAnimations: false), child: child);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,6 +10,7 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
|
|||||||
import 'package:immich_mobile/extensions/build_context_extensions.dart';
|
import 'package:immich_mobile/extensions/build_context_extensions.dart';
|
||||||
import 'package:immich_mobile/extensions/translate_extensions.dart';
|
import 'package:immich_mobile/extensions/translate_extensions.dart';
|
||||||
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/progressive_image_guard.dart';
|
||||||
import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
|
import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
|
||||||
import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
|
import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
|
||||||
|
|
||||||
@@ -404,6 +405,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with Tic
|
|||||||
if (_currentAsset != null)
|
if (_currentAsset != null)
|
||||||
Opacity(
|
Opacity(
|
||||||
opacity: _crossFadeAnimation.value,
|
opacity: _crossFadeAnimation.value,
|
||||||
|
child: ProgressiveImageGuard(
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
@@ -427,10 +429,12 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with Tic
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
|
||||||
if (_nextAsset != null)
|
if (_nextAsset != null)
|
||||||
Opacity(
|
Opacity(
|
||||||
opacity: 1.0 - _crossFadeAnimation.value,
|
opacity: 1.0 - _crossFadeAnimation.value,
|
||||||
|
child: ProgressiveImageGuard(
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
@@ -454,6 +458,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with Tic
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
|
|||||||
import 'package:immich_mobile/extensions/build_context_extensions.dart';
|
import 'package:immich_mobile/extensions/build_context_extensions.dart';
|
||||||
import 'package:immich_mobile/extensions/translate_extensions.dart';
|
import 'package:immich_mobile/extensions/translate_extensions.dart';
|
||||||
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/progressive_image_guard.dart';
|
||||||
import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
|
import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
|
||||||
import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
|
import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
|
||||||
import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
|
import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
|
||||||
@@ -507,6 +508,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with Tic
|
|||||||
if (_currentAsset != null)
|
if (_currentAsset != null)
|
||||||
Opacity(
|
Opacity(
|
||||||
opacity: _crossFadeAnimation.value,
|
opacity: _crossFadeAnimation.value,
|
||||||
|
child: ProgressiveImageGuard(
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
@@ -530,10 +532,12 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with Tic
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
|
||||||
if (_nextAsset != null)
|
if (_nextAsset != null)
|
||||||
Opacity(
|
Opacity(
|
||||||
opacity: 1.0 - _crossFadeAnimation.value,
|
opacity: 1.0 - _crossFadeAnimation.value,
|
||||||
|
child: ProgressiveImageGuard(
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
@@ -557,6 +561,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with Tic
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
|
|||||||
import 'package:immich_mobile/extensions/datetime_extensions.dart';
|
import 'package:immich_mobile/extensions/datetime_extensions.dart';
|
||||||
import 'package:immich_mobile/extensions/translate_extensions.dart';
|
import 'package:immich_mobile/extensions/translate_extensions.dart';
|
||||||
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/progressive_image_guard.dart';
|
||||||
import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
|
import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
|
||||||
import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
|
import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
|
||||||
import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
|
import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
|
||||||
@@ -483,6 +484,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with Tic
|
|||||||
if (_currentAsset != null)
|
if (_currentAsset != null)
|
||||||
Opacity(
|
Opacity(
|
||||||
opacity: _crossFadeAnimation.value,
|
opacity: _crossFadeAnimation.value,
|
||||||
|
child: ProgressiveImageGuard(
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
@@ -506,10 +508,12 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with Tic
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
|
||||||
if (_nextAsset != null)
|
if (_nextAsset != null)
|
||||||
Opacity(
|
Opacity(
|
||||||
opacity: 1.0 - _crossFadeAnimation.value,
|
opacity: 1.0 - _crossFadeAnimation.value,
|
||||||
|
child: ProgressiveImageGuard(
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
@@ -533,6 +537,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with Tic
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'package:flutter/widgets.dart';
|
import 'package:flutter/widgets.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/progressive_image_guard.dart';
|
||||||
import 'package:immich_mobile/widgets/photo_view/photo_view.dart'
|
import 'package:immich_mobile/widgets/photo_view/photo_view.dart'
|
||||||
show
|
show
|
||||||
PhotoViewScaleState,
|
PhotoViewScaleState,
|
||||||
@@ -438,7 +439,8 @@ class PhotoViewCoreState extends State<PhotoViewCore>
|
|||||||
height: scaleBoundaries.childSize.height * scale,
|
height: scaleBoundaries.childSize.height * scale,
|
||||||
child: widget.customChild!,
|
child: widget.customChild!,
|
||||||
)
|
)
|
||||||
: Image(
|
: ProgressiveImageGuard(
|
||||||
|
child: Image(
|
||||||
key: widget.heroAttributes?.tag != null ? ObjectKey(widget.heroAttributes!.tag) : null,
|
key: widget.heroAttributes?.tag != null ? ObjectKey(widget.heroAttributes!.tag) : null,
|
||||||
image: widget.imageProvider!,
|
image: widget.imageProvider!,
|
||||||
semanticLabel: widget.semanticLabel,
|
semanticLabel: widget.semanticLabel,
|
||||||
@@ -447,6 +449,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
|
|||||||
width: scaleBoundaries.childSize.width * scale,
|
width: scaleBoundaries.childSize.width * scale,
|
||||||
fit: BoxFit.contain,
|
fit: BoxFit.contain,
|
||||||
isAntiAlias: widget.filterQuality == FilterQuality.high,
|
isAntiAlias: widget.filterQuality == FilterQuality.high,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,296 @@
|
|||||||
|
// End-to-end tests for progressive image loading (thumbnail -> preview)
|
||||||
|
// through the real provider/completer pipeline with a mocked platform
|
||||||
|
// image API.
|
||||||
|
//
|
||||||
|
// The "animations are disabled" cases are regression tests for
|
||||||
|
// https://github.com/immich-app/immich/issues/29727: since Flutter 3.44,
|
||||||
|
// a paused Image widget stops listening to its stream after the first
|
||||||
|
// frame, freezing progressive images at the low-res thumbnail.
|
||||||
|
|
||||||
|
import 'dart:async';
|
||||||
|
import 'dart:ffi' hide Size;
|
||||||
|
import 'dart:ui' as ui;
|
||||||
|
|
||||||
|
import 'package:drift/drift.dart' hide isNull;
|
||||||
|
import 'package:drift/native.dart';
|
||||||
|
import 'package:ffi/ffi.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.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/infrastructure/repositories/db.repository.dart';
|
||||||
|
import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
|
||||||
|
import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
|
||||||
|
import 'package:immich_mobile/platform/remote_image_api.g.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/full_image.widget.dart';
|
||||||
|
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
|
||||||
|
import 'package:immich_mobile/utils/cache/custom_image_cache.dart';
|
||||||
|
import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
|
||||||
|
|
||||||
|
import '../../../test_utils.dart';
|
||||||
|
|
||||||
|
class _CustomCacheBinding extends AutomatedTestWidgetsFlutterBinding {
|
||||||
|
@override
|
||||||
|
ImageCache createImageCache() => CustomImageCache();
|
||||||
|
}
|
||||||
|
|
||||||
|
const kThumbSize = 16;
|
||||||
|
const kPreviewSize = 64;
|
||||||
|
const kOriginalSize = 128;
|
||||||
|
|
||||||
|
late Uint8List thumbPng;
|
||||||
|
late Uint8List previewPng;
|
||||||
|
late Uint8List originalPng;
|
||||||
|
|
||||||
|
final requestedUrls = <String>[];
|
||||||
|
|
||||||
|
Future<Uint8List> _pngBytes(int size) async {
|
||||||
|
final image = await createTestImage(width: size, height: size);
|
||||||
|
final data = await image.toByteData(format: ui.ImageByteFormat.png);
|
||||||
|
return data!.buffer.asUint8List();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _installRemoteImageApiMock() {
|
||||||
|
const channel = BasicMessageChannel<Object?>(
|
||||||
|
'dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage',
|
||||||
|
RemoteImageApi.pigeonChannelCodec,
|
||||||
|
);
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockDecodedMessageHandler<Object?>(channel, (
|
||||||
|
message,
|
||||||
|
) async {
|
||||||
|
final args = message as List<Object?>;
|
||||||
|
final url = args[0] as String;
|
||||||
|
requestedUrls.add(url);
|
||||||
|
|
||||||
|
final Uint8List bytes;
|
||||||
|
if (url.contains('size=thumbnail')) {
|
||||||
|
bytes = thumbPng;
|
||||||
|
} else if (url.contains('size=preview')) {
|
||||||
|
bytes = previewPng;
|
||||||
|
} else {
|
||||||
|
bytes = originalPng;
|
||||||
|
}
|
||||||
|
|
||||||
|
final pointer = malloc<Uint8>(bytes.length);
|
||||||
|
pointer.asTypedList(bytes.length).setAll(0, bytes);
|
||||||
|
return <Object?>[
|
||||||
|
{'pointer': pointer.address, 'length': bytes.length},
|
||||||
|
];
|
||||||
|
});
|
||||||
|
|
||||||
|
const cancelChannel = BasicMessageChannel<Object?>(
|
||||||
|
'dev.flutter.pigeon.immich_mobile.RemoteImageApi.cancelRequest',
|
||||||
|
RemoteImageApi.pigeonChannelCodec,
|
||||||
|
);
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockDecodedMessageHandler<Object?>(
|
||||||
|
cancelChannel,
|
||||||
|
(message) async => <Object?>[null],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _precacheThumbnail(WidgetTester tester, dynamic asset) async {
|
||||||
|
await tester.runAsync(() async {
|
||||||
|
final provider = getThumbnailImageProvider(asset)!;
|
||||||
|
final completer = Completer<void>();
|
||||||
|
final stream = provider.resolve(ImageConfiguration.empty);
|
||||||
|
final listener = ImageStreamListener((info, _) {
|
||||||
|
info.dispose();
|
||||||
|
if (!completer.isCompleted) {
|
||||||
|
completer.complete();
|
||||||
|
}
|
||||||
|
}, onError: (e, s) => completer.completeError(e, s));
|
||||||
|
stream.addListener(listener);
|
||||||
|
await completer.future;
|
||||||
|
stream.removeListener(listener);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _settle(WidgetTester tester) async {
|
||||||
|
for (int i = 0; i < 10; i++) {
|
||||||
|
await tester.runAsync(() => Future<void>.delayed(const Duration(milliseconds: 50)));
|
||||||
|
await tester.pump();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int? _renderedImageWidth(WidgetTester tester) {
|
||||||
|
final rawImages = tester.widgetList<RawImage>(find.byType(RawImage)).toList();
|
||||||
|
return rawImages.isEmpty ? null : rawImages.first.image?.width;
|
||||||
|
}
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
_CustomCacheBinding();
|
||||||
|
TestWidgetsFlutterBinding.ensureInitialized();
|
||||||
|
|
||||||
|
setUpAll(() async {
|
||||||
|
TestUtils.init();
|
||||||
|
final db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
|
||||||
|
await StoreService.init(storeRepository: DriftStoreRepository(db), listenUpdates: false);
|
||||||
|
await StoreService.I.put(StoreKey.serverEndpoint, 'http://localhost:3000');
|
||||||
|
await SettingsRepository.ensureInitialized(db);
|
||||||
|
});
|
||||||
|
|
||||||
|
setUp(() {
|
||||||
|
requestedUrls.clear();
|
||||||
|
_installRemoteImageApiMock();
|
||||||
|
imageCache.clear();
|
||||||
|
imageCache.clearLiveImages();
|
||||||
|
});
|
||||||
|
|
||||||
|
int assetCounter = 0;
|
||||||
|
|
||||||
|
Future<dynamic> setUpAsset(WidgetTester tester) async {
|
||||||
|
await tester.runAsync(() async {
|
||||||
|
thumbPng = await _pngBytes(kThumbSize);
|
||||||
|
previewPng = await _pngBytes(kPreviewSize);
|
||||||
|
originalPng = await _pngBytes(kOriginalSize);
|
||||||
|
});
|
||||||
|
return TestUtils.createRemoteAsset(id: 'asset-${++assetCounter}', width: 3000, height: 4000);
|
||||||
|
}
|
||||||
|
|
||||||
|
testWidgets('FullImage shows preview (thumbnail pre-cached by timeline)', (tester) async {
|
||||||
|
final asset = await setUpAsset(tester);
|
||||||
|
await _precacheThumbnail(tester, asset);
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: Center(
|
||||||
|
child: SizedBox(width: 400, height: 800, child: FullImage(asset, size: const Size(400, 800))),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await _settle(tester);
|
||||||
|
expect(_renderedImageWidth(tester), kPreviewSize, reason: 'stuck on thumbnail. URLs: $requestedUrls');
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('FullImage shows preview (thumbnail not cached)', (tester) async {
|
||||||
|
final asset = await setUpAsset(tester);
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: Center(
|
||||||
|
child: SizedBox(width: 400, height: 800, child: FullImage(asset, size: const Size(400, 800))),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await _settle(tester);
|
||||||
|
expect(_renderedImageWidth(tester), kPreviewSize, reason: 'stuck on thumbnail. URLs: $requestedUrls');
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('PhotoView shows preview (thumbnail pre-cached by timeline)', (tester) async {
|
||||||
|
final asset = await setUpAsset(tester);
|
||||||
|
await _precacheThumbnail(tester, asset);
|
||||||
|
|
||||||
|
final provider = getFullImageProvider(asset, size: const Size(400, 800));
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: PhotoView(
|
||||||
|
imageProvider: provider,
|
||||||
|
index: 0,
|
||||||
|
gaplessPlayback: true,
|
||||||
|
filterQuality: FilterQuality.high,
|
||||||
|
tightMode: true,
|
||||||
|
enablePanAlways: true,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await _settle(tester);
|
||||||
|
expect(_renderedImageWidth(tester), kPreviewSize, reason: 'stuck on thumbnail. URLs: $requestedUrls');
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('PhotoView shows preview (thumbnail not cached)', (tester) async {
|
||||||
|
final asset = await setUpAsset(tester);
|
||||||
|
|
||||||
|
final provider = getFullImageProvider(asset, size: const Size(400, 800));
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: PhotoView(
|
||||||
|
imageProvider: provider,
|
||||||
|
index: 0,
|
||||||
|
gaplessPlayback: true,
|
||||||
|
filterQuality: FilterQuality.high,
|
||||||
|
tightMode: true,
|
||||||
|
enablePanAlways: true,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await _settle(tester);
|
||||||
|
expect(_renderedImageWidth(tester), kPreviewSize, reason: 'stuck on thumbnail. URLs: $requestedUrls');
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('FullImage shows preview when animations are disabled (issue #29727)', (tester) async {
|
||||||
|
final asset = await setUpAsset(tester);
|
||||||
|
await _precacheThumbnail(tester, asset);
|
||||||
|
|
||||||
|
// Android "remove animations" / animator duration scale 0 sets
|
||||||
|
// MediaQuery.disableAnimations, which pauses Image stream listening
|
||||||
|
// after the first frame on Flutter 3.44+.
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: MediaQuery(
|
||||||
|
data: const MediaQueryData(disableAnimations: true),
|
||||||
|
child: Center(
|
||||||
|
child: SizedBox(width: 400, height: 800, child: FullImage(asset, size: const Size(400, 800))),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await _settle(tester);
|
||||||
|
expect(_renderedImageWidth(tester), kPreviewSize, reason: 'stuck on thumbnail. URLs: $requestedUrls');
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('PhotoView shows preview when animations are disabled (issue #29727)', (tester) async {
|
||||||
|
final asset = await setUpAsset(tester);
|
||||||
|
await _precacheThumbnail(tester, asset);
|
||||||
|
|
||||||
|
final provider = getFullImageProvider(asset, size: const Size(400, 800));
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: MediaQuery(
|
||||||
|
data: const MediaQueryData(disableAnimations: true),
|
||||||
|
child: PhotoView(
|
||||||
|
imageProvider: provider,
|
||||||
|
index: 0,
|
||||||
|
gaplessPlayback: true,
|
||||||
|
filterQuality: FilterQuality.high,
|
||||||
|
tightMode: true,
|
||||||
|
enablePanAlways: true,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await _settle(tester);
|
||||||
|
expect(_renderedImageWidth(tester), kPreviewSize, reason: 'stuck on thumbnail. URLs: $requestedUrls');
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('memory page pattern: precacheImage then FullImage', (tester) async {
|
||||||
|
final asset = await setUpAsset(tester);
|
||||||
|
await _precacheThumbnail(tester, asset);
|
||||||
|
|
||||||
|
// The memory page precaches the full image provider before showing the card.
|
||||||
|
await tester.pumpWidget(MaterialApp(home: Builder(builder: (context) => const SizedBox())));
|
||||||
|
final context = tester.element(find.byType(SizedBox));
|
||||||
|
final precacheFuture = precacheImage(getFullImageProvider(asset, size: const Size(400, 800)), context);
|
||||||
|
await tester.pump();
|
||||||
|
await tester.runAsync(() => precacheFuture);
|
||||||
|
// Post-frame callback removes the precache listener.
|
||||||
|
await tester.pump();
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: Center(
|
||||||
|
child: SizedBox(width: 400, height: 800, child: FullImage(asset, size: const Size(400, 800))),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await _settle(tester);
|
||||||
|
expect(_renderedImageWidth(tester), kPreviewSize, reason: 'stuck on thumbnail. URLs: $requestedUrls');
|
||||||
|
});
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user