Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] Merge latest album header updates from main

r4khula6232f82fa95
diff --cc mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart
index 831b990b99,e9e10ceded..8da9b270a0
--- a/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart
+++ b/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart
@@@ -1,15 -1,14 +1,17 @@@
+import "dart:async";
import "dart:convert";
import "dart:io";
+import "dart:typed_data";
+ import "dart:ui" as ui;
import "package:dio/dio.dart";
import "package:ente_components/ente_components.dart";
import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
+import "package:ente_ui/components/loading_widget.dart";
import "package:figma_squircle/figma_squircle.dart";
import "package:flutter/material.dart";
+ import "package:flutter/rendering.dart";
import "package:flutter/services.dart";
import "package:flutter_secure_storage/flutter_secure_storage.dart";
import "package:flutter_test/flutter_test.dart";
@@@ -55,7 -43,7 +57,8 @@@ import "package:photos/ui/components/bo
import "package:photos/ui/viewer/actions/file_selection_overlay_bar.dart";
import "package:photos/ui/viewer/gallery/collection_page.dart";
import "package:photos/ui/viewer/gallery/component/album_cover_app_bar.dart";
+import "package:photos/ui/viewer/gallery/component/gallery_file_widget.dart";
+ import "package:photos/ui/viewer/gallery/component/group/group_header_widget.dart";
import "package:photos/ui/viewer/gallery/gallery.dart";
import "package:photos/ui/viewer/gallery/gallery_app_bar_widget.dart";
import "package:photos/ui/viewer/gallery/state/gallery_boundaries_provider.dart";
@@@ -164,65 -147,71 +167,130 @@@ void main()
expect(find.text("Open album"), findsOneWidget);
});
+ testWidgets("paints the pinned date flush with the album app bar", (
+ tester,
+ ) async {
+ const pixelRatio = 2.8125;
+ tester.view.devicePixelRatio = pixelRatio;
+ tester.view.physicalSize = const Size(1080, 2340);
+ tester.view.padding = const FakeViewPadding(top: 95, bottom: 135);
+ addTearDown(tester.view.reset);
+ final files = List.generate(100, (index) => _file(index + 1));
+ await tester.runAsync(() => FilesDB.instance.insertMultiple(files));
+ final boundaryKey = GlobalKey();
+ await tester.pumpWidget(
+ RepaintBoundary(
+ key: boundaryKey,
+ child: MaterialApp(
+ theme: darkThemeData,
+ localizationsDelegates: StringsLocalizations.localizationsDelegates,
+ supportedLocales: StringsLocalizations.supportedLocales,
+ home: CollectionPage(
+ CollectionWithThumbnail(_collection(), files.last),
+ ),
+ ),
+ ),
+ );
+ await _expectCover(tester, files.last, count: files.length);
+ final pinned = tester.widget<PinnedGroupHeader>(
+ find.byType(PinnedGroupHeader),
+ );
+ pinned.scrollController.jumpTo(pinned.scrollOffsetBase + 80);
+ await tester.pumpAndSettle();
+ final header = find.byWidgetPredicate(
+ (widget) => widget is GroupHeaderWidget && widget.isPinnedHeader,
+ );
+ expect(header, findsOneWidget);
+ final top = tester.getTopLeft(header).dy * pixelRatio;
+ final background = GalleryAppBarWidget.backgroundColor(
+ tester.element(header),
+ );
+ final boundary =
+ boundaryKey.currentContext!.findRenderObject()!
+ as RenderRepaintBoundary;
+ final image = (await tester.runAsync(
+ () => boundary.toImage(pixelRatio: pixelRatio),
+ ))!;
+ addTearDown(image.dispose);
+ final pixels = (await tester.runAsync(
+ () => image.toByteData(format: ui.ImageByteFormat.rawRgba),
+ ))!;
+ final backgroundArgb = background.toARGB32();
+ for (var y = top.floor() - 1; y <= top.ceil(); y++) {
+ final offset = (y * image.width + 4) * 4;
+ expect(
+ pixels.buffer.asUint8List(offset, 3),
+ [
+ (backgroundArgb >> 16) & 0xff,
+ (backgroundArgb >> 8) & 0xff,
+ backgroundArgb & 0xff,
+ ],
+ reason:
+ "The album/date boundary must hide the photos at physical row $y",
+ );
+ }
+ await _disposeAlbum(tester);
+ });
+
+ testWidgets("lets a short album fully collapse its cover", (tester) async {
+ tester.view.devicePixelRatio = 1;
+ tester.view.physicalSize = const Size(402, 874);
+ addTearDown(tester.view.resetDevicePixelRatio);
+ addTearDown(tester.view.resetPhysicalSize);
+ final previousLayout = localSettings.getGalleryLayoutType();
+ final previousGridSize = localSettings.getPhotoGridSize();
+ addTearDown(() async {
+ await localSettings.setGalleryLayoutType(previousLayout);
+ await localSettings.setPhotoGridSize(previousGridSize);
+ });
+ await localSettings.setGalleryLayoutType(GalleryLayoutType.justified);
+ await localSettings.setPhotoGridSize(5);
+ final collection = _collection();
+ final cover = _file(1)..pubMmdEncodedJson = '{"w":400,"h":600}';
+ await tester.runAsync(() async {
+ await FilesDB.instance.insertMultiple([cover]);
+ await CollectionsService.instance.getCover(collection);
+ });
+ await _pumpAlbum(tester, collection);
+ await _expectCover(tester, cover, count: 1);
+ final boundaries = tester.state<GalleryBoundariesProviderState>(
+ find.byType(GalleryBoundariesProvider),
+ );
+ final position = boundaries.scrollControllerNotifier.value!.position;
+ final header = tester.widget<AlbumCoverAppBar>(
+ find.byType(AlbumCoverAppBar),
+ );
+ final geometry = AlbumCoverAppBar.resolveGeometry(
+ tester.element(find.byType(AlbumCoverAppBar)),
+ collapsedHeight: header.collapsedHeight,
+ bottomHeight: header.bottom?.preferredSize.height ?? 0,
+ );
+ expect(position.maxScrollExtent, closeTo(geometry.collapseExtent, 0.01));
+ await tester.drag(find.byType(CustomScrollView), const Offset(0, -160));
+ await tester.pumpAndSettle();
+ expect(position.pixels, closeTo(geometry.collapseExtent, 0.01));
+ final tileRect = tester.getRect(find.byType(GalleryFileWidget));
+ final first = await tester.startGesture(
+ tileRect.center - const Offset(30, 0),
+ pointer: 1,
+ );
+ final second = await tester.startGesture(
+ tileRect.center + const Offset(30, 0),
+ pointer: 2,
+ );
+ await tester.pump();
+ expect(
+ tester.getRect(find.byKey(const ValueKey(("gallery-grid-zoom-tile", 0)))),
+ tileRect,
+ );
+ await second.up();
+ await first.up();
+ await tester.pumpAndSettle();
+ expect(position.pixels, closeTo(geometry.collapseExtent, 0.01));
+ expect(tester.takeException(), isNull);
+ await _disposeAlbum(tester);
+ });
+
testWidgets("uses a pending local photo and excludes ignored photos", (
tester,
) async {