Skip to content

armgit / ente

Public Imported from GitHub
0

💚 End-to-end encrypted cloud for everything.

[mob][photos] Add full-row Flex layout variant

ashil-pilot80344a8e515a
diff --git a/mobile/apps/photos/lib/models/gallery/flex_layout.dart b/mobile/apps/photos/lib/models/gallery/flex_layout.dart
index f402c9e8f5..89e12f3b04 100644
--- a/mobile/apps/photos/lib/models/gallery/flex_layout.dart
+++ b/mobile/apps/photos/lib/models/gallery/flex_layout.dart
@@ -19,6 +19,7 @@ class FlexLayoutCalculator {
required double targetRowHeight,
required double spacing,
double maximumRowHeightFactor = _defaultMaximumRowHeightFactor,
+ double? minimumNonFinalSingletonAspectRatio,
}) {
if (!availableWidth.isFinite || availableWidth <= 0) {
throw ArgumentError.value(availableWidth, "availableWidth");
@@ -35,6 +36,14 @@ class FlexLayoutCalculator {
"maximumRowHeightFactor",
);
}
+ if (minimumNonFinalSingletonAspectRatio != null &&
+ (!minimumNonFinalSingletonAspectRatio.isFinite ||
+ minimumNonFinalSingletonAspectRatio <= 0)) {
+ throw ArgumentError.value(
+ minimumNonFinalSingletonAspectRatio,
+ "minimumNonFinalSingletonAspectRatio",
+ );
+ }
final ratios = Float64List.fromList(aspectRatios.toList(growable: false));
if (ratios.isEmpty) return const [];
@@ -65,8 +74,12 @@ class FlexLayoutCalculator {
if (contentWidth < itemCount * _minimumTappableExtent) break;
final isTail = end == count - 1;
- // Product decision: a singleton is only allowed at the group tail.
- if (!isTail && itemCount == 1) continue;
+ if (!isTail &&
+ itemCount == 1 &&
+ (minimumNonFinalSingletonAspectRatio == null ||
+ ratios[start] < minimumNonFinalSingletonAspectRatio)) {
+ continue;
+ }
final geometry = _rowGeometry(
ratios: ratios,
start: start,
diff --git a/mobile/apps/photos/lib/models/gallery/gallery_groups.dart b/mobile/apps/photos/lib/models/gallery/gallery_groups.dart
index ba2346eb44..9003342217 100644
--- a/mobile/apps/photos/lib/models/gallery/gallery_groups.dart
+++ b/mobile/apps/photos/lib/models/gallery/gallery_groups.dart
@@ -451,6 +451,9 @@ class GalleryGroups {
final flexTuning = strategy == JustifiedLayoutStrategy.flex
? localSettings.getFlexLayoutTuning()
: FlexLayoutTuning.defaults;
+ final flexFullRowsTuning = strategy == JustifiedLayoutStrategy.flexFullRows
+ ? localSettings.getFlexFullRowsLayoutTuning()
+ : FlexFullRowsLayoutTuning.defaults;
final comfortLargeTuning = strategy == JustifiedLayoutStrategy.comfortLarge
? localSettings.getComfortLargeLayoutTuning()
: ComfortLargeLayoutTuning.defaults;
@@ -464,6 +467,8 @@ class GalleryGroups {
JustifiedLayoutStrategy.comfortLarge =>
comfortLargeTuning.targetHeightScale,
JustifiedLayoutStrategy.flex => flexTuning.targetHeightScale,
+ JustifiedLayoutStrategy.flexFullRows =>
+ flexFullRowsTuning.targetHeightScale,
};
final targetRowHeight = baseTargetRowHeight * targetHeightScale;
final groupLayouts = <SectionLayout>[];
@@ -505,6 +510,16 @@ class GalleryGroups {
spacing: spacing,
maximumRowHeightFactor: flexTuning.maximumHeightFactor,
),
+ JustifiedLayoutStrategy.flexFullRows =>
+ FlexLayoutCalculator.computeRows(
+ aspectRatios: aspectRatios,
+ availableWidth: widthAvailable,
+ targetRowHeight: targetRowHeight,
+ spacing: spacing,
+ maximumRowHeightFactor: flexFullRowsTuning.maximumHeightFactor,
+ minimumNonFinalSingletonAspectRatio:
+ flexFullRowsTuning.minimumNonFinalSingletonAspectRatio,
+ ),
};
final firstIndex = currentIndex == 0 ? currentIndex : currentIndex + 1;
final lastIndex = firstIndex + rows.length;
diff --git a/mobile/apps/photos/lib/models/gallery/justified_layout_strategy.dart b/mobile/apps/photos/lib/models/gallery/justified_layout_strategy.dart
index 0e6f053a44..e6f845f049 100644
--- a/mobile/apps/photos/lib/models/gallery/justified_layout_strategy.dart
+++ b/mobile/apps/photos/lib/models/gallery/justified_layout_strategy.dart
@@ -1 +1 @@
-enum JustifiedLayoutStrategy { comfort, comfortLarge, flex }
+enum JustifiedLayoutStrategy { comfort, comfortLarge, flex, flexFullRows }
diff --git a/mobile/apps/photos/lib/models/gallery/justified_layout_tuning.dart b/mobile/apps/photos/lib/models/gallery/justified_layout_tuning.dart
index fa53f14caa..3029991c97 100644
--- a/mobile/apps/photos/lib/models/gallery/justified_layout_tuning.dart
+++ b/mobile/apps/photos/lib/models/gallery/justified_layout_tuning.dart
@@ -1,5 +1,11 @@
enum FlexLayoutTuningField { targetHeightScale, maximumHeightFactor }
+enum FlexFullRowsLayoutTuningField {
+ targetHeightScale,
+ maximumHeightFactor,
+ minimumNonFinalSingletonAspectRatio,
+}
+
enum ComfortLargeLayoutTuningField {
targetHeightScale,
maximumHeightFactor,
@@ -40,6 +46,44 @@ extension FlexLayoutTuningFieldValue on FlexLayoutTuningField {
value.isFinite && value >= minimumValue && value <= maximumValue;
}
+class FlexFullRowsLayoutTuning {
+ static const defaults = FlexFullRowsLayoutTuning();
+
+ final double targetHeightScale;
+ final double maximumHeightFactor;
+ final double minimumNonFinalSingletonAspectRatio;
+
+ const FlexFullRowsLayoutTuning({
+ this.targetHeightScale = 1.12,
+ this.maximumHeightFactor = 1.6,
+ this.minimumNonFinalSingletonAspectRatio = 0.75,
+ });
+
+ double valueFor(FlexFullRowsLayoutTuningField field) {
+ return switch (field) {
+ FlexFullRowsLayoutTuningField.targetHeightScale => targetHeightScale,
+ FlexFullRowsLayoutTuningField.maximumHeightFactor => maximumHeightFactor,
+ FlexFullRowsLayoutTuningField.minimumNonFinalSingletonAspectRatio =>
+ minimumNonFinalSingletonAspectRatio,
+ };
+ }
+}
+
+extension FlexFullRowsLayoutTuningFieldValue on FlexFullRowsLayoutTuningField {
+ double get defaultValue => FlexFullRowsLayoutTuning.defaults.valueFor(this);
+
+ double get maximumValue => 10;
+
+ double get minimumValue => switch (this) {
+ FlexFullRowsLayoutTuningField.targetHeightScale ||
+ FlexFullRowsLayoutTuningField.minimumNonFinalSingletonAspectRatio => 0.1,
+ FlexFullRowsLayoutTuningField.maximumHeightFactor => 1,
+ };
+
+ bool isValid(double value) =>
+ value.isFinite && value >= minimumValue && value <= maximumValue;
+}
+
class ComfortLargeLayoutTuning {
static const defaults = ComfortLargeLayoutTuning();
@@ -49,7 +93,7 @@ class ComfortLargeLayoutTuning {
final double minimumLandscapeHeightFactor;
const ComfortLargeLayoutTuning({
- this.targetHeightScale = 1.12,
+ this.targetHeightScale = 1.5,
this.maximumHeightFactor = 2.4,
this.wideFinalMaximumHeightFactor = 1.25,
this.minimumLandscapeHeightFactor = 0.88,
diff --git a/mobile/apps/photos/lib/settings/local_settings.dart b/mobile/apps/photos/lib/settings/local_settings.dart
index f23de445f4..3bf583f828 100644
--- a/mobile/apps/photos/lib/settings/local_settings.dart
+++ b/mobile/apps/photos/lib/settings/local_settings.dart
@@ -64,6 +64,12 @@ class LocalSettings {
"gallery.justified.flex.target_height_scale";
static const kFlexLayoutTuningMaximumHeightFactor =
"gallery.justified.flex.maximum_height_factor";
+ static const kFlexFullRowsLayoutTuningTargetHeightScale =
+ "gallery.justified.flex_full_rows.target_height_scale";
+ static const kFlexFullRowsLayoutTuningMaximumHeightFactor =
+ "gallery.justified.flex_full_rows.maximum_height_factor";
+ static const kFlexFullRowsLayoutTuningMinimumNonFinalSingletonAspectRatio =
+ "gallery.justified.flex_full_rows.minimum_non_final_singleton_aspect_ratio";
static const kComfortLargeLayoutTuningTargetHeightScale =
"gallery.justified.comfort_large.target_height_scale";
static const kComfortLargeLayoutTuningMaximumHeightFactor =
@@ -298,6 +304,7 @@ class LocalSettings {
return switch (_prefs.getString(kJustifiedLayoutStrategy)) {
"comfortLarge" => JustifiedLayoutStrategy.comfortLarge,
"flex" => JustifiedLayoutStrategy.flex,
+ "flexFullRows" => JustifiedLayoutStrategy.flexFullRows,
_ => JustifiedLayoutStrategy.comfort,
};
}
@@ -343,6 +350,54 @@ class LocalSettings {
);
}
+ FlexFullRowsLayoutTuning getFlexFullRowsLayoutTuning() {
+ return FlexFullRowsLayoutTuning(
+ targetHeightScale: _validDoubleOrDefault(
+ kFlexFullRowsLayoutTuningTargetHeightScale,
+ FlexFullRowsLayoutTuningField.targetHeightScale.defaultValue,
+ FlexFullRowsLayoutTuningField.targetHeightScale.isValid,
+ ),
+ maximumHeightFactor: _validDoubleOrDefault(
+ kFlexFullRowsLayoutTuningMaximumHeightFactor,
+ FlexFullRowsLayoutTuningField.maximumHeightFactor.defaultValue,
+ FlexFullRowsLayoutTuningField.maximumHeightFactor.isValid,
+ ),
+ minimumNonFinalSingletonAspectRatio: _validDoubleOrDefault(
+ kFlexFullRowsLayoutTuningMinimumNonFinalSingletonAspectRatio,
+ FlexFullRowsLayoutTuningField
+ .minimumNonFinalSingletonAspectRatio
+ .defaultValue,
+ FlexFullRowsLayoutTuningField
+ .minimumNonFinalSingletonAspectRatio
+ .isValid,
+ ),
+ );
+ }
+
+ Future<void> setFlexFullRowsLayoutTuningValue(
+ FlexFullRowsLayoutTuningField field,
+ double value,
+ ) async {
+ if (!field.isValid(value)) {
+ throw ArgumentError.value(value, field.name);
+ }
+ await _prefs.setDouble(_flexFullRowsLayoutTuningKey(field), value);
+ }
+
+ Future<void> resetFlexFullRowsLayoutTuningValue(
+ FlexFullRowsLayoutTuningField field,
+ ) async {
+ await _prefs.remove(_flexFullRowsLayoutTuningKey(field));
+ }
+
+ Future<void> resetFlexFullRowsLayoutTuning() async {
+ await Future.wait(
+ FlexFullRowsLayoutTuningField.values.map(
+ resetFlexFullRowsLayoutTuningValue,
+ ),
+ );
+ }
+
ComfortLargeLayoutTuning getComfortLargeLayoutTuning() {
return ComfortLargeLayoutTuning(
targetHeightScale: _validDoubleOrDefault(
@@ -427,6 +482,19 @@ class LocalSettings {
};
}
+ static String _flexFullRowsLayoutTuningKey(
+ FlexFullRowsLayoutTuningField field,
+ ) {
+ return switch (field) {
+ FlexFullRowsLayoutTuningField.targetHeightScale =>
+ kFlexFullRowsLayoutTuningTargetHeightScale,
+ FlexFullRowsLayoutTuningField.maximumHeightFactor =>
+ kFlexFullRowsLayoutTuningMaximumHeightFactor,
+ FlexFullRowsLayoutTuningField.minimumNonFinalSingletonAspectRatio =>
+ kFlexFullRowsLayoutTuningMinimumNonFinalSingletonAspectRatio,
+ };
+ }
+
int getPhotoGridSize() {
if (_prefs.containsKey(kPhotoGridSize)) {
return _prefs.getInt(kPhotoGridSize)!;
diff --git a/mobile/apps/photos/lib/ui/settings/justified_layout_tuning_screen.dart b/mobile/apps/photos/lib/ui/settings/justified_layout_tuning_screen.dart
index 68becb9e62..e819159462 100644
--- a/mobile/apps/photos/lib/ui/settings/justified_layout_tuning_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/justified_layout_tuning_screen.dart
@@ -20,13 +20,15 @@ class _JustifiedLayoutTuningScreenState
@override
Widget build(BuildContext context) {
final flexTuning = localSettings.getFlexLayoutTuning();
+ final flexFullRowsTuning = localSettings.getFlexFullRowsLayoutTuning();
final comfortLargeTuning = localSettings.getComfortLargeLayoutTuning();
return SettingsPageScaffold(
title: "Justified layout tuning",
children: [
Text(
- "Values are multipliers of the responsive target row height.",
+ "Height values are multipliers of the responsive target row height. "
+ "Aspect ratio uses width ÷ height.",
style: TextStyles.mini.copyWith(
color: context.componentColors.textLight,
),
@@ -49,6 +51,26 @@ class _JustifiedLayoutTuningScreenState
],
),
const SizedBox(height: 24),
+ const MenuSectionTitle(title: "Flex Full Rows"),
+ MenuGroupComponent(
+ items: [
+ for (final field in FlexFullRowsLayoutTuningField.values)
+ SettingsItem(
+ title: _flexFullRowsFieldLabel(field),
+ trailing: _valueLabel(
+ context,
+ flexFullRowsTuning.valueFor(field),
+ ),
+ onTap: () => _editFlexFullRowsValue(field),
+ ),
+ SettingsItem(
+ title: "Reset all",
+ showChevron: false,
+ onTap: _resetFlexFullRowsValues,
+ ),
+ ],
+ ),
+ const SizedBox(height: 24),
const MenuSectionTitle(title: "Comfort Large"),
MenuGroupComponent(
items: [
@@ -72,6 +94,27 @@ class _JustifiedLayoutTuningScreenState
);
}
+ Future<void> _editFlexFullRowsValue(
+ FlexFullRowsLayoutTuningField field,
+ ) async {
+ final tuning = localSettings.getFlexFullRowsLayoutTuning();
+ await _showValueSheet(
+ title: _flexFullRowsFieldLabel(field),
+ initialValue: tuning.valueFor(field),
+ defaultValue: field.defaultValue,
+ isValid: field.isValid,
+ validRange: (field.minimumValue, field.maximumValue),
+ onSave: (value) async {
+ await localSettings.setFlexFullRowsLayoutTuningValue(field, value);
+ _refreshGallery();
+ },
+ onReset: () async {
+ await localSettings.resetFlexFullRowsLayoutTuningValue(field);
+ _refreshGallery();
+ },
+ );
+ }
+
Widget _valueLabel(BuildContext context, double value) {
return Text(
_formatValue(value),
@@ -147,6 +190,11 @@ class _JustifiedLayoutTuningScreenState
_refreshGallery();
}
+ Future<void> _resetFlexFullRowsValues() async {
+ await localSettings.resetFlexFullRowsLayoutTuning();
+ _refreshGallery();
+ }
+
Future<void> _resetComfortLargeValues() async {
await localSettings.resetComfortLargeLayoutTuning();
_refreshGallery();
@@ -264,6 +312,15 @@ String _flexFieldLabel(FlexLayoutTuningField field) => switch (field) {
FlexLayoutTuningField.maximumHeightFactor => "Maximum height factor",
};
+String _flexFullRowsFieldLabel(FlexFullRowsLayoutTuningField field) =>
+ switch (field) {
+ FlexFullRowsLayoutTuningField.targetHeightScale => "Target height scale",
+ FlexFullRowsLayoutTuningField.maximumHeightFactor =>
+ "Maximum height factor",
+ FlexFullRowsLayoutTuningField.minimumNonFinalSingletonAspectRatio =>
+ "Minimum non-final singleton aspect ratio",
+ };
+
String _comfortLargeFieldLabel(ComfortLargeLayoutTuningField field) =>
switch (field) {
ComfortLargeLayoutTuningField.targetHeightScale => "Target height scale",
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/justified_layout_strategy_label.dart b/mobile/apps/photos/lib/ui/viewer/gallery/justified_layout_strategy_label.dart
index 3b82a586ed..6df4e6820c 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/justified_layout_strategy_label.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/justified_layout_strategy_label.dart
@@ -8,5 +8,7 @@ extension JustifiedLayoutStrategyLabel on JustifiedLayoutStrategy {
JustifiedLayoutStrategy.comfortLarge =>
"${context.strings.layoutJustifiedComfort} Large",
JustifiedLayoutStrategy.flex => context.strings.layoutJustifiedFlex,
+ JustifiedLayoutStrategy.flexFullRows =>
+ "${context.strings.layoutJustifiedFlex} Full Rows",
};
}
diff --git a/mobile/apps/photos/test/models/flex_layout_test.dart b/mobile/apps/photos/test/models/flex_layout_test.dart
index b37c82c9b4..df5cad7a25 100644
--- a/mobile/apps/photos/test/models/flex_layout_test.dart
+++ b/mobile/apps/photos/test/models/flex_layout_test.dart
@@ -23,6 +23,39 @@ void main() {
}
});
+ test(
+ "full-row variant allows landscape singletons without internal gaps",
+ () {
+ const ratios = [16 / 9, 16 / 9, 16 / 9];
+ final rows = _rows(ratios, minimumNonFinalSingletonAspectRatio: 0.75);
+
+ expect(rows.first.itemWidths, hasLength(1));
+ for (final row in rows.take(rows.length - 1)) {
+ expect(_occupiedWidth(row), closeTo(402, 1e-9));
+ }
+ },
+ );
+
+ test("full-row variant keeps tall portraits out of non-final singletons", () {
+ const ratios = [16 / 9, 9 / 16, 16 / 9, 9 / 16, 16 / 9];
+ final rows = _rows(ratios, minimumNonFinalSingletonAspectRatio: 0.75);
+
+ for (final row in rows.take(rows.length - 1)) {
+ if (row.itemWidths.length == 1) {
+ expect(ratios[row.firstIndex], greaterThanOrEqualTo(0.75));
+ }
+ expect(_occupiedWidth(row), closeTo(402, 1e-9));
+ }
+ });
+
+ test("full-row variant permits a ragged portrait-only group", () {
+ final row = _rows([
+ 9 / 16,
+ ], minimumNonFinalSingletonAspectRatio: 0.75).single;
+
+ expect(_occupiedWidth(row), lessThan(402));
+ });
+
test("uses adaptive cropping only when a row cannot remain tappable", () {
final rows = _rows([4, 1 / 3, 1, 1]);
final extremeRow = rows.first;
@@ -110,8 +143,12 @@ void main() {
expect(_rows([]), isEmpty);
});
- test("rejects invalid height tuning", () {
+ test("rejects invalid tuning", () {
expect(() => _rows([1], maximumHeightFactor: 0.9), throwsArgumentError);
+ expect(
+ () => _rows([1], minimumNonFinalSingletonAspectRatio: 0),
+ throwsArgumentError,
+ );
});
}
@@ -120,6 +157,7 @@ List<JustifiedRowLayout> _rows(
double width = 402,
double? targetHeight,
double maximumHeightFactor = 1.6,
+ double? minimumNonFinalSingletonAspectRatio,
}) {
return FlexLayoutCalculator.computeRows(
aspectRatios: ratios,
@@ -127,6 +165,7 @@ List<JustifiedRowLayout> _rows(
targetRowHeight: targetHeight ?? (width < 600 ? 200 : 320),
spacing: 2,
maximumRowHeightFactor: maximumHeightFactor,
+ minimumNonFinalSingletonAspectRatio: minimumNonFinalSingletonAspectRatio,
);
}
diff --git a/mobile/apps/photos/test/models/gallery_groups_justified_test.dart b/mobile/apps/photos/test/models/gallery_groups_justified_test.dart
index 65e23ef2c6..bd21e396ad 100644
--- a/mobile/apps/photos/test/models/gallery_groups_justified_test.dart
+++ b/mobile/apps/photos/test/models/gallery_groups_justified_test.dart
@@ -53,6 +53,7 @@ void main() {
JustifiedLayoutStrategy.comfort,
);
await localSettings.resetFlexLayoutTuning();
+ await localSettings.resetFlexFullRowsLayoutTuning();
await localSettings.resetComfortLargeLayoutTuning();
await localSettings.setPhotoGridSize(4);
});
@@ -162,6 +163,39 @@ void main() {
expect(flex.rows.single.itemWidths, hasLength(4));
});
+ test("routes Flex Full Rows with independent tuning", () async {
+ final files = List<EnteFile>.generate(
+ 3,
+ (index) => _file(
+ index: index,
+ creationTime: DateTime(2026, 8, 19).microsecondsSinceEpoch,
+ width: 16,
+ height: 9,
+ ),
+ );
+ await localSettings.setPhotoGridSize(2);
+ await localSettings.setJustifiedLayoutStrategy(
+ JustifiedLayoutStrategy.flexFullRows,
+ );
+
+ JustifiedSectionLayout section() =>
+ _galleryGroups(
+ files: files,
+ groupType: GroupType.none,
+ groupHeaderExtent: GalleryGroups.spacing,
+ widthAvailable: 402,
+ ).groupLayouts.single
+ as JustifiedSectionLayout;
+
+ expect(section().rows.map((row) => row.itemWidths.length), [1, 1, 1]);
+ await localSettings.setFlexFullRowsLayoutTuningValue(
+ FlexFullRowsLayoutTuningField.minimumNonFinalSingletonAspectRatio,
+ 2,
+ );
+ final constrainedRows = section().rows;
+ expect(constrainedRows.map((row) => row.itemWidths.length), [2, 1]);
+ });
+
test("keeps layout tuning separate for Flex and Comfort Large", () async {
final file = _file(
index: 0,
diff --git a/mobile/apps/photos/test/settings/local_settings_gallery_layout_test.dart b/mobile/apps/photos/test/settings/local_settings_gallery_layout_test.dart
index 51b414f25a..0226c77d07 100644
--- a/mobile/apps/photos/test/settings/local_settings_gallery_layout_test.dart
+++ b/mobile/apps/photos/test/settings/local_settings_gallery_layout_test.dart
@@ -41,6 +41,7 @@ void main() {
for (final strategy in [
JustifiedLayoutStrategy.comfortLarge,
JustifiedLayoutStrategy.flex,
+ JustifiedLayoutStrategy.flexFullRows,
]) {
await settings.setJustifiedLayoutStrategy(strategy);
expect(
@@ -61,6 +62,14 @@ void main() {
expect(flex.valueFor(field), FlexLayoutTuning.defaults.valueFor(field));
}
+ final flexFullRows = settings.getFlexFullRowsLayoutTuning();
+ for (final field in FlexFullRowsLayoutTuningField.values) {
+ expect(
+ flexFullRows.valueFor(field),
+ FlexFullRowsLayoutTuning.defaults.valueFor(field),
+ );
+ }
+
final comfortLarge = settings.getComfortLargeLayoutTuning();
for (final field in ComfortLargeLayoutTuningField.values) {
expect(
@@ -78,6 +87,12 @@ void main() {
FlexLayoutTuningField.targetHeightScale: 2.718281828,
FlexLayoutTuningField.maximumHeightFactor: 9.125,
};
+ const flexFullRowsValues = <FlexFullRowsLayoutTuningField, double>{
+ FlexFullRowsLayoutTuningField.targetHeightScale: 1.23456789,
+ FlexFullRowsLayoutTuningField.maximumHeightFactor: 7.25,
+ FlexFullRowsLayoutTuningField.minimumNonFinalSingletonAspectRatio:
+ 0.8125,
+ };
const comfortLargeValues = <ComfortLargeLayoutTuningField, double>{
ComfortLargeLayoutTuningField.targetHeightScale: 0.123456789,
ComfortLargeLayoutTuningField.maximumHeightFactor: 8.75,
@@ -88,6 +103,9 @@ void main() {
for (final entry in flexValues.entries) {
await settings.setFlexLayoutTuningValue(entry.key, entry.value);
}
+ for (final entry in flexFullRowsValues.entries) {
+ await settings.setFlexFullRowsLayoutTuningValue(entry.key, entry.value);
+ }
for (final entry in comfortLargeValues.entries) {
await settings.setComfortLargeLayoutTuningValue(entry.key, entry.value);
}
@@ -97,6 +115,10 @@ void main() {
for (final entry in flexValues.entries) {
expect(flex.valueFor(entry.key), entry.value);
}
+ final flexFullRows = reloadedSettings.getFlexFullRowsLayoutTuning();
+ for (final entry in flexFullRowsValues.entries) {
+ expect(flexFullRows.valueFor(entry.key), entry.value);
+ }
final comfortLarge = reloadedSettings.getComfortLargeLayoutTuning();
for (final entry in comfortLargeValues.entries) {
expect(comfortLarge.valueFor(entry.key), entry.value);
@@ -107,6 +129,11 @@ void main() {
SharedPreferences.setMockInitialValues({
LocalSettings.kFlexLayoutTuningTargetHeightScale: "invalid",
LocalSettings.kFlexLayoutTuningMaximumHeightFactor: double.nan,
+ LocalSettings.kFlexFullRowsLayoutTuningTargetHeightScale: 0.0,
+ LocalSettings.kFlexFullRowsLayoutTuningMaximumHeightFactor: 0.99,
+ LocalSettings
+ .kFlexFullRowsLayoutTuningMinimumNonFinalSingletonAspectRatio:
+ "invalid",
LocalSettings.kComfortLargeLayoutTuningTargetHeightScale: 0.0,
LocalSettings.kComfortLargeLayoutTuningMaximumHeightFactor: 0.99,
LocalSettings.kComfortLargeLayoutTuningWideFinalMaximumHeightFactor:
@@ -120,6 +147,13 @@ void main() {
for (final field in FlexLayoutTuningField.values) {
expect(flex.valueFor(field), FlexLayoutTuning.defaults.valueFor(field));
}
+ final flexFullRows = settings.getFlexFullRowsLayoutTuning();
+ for (final field in FlexFullRowsLayoutTuningField.values) {
+ expect(
+ flexFullRows.valueFor(field),
+ FlexFullRowsLayoutTuning.defaults.valueFor(field),
+ );
+ }
final comfortLarge = settings.getComfortLargeLayoutTuning();
for (final field in ComfortLargeLayoutTuningField.values) {
expect(
@@ -129,7 +163,7 @@ void main() {
}
});
- test("keeps Flex and Comfort Large tuning isolated", () async {
+ test("keeps strategy tuning isolated", () async {
SharedPreferences.setMockInitialValues({});
final settings = LocalSettings(await SharedPreferences.getInstance());
@@ -143,6 +177,16 @@ void main() {
),
ComfortLargeLayoutTuning.defaults.targetHeightScale,
);
+ expect(
+ settings.getFlexFullRowsLayoutTuning().targetHeightScale,
+ FlexFullRowsLayoutTuning.defaults.targetHeightScale,
+ );
+
+ await settings.setFlexFullRowsLayoutTuningValue(
+ FlexFullRowsLayoutTuningField.targetHeightScale,
+ 2.17,
+ );
+ expect(settings.getFlexLayoutTuning().targetHeightScale, 1.91);
await settings.setComfortLargeLayoutTuningValue(
ComfortLargeLayoutTuningField.targetHeightScale,
@@ -154,6 +198,7 @@ void main() {
),
1.91,
);
+ expect(settings.getFlexFullRowsLayoutTuning().targetHeightScale, 2.17);
});
test("resets one field without changing its siblings", () async {
@@ -175,6 +220,14 @@ void main() {
ComfortLargeLayoutTuningField.maximumHeightFactor,
3.41,
);
+ await settings.setFlexFullRowsLayoutTuningValue(
+ FlexFullRowsLayoutTuningField.targetHeightScale,
+ 1.71,
+ );
+ await settings.setFlexFullRowsLayoutTuningValue(
+ FlexFullRowsLayoutTuningField.maximumHeightFactor,
+ 2.41,
+ );
await settings.resetFlexLayoutTuningValue(
FlexLayoutTuningField.targetHeightScale,
@@ -182,6 +235,9 @@ void main() {
await settings.resetComfortLargeLayoutTuningValue(
ComfortLargeLayoutTuningField.targetHeightScale,
);
+ await settings.resetFlexFullRowsLayoutTuningValue(
+ FlexFullRowsLayoutTuningField.targetHeightScale,
+ );
final flex = settings.getFlexLayoutTuning();
expect(
@@ -195,6 +251,12 @@ void main() {
ComfortLargeLayoutTuning.defaults.targetHeightScale,
);
expect(comfortLarge.maximumHeightFactor, 3.41);
+ final flexFullRows = settings.getFlexFullRowsLayoutTuning();
+ expect(
+ flexFullRows.targetHeightScale,
+ FlexFullRowsLayoutTuning.defaults.targetHeightScale,
+ );
+ expect(flexFullRows.maximumHeightFactor, 2.41);
});
test("reset all removes only the selected strategy keys", () async {
@@ -207,6 +269,14 @@ void main() {
field == FlexLayoutTuningField.maximumHeightFactor ? 2.0 : 1.5,
);
}
+ for (final field in FlexFullRowsLayoutTuningField.values) {
+ await settings.setFlexFullRowsLayoutTuningValue(
+ field,
+ field == FlexFullRowsLayoutTuningField.maximumHeightFactor
+ ? 2.0
+ : 1.5,
+ );
+ }
for (final field in ComfortLargeLayoutTuningField.values) {
await settings.setComfortLargeLayoutTuningValue(field, switch (field) {
ComfortLargeLayoutTuningField.maximumHeightFactor ||
@@ -225,6 +295,17 @@ void main() {
preferences.getKeys().where((key) => key.contains(".comfort_large.")),
isNotEmpty,
);
+ expect(
+ preferences.getKeys().where((key) => key.contains(".flex_full_rows.")),
+ isNotEmpty,
+ );
+
+ await settings.resetFlexFullRowsLayoutTuning();
+
+ expect(
+ preferences.getKeys().where((key) => key.contains(".flex_full_rows.")),
+ isEmpty,
+ );
await settings.resetComfortLargeLayoutTuning();
@@ -252,6 +333,13 @@ void main() {
),
throwsArgumentError,
);
+ await expectLater(
+ settings.setFlexFullRowsLayoutTuningValue(
+ FlexFullRowsLayoutTuningField.minimumNonFinalSingletonAspectRatio,
+ 0,
+ ),
+ throwsArgumentError,
+ );
expect(
settings.getFlexLayoutTuning().targetHeightScale,
@@ -261,6 +349,12 @@ void main() {
settings.getComfortLargeLayoutTuning().maximumHeightFactor,
ComfortLargeLayoutTuning.defaults.maximumHeightFactor,
);
+ expect(
+ settings
+ .getFlexFullRowsLayoutTuning()
+ .minimumNonFinalSingletonAspectRatio,
+ FlexFullRowsLayoutTuning.defaults.minimumNonFinalSingletonAspectRatio,
+ );
});
});
}
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 13e307e65d..2549424ecc 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
@@ -64,6 +64,7 @@ void main() {
JustifiedLayoutStrategy.comfort,
);
await localSettings.resetFlexLayoutTuning();
+ await localSettings.resetFlexFullRowsLayoutTuning();
await localSettings.resetComfortLargeLayoutTuning();
});
@@ -114,7 +115,7 @@ void main() {
await tester.tap(find.text("Layout"));
await tester.pumpAndSettle();
}
- await tester.tap(find.text("Justified · Flex"));
+ await tester.tap(find.text("Justified · Flex Full Rows"));
await tester.pumpAndSettle();
expect(
localSettings.getGalleryLayoutType(),
@@ -122,7 +123,7 @@ void main() {
);
expect(
localSettings.getJustifiedLayoutStrategy(),
- JustifiedLayoutStrategy.flex,
+ JustifiedLayoutStrategy.flexFullRows,
);
expect(events, 1);
await tester.pumpWidget(const SizedBox.shrink());