Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] Restore gallery header initialization

r4khul1a62596b8506
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart b/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
index b4bb73fedd..79c075a004 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
@@ -170,6 +170,7 @@ class GalleryState extends State<Gallery> {
final _scrollController = ScrollController();
final _headerKey = GlobalKey();
final _headerHeightNotifier = ValueNotifier<double?>(null);
+ Timer? _headerHeightRetryTimer;
final scrollBarInUseNotifier = ValueNotifier<bool>(false);
late GroupType _groupType;
final scrollbarBottomPaddingNotifier = ValueNotifier<double>(0);
@@ -329,9 +330,9 @@ class GalleryState extends State<Gallery> {
}
WidgetsBinding.instance.addPostFrameCallback((_) {
- if (mounted) {
- _selectedFilesListener();
- }
+ if (!mounted) return;
+ _selectedFilesListener();
+ _measureHeaderHeight();
});
widget.selectedFiles?.addListener(_selectedFilesListener);
@@ -759,6 +760,7 @@ class GalleryState extends State<Gallery> {
_priorityDebouncer.cancelDebounceTimer();
_scrollController.dispose();
scrollBarInUseNotifier.dispose();
+ _headerHeightRetryTimer?.cancel();
_headerHeightNotifier.dispose();
widget.selectedFiles?.removeListener(_selectedFilesListener);
scrollbarBottomPaddingNotifier.dispose();
@@ -767,6 +769,24 @@ class GalleryState extends State<Gallery> {
super.dispose();
}
+ void _measureHeaderHeight() {
+ if (!mounted) return;
+ try {
+ final renderBox = _headerKey.currentContext?.findRenderObject();
+ if (renderBox is! RenderBox || !renderBox.hasSize) {
+ _headerHeightRetryTimer = Timer(
+ const Duration(milliseconds: 750),
+ _measureHeaderHeight,
+ );
+ return;
+ }
+ _headerHeightNotifier.value = renderBox.size.height;
+ } catch (e, s) {
+ _logger.warning("Error getting renderBox offset", e, s);
+ }
+ if (mounted) setState(() {});
+ }
+
double get _headerHeight {
final cachedHeight = _headerHeightNotifier.value;
if (cachedHeight != null) {
@@ -926,16 +946,6 @@ class GalleryState extends State<Gallery> {
});
}
- if (_headerHeightNotifier.value == null && _allGalleryFiles.isNotEmpty) {
- WidgetsBinding.instance.addPostFrameCallback((_) {
- if (!mounted) return;
- final renderBox = _headerKey.currentContext?.findRenderObject();
- if (renderBox is RenderBox && renderBox.hasSize) {
- _headerHeightNotifier.value = renderBox.size.height;
- }
- });
- }
-
return SwipeSelectionWrapper(
isEnabled: shouldEnableSwipeSelection && !widget.disableSelection,
swipeHelper: _swipeHelper,
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 7bb8e7a4b8..832512bffc 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
@@ -1,3 +1,5 @@
+import "dart:async";
+
import "package:dio/dio.dart";
import "package:ente_components/ente_components.dart";
import "package:ente_strings/ente_strings.dart";
@@ -119,6 +121,54 @@ void main() {
await tester.pumpAndSettle();
});
+ testWidgets(
+ "retries late headers, refreshes pinned dates immediately and stops on disposal",
+ (tester) async {
+ final pinnedHeader = find.byWidgetPredicate(
+ (widget) => widget is GroupHeaderWidget && widget.isPinnedHeader,
+ );
+ for (final disposeWhileLoading in [false, true]) {
+ final load = Completer<FileLoadResult>();
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: lightThemeData,
+ localizationsDelegates: StringsLocalizations.localizationsDelegates,
+ supportedLocales: StringsLocalizations.supportedLocales,
+ home: _galleryHost(
+ Gallery(
+ asyncLoader: (start, end, {limit, asc}) => load.future,
+ tagPrefix: "late_header",
+ groupType: GroupType.day,
+ header: const SizedBox(height: 80),
+ loadingWidget: const SizedBox.shrink(),
+ ),
+ ),
+ ),
+ );
+ await tester.pump(const Duration(milliseconds: 750));
+ if (!disposeWhileLoading) {
+ load.complete(
+ FileLoadResult(List.generate(100, _justifiedTestFile), false),
+ );
+ await tester.pumpAndSettle();
+ final pinned = tester.widget<PinnedGroupHeader>(
+ find.byType(PinnedGroupHeader),
+ );
+ expect(pinned.headerHeightNotifier.value, isNull);
+ pinned.scrollController.jumpTo(160);
+ await tester.pump();
+ expect(pinnedHeader, findsNothing);
+ await tester.pump(const Duration(milliseconds: 750));
+ expect(pinned.headerHeightNotifier.value, 80);
+ expect(pinnedHeader, findsOneWidget);
+ }
+ await tester.pumpWidget(const SizedBox.shrink());
+ await tester.pump(const Duration(seconds: 1));
+ expect(tester.takeException(), isNull);
+ }
+ },
+ );
+
testWidgets("Flex remains unavailable when internal features are disabled", (
tester,
) async {