π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Gate gallery filmstrip for internal users
ashil-pilotdc82b1a0f130
diff --git a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dartindex 640ad24fe1..3eda6026e0 100644--- a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart@@ -132,6 +132,7 @@ class _DetailPageState extends State<DetailPage> {super.initState();_bottomControlsAdditionalInsetNotifier.value =shouldShowGalleryFileViewerFilmstrip(+ isFeatureEnabled: isGalleryFileViewerFilmstripEnabled,isEnabled: widget.config.showGalleryFilmstrip,isMinimalistic: widget.config.mode == DetailPageMode.minimalistic,isGuestView: false,@@ -843,6 +844,7 @@ class _BodyState extends State<_Body> {EnteFile? get _selectedFile => _fileAt(_selectedIndexNotifier.value);bool get _shouldShowFilmstrip => shouldShowGalleryFileViewerFilmstrip(+ isFeatureEnabled: isGalleryFileViewerFilmstripEnabled,isEnabled: widget.config.showGalleryFilmstrip,isMinimalistic: widget.config.mode == DetailPageMode.minimalistic,isGuestView: isGuestView,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.dartindex 079c6f6b8e..b3fb3e625b 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@@ -4,6 +4,7 @@ import "package:flutter/material.dart";import "package:photos/core/constants.dart";import "package:photos/models/file/file.dart";import "package:photos/models/file/file_type.dart";+import "package:photos/service_locator.dart";import "package:photos/ui/viewer/file/file_viewer_filmstrip.dart";import "package:photos/ui/viewer/file/file_viewer_filmstrip_event.dart";import "package:photos/ui/viewer/file/file_viewer_filmstrip_preview_layer.dart";@@ -17,13 +18,22 @@ abstract final class GalleryFileViewerFilmstripLayout {FileViewerFilmstripLayout.height + bottomControlsGap + upperContentGap;}+/// Keeps the filmstrip limited to internal users while it is being evaluated.+bool get isGalleryFileViewerFilmstripEnabled => flagService.internalUser;+/// Whether the gallery-specific viewer may expose its neighboring files.bool shouldShowGalleryFileViewerFilmstrip({+ required bool isFeatureEnabled,required bool isEnabled,required bool isMinimalistic,required bool isGuestView,required int itemCount,-}) => isEnabled && !isMinimalistic && !isGuestView && itemCount > 1;+}) =>+ isFeatureEnabled &&+ isEnabled &&+ !isMinimalistic &&+ !isGuestView &&+ itemCount > 1;/// Renders the opaque, lightweight gallery thumbnail used while scrubbing.///diff --git a/mobile/apps/photos/test/ui/viewer/file/detail_page_configuration_test.dart b/mobile/apps/photos/test/ui/viewer/file/detail_page_configuration_test.dartindex e85160401a..63f0102e8e 100644--- a/mobile/apps/photos/test/ui/viewer/file/detail_page_configuration_test.dart+++ b/mobile/apps/photos/test/ui/viewer/file/detail_page_configuration_test.dart@@ -20,18 +20,29 @@ void main() {expect(galleryConfig.copyWith().showGalleryFilmstrip, isTrue);});- test("gallery filmstrip visibility requires an eligible gallery", () {+ test("gallery filmstrip requires its flag and an eligible gallery", () {for (final scenario in [(name: "eligible gallery",+ isFeatureEnabled: true,isEnabled: true,isMinimalistic: false,isGuestView: false,itemCount: 2,expected: true,),+ (+ name: "feature flag disabled",+ isFeatureEnabled: false,+ isEnabled: true,+ isMinimalistic: false,+ isGuestView: false,+ itemCount: 2,+ expected: false,+ ),(name: "not opted in",+ isFeatureEnabled: true,isEnabled: false,isMinimalistic: false,isGuestView: false,@@ -40,6 +51,7 @@ void main() {),(name: "minimalistic viewer",+ isFeatureEnabled: true,isEnabled: true,isMinimalistic: true,isGuestView: false,@@ -48,6 +60,7 @@ void main() {),(name: "guest view",+ isFeatureEnabled: true,isEnabled: true,isMinimalistic: false,isGuestView: true,@@ -56,6 +69,7 @@ void main() {),(name: "single file",+ isFeatureEnabled: true,isEnabled: true,isMinimalistic: false,isGuestView: false,@@ -65,6 +79,7 @@ void main() {]) {expect(shouldShowGalleryFileViewerFilmstrip(+ isFeatureEnabled: scenario.isFeatureEnabled,isEnabled: scenario.isEnabled,isMinimalistic: scenario.isMinimalistic,isGuestView: scenario.isGuestView,