Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

fix(photos): isolate zoom gestures in embedded viewers

ashil-pilotf326709baeeb
diff --git a/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart b/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart
index bc125a3f4f..7223c6fc78 100644
--- a/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart
@@ -32,6 +32,7 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>
late final List<SmartMemory> _memories;
late final int _initialPageIndex;
late int _activePageIndex;
+ bool _isMediaInteractionLocked = false;
@override
void initState() {
@@ -59,12 +60,17 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>
color: backgroundColorDark,
child: PageView.builder(
controller: pageController,
- physics: const BouncingScrollPhysics(),
+ physics: _isMediaInteractionLocked
+ ? const NeverScrollableScrollPhysics()
+ : const BouncingScrollPhysics(),
hitTestBehavior: HitTestBehavior.translucent,
itemCount: _memories.length,
onPageChanged: (index) {
Bus.instance.fire(PauseVideoEvent());
- setState(() => _activePageIndex = index);
+ setState(() {
+ _activePageIndex = index;
+ _isMediaInteractionLocked = false;
+ });
},
itemBuilder: (context, index) {
final smartMemory = _memories[index];
@@ -77,6 +83,13 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>
initialMemoryIndex,
memoryID: smartMemory.id,
isActive: index == _activePageIndex,
+ onMediaInteractionLockChanged: (isLocked) {
+ if (index != _activePageIndex ||
+ _isMediaInteractionLocked == isLocked) {
+ return;
+ }
+ setState(() => _isMediaInteractionLocked = isLocked);
+ },
onNextMemory: index < _memories.length - 1
? () => pageController.nextPage(
duration: const Duration(milliseconds: 675),
diff --git a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
index e7aa1f16b5..773cbc163b 100644
--- a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
@@ -319,6 +319,7 @@ class FullScreenMemory extends StatefulWidget {
final bool isActive;
final VoidCallback? onNextMemory;
final VoidCallback? onPreviousMemory;
+ final ValueChanged<bool>? onMediaInteractionLockChanged;
const FullScreenMemory(
this.title,
@@ -327,6 +328,7 @@ class FullScreenMemory extends StatefulWidget {
required this.isActive,
this.onNextMemory,
this.onPreviousMemory,
+ this.onMediaInteractionLockChanged,
super.key,
});
@@ -798,6 +800,9 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
isAudioMutedOverride: memoryMusicController?.isMuted,
shouldDisableScroll: (isZoomed) {
_isMediaZoomed = isZoomed;
+ widget.onMediaInteractionLockChanged?.call(
+ isZoomed,
+ );
},
playbackCallback: (shouldEnable, _) {
final activeIndex = _clampedMemoryIndex(
diff --git a/mobile/apps/photos/lib/ui/tools/collage/collage_item_widget.dart b/mobile/apps/photos/lib/ui/tools/collage/collage_item_widget.dart
index ce5c306d33..31579e9c92 100644
--- a/mobile/apps/photos/lib/ui/tools/collage/collage_item_widget.dart
+++ b/mobile/apps/photos/lib/ui/tools/collage/collage_item_widget.dart
@@ -40,6 +40,7 @@ class CollageItemWidget extends StatelessWidget {
),
tagPrefix: "collage_",
shouldCover: true,
+ enableVerticalSwipeActions: false,
),
),
if (shouldShowOutline)
diff --git a/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart b/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart
index 7af15cd786..d7d1ad1bbf 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart
@@ -37,6 +37,7 @@ class ZoomableImage extends StatefulWidget {
final bool shouldCover;
final bool isGuestView;
final bool isFromMemories;
+ final bool enableVerticalSwipeActions;
final Function({required int memoryDuration})? onFinalFileLoad;
final ValueChanged<File>? onFinalImageLoaded;
@@ -49,6 +50,7 @@ class ZoomableImage extends StatefulWidget {
this.shouldCover = false,
this.isGuestView = false,
this.isFromMemories = false,
+ this.enableVerticalSwipeActions = true,
this.onFinalFileLoad,
this.onFinalImageLoaded,
});
@@ -237,7 +239,9 @@ class _ZoomableImageState extends State<ZoomableImage> {
}
final GestureDragUpdateCallback? verticalDragCallback =
- _interactionLocked || widget.isGuestView
+ _interactionLocked ||
+ widget.isGuestView ||
+ !widget.enableVerticalSwipeActions
? null
: (d) => {
if (!_isZooming)