Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mob][photos] Fix gallery filmstrip lint failures

ashil-pilote673a7029064
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip.dart b/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip.dart
index d51cc093cc..d2fa87bca3 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip.dart
@@ -2,6 +2,7 @@ import "dart:async";
import "dart:math";
import "package:flutter/material.dart";
+import "package:flutter/rendering.dart" show ScrollCacheExtent;
import "package:flutter/services.dart";
import "package:photos/ui/viewer/file/file_viewer_filmstrip_event.dart";
import "package:photos/ui/viewer/file/file_viewer_filmstrip_physics.dart";
@@ -127,7 +128,9 @@ class _FileViewerFilmstripState extends State<FileViewerFilmstrip> {
padding: EdgeInsets.symmetric(
horizontal: horizontalPadding,
),
- cacheExtent: _itemExtent * _cacheExtentInItems,
+ scrollCacheExtent: ScrollCacheExtent.pixels(
+ _itemExtent * _cacheExtentInItems,
+ ),
addAutomaticKeepAlives: false,
addSemanticIndexes: false,
itemBuilder: (context, index) => _buildItem(context, index),
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_coordinator.dart b/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_coordinator.dart
index adbf567629..9d7cae43a1 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_coordinator.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_coordinator.dart
@@ -8,15 +8,15 @@ typedef FileViewerFilmstripIdentityAt = Object? Function(int index);
typedef FileViewerFilmstripImmediatePageJump = bool Function(int index);
-/// Runs [callback] after a guaranteed future frame's paint phase.
+// Runs [callback] after a guaranteed future frame's paint phase.
typedef FileViewerFilmstripPaintScheduler =
void Function(VoidCallback callback);
-/// A user scroll session starts with the drag and remains active through any
-/// ballistic coast. During that session, [previewIndex] exposes the centered
-/// thumbnail when it differs from the committed page. On commit, the preview
-/// stays visible until the destination page has had a guaranteed future paint
-/// opportunity.
+// A user scroll session starts with the drag and remains active through any
+// ballistic coast. During that session, [previewIndex] exposes the centered
+// thumbnail when it differs from the committed page. On commit, the preview
+// stays visible until the destination page has had a guaranteed future paint
+// opportunity.
class FileViewerFilmstripCoordinator {
final FileViewerFilmstripCurrentIndex _currentIndex;
final FileViewerFilmstripIdentityAt _identityAt;
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_event.dart b/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_event.dart
index 2ea3d6ec43..50dff2c4c5 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_event.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_event.dart
@@ -2,9 +2,9 @@ import "package:flutter/foundation.dart";
enum FileViewerFilmstripEventType { tap, scrubStart, scrubPreview, scrubCommit }
-/// Scrub start and commit are lifecycle events, so they are emitted even when
-/// [index] has not changed. Preview and tap events identify a newly focused
-/// item.
+// Scrub start and commit are lifecycle events, so they are emitted even when
+// [index] has not changed. Preview and tap events identify a newly focused
+// item.
typedef FileViewerFilmstripEvent = ({
int index,
FileViewerFilmstripEventType type,
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_preview_layer.dart b/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_preview_layer.dart
index 241c309f64..45c99c5a82 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_preview_layer.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_viewer_filmstrip_preview_layer.dart
@@ -8,7 +8,6 @@ const fileViewerFilmstripPreviewKey = ValueKey<String>(
typedef FileViewerFilmstripPreviewBuilder =
Widget Function(BuildContext context, int index);
-/// This widget returns [Positioned.fill], so its parent must be a [Stack].
class FileViewerFilmstripPreviewLayer extends StatelessWidget {
final ValueListenable<int?> previewIndex;
final FileViewerFilmstripPreviewBuilder itemBuilder;
diff --git a/mobile/apps/photos/lib/ui/viewer/file/gallery_file_viewer_filmstrip.dart b/mobile/apps/photos/lib/ui/viewer/file/gallery_file_viewer_filmstrip.dart
index 018aaaabad..bd5be764e9 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/gallery_file_viewer_filmstrip.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/gallery_file_viewer_filmstrip.dart
@@ -25,7 +25,6 @@ bool shouldShowGalleryFileViewerFilmstrip({
required int itemCount,
}) => isEnabled && !isMinimalistic && !isGuestView && itemCount > 1;
-/// This widget returns [Positioned.fill], so its parent must be a [Stack].
class GalleryFileViewerFilmstripPreviewLayer extends StatelessWidget {
final List<EnteFile> files;
final ValueListenable<int?> previewIndex;
@@ -74,7 +73,6 @@ class GalleryFileViewerFilmstripPreviewLayer extends StatelessWidget {
}
}
-/// This widget returns [Positioned], so its parent must be a [Stack].
class GalleryFileViewerFilmstripOverlay extends StatelessWidget {
final List<EnteFile> files;
final int selectedIndex;
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_stream_change.dart b/mobile/apps/photos/lib/ui/viewer/file/video_stream_change.dart
index b3edf55c81..18fe4c3cbf 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_stream_change.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_stream_change.dart
@@ -32,10 +32,10 @@ class VideoStreamChangeState {
}
}
-/// Publishes the stream action owned by the video player to viewer chrome.
-///
-/// The owner token prevents a retiring player from clearing a newer player's
-/// action when Flutter replaces a page during navigation or file removal.
+// Publishes the stream action owned by the video player to viewer chrome.
+//
+// The owner token prevents a retiring player from clearing a newer player's
+// action when Flutter replaces a page during navigation or file removal.
class VideoStreamChangeController
extends ValueNotifier<VideoStreamChangeState?> {
VideoStreamChangeController() : super(null);