Skip to content

armgit / ente

Public Imported from GitHub
0

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

Align justified wide row defaults

ashil-pilotd8cb412bd765
diff --git a/mobile/apps/photos/lib/models/gallery/justified_layout.dart b/mobile/apps/photos/lib/models/gallery/justified_layout.dart
index 1653ed91af..b26301e2b1 100644
--- a/mobile/apps/photos/lib/models/gallery/justified_layout.dart
+++ b/mobile/apps/photos/lib/models/gallery/justified_layout.dart
@@ -96,7 +96,7 @@ class JustifiedLayoutCalculator {
static const double _minimumAspectRatio = 1 / 3;
static const double _maximumAspectRatio = 4.0;
static const double _maximumRowHeightFactor = 2.4;
- static const double _maximumWideFinalRowHeightFactor = 1.25;
+ static const double _maximumWideFinalRowHeightFactor = 1.0;
static const double _minimumLandscapeRowHeightFactor = 0.88;
static const double _mediumWidthBreakpoint = 600;
static const double _expandedWidthBreakpoint = 1008;
diff --git a/mobile/apps/photos/test/models/justified_layout_test.dart b/mobile/apps/photos/test/models/justified_layout_test.dart
index 1f14e82cff..ec06f40fb1 100644
--- a/mobile/apps/photos/test/models/justified_layout_test.dart
+++ b/mobile/apps/photos/test/models/justified_layout_test.dart
@@ -63,7 +63,7 @@ void main() {
spacing: 2,
).single;
- expect(row.height, 400, reason: "available width ${testCase.width}");
+ expect(row.height, 320, reason: "available width ${testCase.width}");
expect(
_occupiedWidth(row, 2),
lessThan(testCase.width),
@@ -103,8 +103,8 @@ void main() {
closeTo(1 / 3, 1e-9),
);
expect(landscape.height, 200);
- expect(mediumPortrait.height, 400);
- expect(mediumPortrait.itemWidths.single, 200);
+ expect(mediumPortrait.height, 320);
+ expect(mediumPortrait.itemWidths.single, 160);
expect(minimumTappablePortrait.height, 144);
expect(minimumTappablePortrait.itemWidths.single, 48);
});
@@ -243,7 +243,7 @@ void main() {
);
final expectedFinalHeight = testCase.width < 600
? 3 * targetHeight
- : 1.25 * targetHeight;
+ : targetHeight;
expect(
rows.last.height,
closeTo(expectedFinalHeight, 1e-9),
@@ -330,6 +330,7 @@ void main() {
availableWidth: 600,
targetRowHeight: 200,
spacing: 2,
+ wideFinalMaximumRowHeightFactor: 1.25,
);
expect(rows.map((row) => row.itemWidths.length), [3, 2]);