Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mob][photos] Preserve anchors below pinned gallery headers

ashil-pilot52c1435fb67e
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart b/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
index 2f5e9bc523..24143c9f0d 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
@@ -416,15 +416,17 @@ class GalleryState extends State<Gallery> {
final sectionScrollOffset =
_scrollController.offset - appBarCollapseExtent - _headerHeight;
if (sectionScrollOffset < 0) return null;
- final file = groups.getFileAtScrollOffset(sectionScrollOffset);
+ final anchorSectionOffset =
+ sectionScrollOffset + _pinnedGroupHeaderExtent(groups);
+ final file = groups.getFileAtScrollOffset(anchorSectionOffset);
if (file == null) return null;
final geometry = groups.getGeometryOfFile(file);
if (geometry == null) return null;
- final inHeader = sectionScrollOffset < geometry.rowOffset;
+ final inHeader = anchorSectionOffset < geometry.rowOffset;
final offset = inHeader
- ? geometry.rowOffset - sectionScrollOffset
- : sectionScrollOffset - geometry.rowOffset;
+ ? geometry.rowOffset - anchorSectionOffset
+ : anchorSectionOffset - geometry.rowOffset;
final extent = inHeader ? geometry.headerExtent : geometry.rowExtent;
final progress = extent > 0 && extent.isFinite
? (offset / extent).clamp(0.0, 1.0).toDouble()
@@ -440,7 +442,9 @@ class GalleryState extends State<Gallery> {
_scrollController.positions.length != 1) {
return;
}
- final geometry = galleryGroups?.getGeometryOfFile(anchor.file);
+ final groups = galleryGroups;
+ if (groups == null) return;
+ final geometry = groups.getGeometryOfFile(anchor.file);
if (geometry == null) return;
final appBarCollapseExtent =
widget.appBar?.resolveGeometry(context).collapseExtent ?? 0;
@@ -450,9 +454,11 @@ class GalleryState extends State<Gallery> {
final rowPenetration = (geometry.rowExtent * anchor.progress)
.clamp(0.0, maxRowPenetration)
.toDouble();
- final sectionOffset = anchor.inHeader
+ final anchorSectionOffset = anchor.inHeader
? geometry.rowOffset - geometry.headerExtent * anchor.progress
: geometry.rowOffset + rowPenetration;
+ final sectionOffset =
+ anchorSectionOffset - _pinnedGroupHeaderExtent(groups);
final targetOffset =
_scrollOffsetForSectionOffset(
sectionOffset,
@@ -465,6 +471,13 @@ class GalleryState extends State<Gallery> {
});
}
+ double _pinnedGroupHeaderExtent(GalleryGroups groups) {
+ return groups.groupType.showGroupHeader() &&
+ !widget.disablePinnedGroupHeader
+ ? groups.groupHeaderExtent
+ : 0;
+ }
+
Future<double> _measureGroupHeaderExtent() async {
if (!_groupType.showGroupHeader()) return GalleryGroups.spacing;
final size = await getIntrinsicSizeOfWidget(
diff --git a/mobile/apps/photos/test/ui/viewer/gallery/gallery_layout_changed_event_test.dart b/mobile/apps/photos/test/ui/viewer/gallery/gallery_layout_changed_event_test.dart
index d444124ff7..de30ed8d98 100644
--- a/mobile/apps/photos/test/ui/viewer/gallery/gallery_layout_changed_event_test.dart
+++ b/mobile/apps/photos/test/ui/viewer/gallery/gallery_layout_changed_event_test.dart
@@ -14,6 +14,8 @@ import "package:photos/models/file_load_result.dart";
import "package:photos/models/metadata/file_magic.dart";
import "package:photos/service_locator.dart";
import "package:photos/settings/local_settings.dart";
+import "package:photos/ui/viewer/gallery/component/group/group_header_widget.dart";
+import "package:photos/ui/viewer/gallery/component/group/type.dart";
import "package:photos/ui/viewer/gallery/gallery.dart";
import "package:photos/ui/viewer/gallery/state/gallery_boundaries_provider.dart";
import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";
@@ -232,6 +234,95 @@ void main() {
await localSettings.setGalleryLayoutType(GalleryLayoutType.grid);
await localSettings.setPhotoGridSize(4);
});
+
+ testWidgets(
+ "a grouped layout change preserves progress below the pinned header",
+ (tester) async {
+ await localSettings.setGalleryLayoutType(GalleryLayoutType.grid);
+ await localSettings.setPhotoGridSize(6);
+ final galleryKey = GlobalKey<GalleryState>();
+ final files = List<EnteFile>.generate(180, _justifiedTestFile);
+
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: lightThemeData,
+ localizationsDelegates: StringsLocalizations.localizationsDelegates,
+ supportedLocales: StringsLocalizations.supportedLocales,
+ home: Scaffold(
+ body: _galleryHost(
+ Gallery(
+ key: galleryKey,
+ asyncLoader: (start, end, {limit, asc}) async =>
+ FileLoadResult(files, false),
+ tagPrefix: "pinned_anchor_",
+ groupType: GroupType.month,
+ limitSelectionToOne: true,
+ showSelectAll: false,
+ ),
+ ),
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+ await tester.pump(const Duration(milliseconds: 750));
+ await tester.pump();
+
+ final oldGroups = galleryKey.currentState!.galleryGroups!;
+ final anchorFile = files[120];
+ final oldGeometry = oldGroups.getGeometryOfFile(anchorFile)!;
+ const rowProgress = 0.35;
+ final oldAnchorOffset =
+ oldGeometry.rowOffset +
+ oldGeometry.rowExtent * rowProgress -
+ oldGroups.groupHeaderExtent;
+ final scrollableFinder = find.descendant(
+ of: find.byType(CustomScrollView),
+ matching: find.byType(Scrollable),
+ );
+ expect(scrollableFinder, findsOneWidget);
+ final scrollPosition = tester
+ .state<ScrollableState>(scrollableFinder)
+ .position;
+ scrollPosition.jumpTo(oldAnchorOffset);
+ await tester.pump();
+
+ expect(
+ find.byWidgetPredicate(
+ (widget) => widget is GroupHeaderWidget && widget.isPinnedHeader,
+ ),
+ findsOneWidget,
+ );
+ expect(
+ oldGroups.getFileAtScrollOffset(
+ scrollPosition.pixels + oldGroups.groupHeaderExtent,
+ ),
+ same(anchorFile),
+ );
+
+ await localSettings.setPhotoGridSize(2);
+ Bus.instance.fire(GalleryLayoutChangedEvent());
+ await tester.pumpAndSettle();
+
+ final newGroups = galleryKey.currentState!.galleryGroups!;
+ final newGeometry = newGroups.getGeometryOfFile(anchorFile)!;
+ final expectedAnchorOffset =
+ newGeometry.rowOffset +
+ newGeometry.rowExtent * rowProgress -
+ newGroups.groupHeaderExtent;
+ expect(newGroups.groupHeaderExtent, isNot(oldGroups.groupHeaderExtent));
+ expect(scrollPosition.pixels, closeTo(expectedAnchorOffset, 0.001));
+ expect(
+ newGroups.getFileAtScrollOffset(
+ scrollPosition.pixels + newGroups.groupHeaderExtent,
+ ),
+ same(anchorFile),
+ );
+
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pump(const Duration(milliseconds: 100));
+ await localSettings.setPhotoGridSize(4);
+ },
+ );
}
Widget _galleryHost(Gallery gallery) {