Skip to content

armgit / ente

Public Imported from GitHub
0

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

Constrain collapsed eyebrow titles

Neeraj Gupta3632ad0dd0ea
diff --git a/mobile/packages/ente_components/lib/components/app_bar_component.dart b/mobile/packages/ente_components/lib/components/app_bar_component.dart
index 175cd3c592..43bea1fccf 100644
--- a/mobile/packages/ente_components/lib/components/app_bar_component.dart
+++ b/mobile/packages/ente_components/lib/components/app_bar_component.dart
@@ -1084,13 +1084,24 @@ class _MovingHeaderTitle extends StatelessWidget {
double.infinity,
),
);
+ final eyebrowWidth = lerpDouble(
+ constraints.maxWidth,
+ math.max(0, collapsedTitleLeft - _collapsedEyebrowGap),
+ Curves.easeOut.transform(progress),
+ )!;
return Stack(
clipBehavior: Clip.none,
children: [
Positioned(
left: 0,
top: 0,
- child: Text(eyebrow, maxLines: 1, style: eyebrowStyle),
+ width: eyebrowWidth,
+ child: Text(
+ eyebrow,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: eyebrowStyle,
+ ),
),
Positioned(
left: collapsedTitleLeft * Curves.easeOut.transform(progress),
diff --git a/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart b/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart
index f4950a2b28..5f627d55e0 100644
--- a/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart
+++ b/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart
@@ -829,6 +829,7 @@ void main() {
testWidgets(
'SliverAppBarComponent collapses title content and reserved space',
(tester) async {
+ const eyebrowText = 'Sharing with a long translated context';
final scrollController = ScrollController();
addTearDown(scrollController.dispose);
@@ -839,7 +840,7 @@ void main() {
slivers: [
const SliverAppBarComponent(
title: 'Priyadarshini Bandopadhyay',
- eyebrow: 'Sharing with',
+ eyebrow: eyebrowText,
subtitle: 'Scroll to collapse',
onBack: null,
actions: [Icon(Icons.add)],
@@ -856,7 +857,7 @@ void main() {
height: 600,
);
- final eyebrow = find.text('Sharing with');
+ final eyebrow = find.text(eyebrowText);
final titleFinder = find.text('Priyadarshini Bandopadhyay');
expect(
tester.getTopLeft(eyebrow).dy,
@@ -881,6 +882,10 @@ void main() {
tester.getTopLeft(eyebrow).dy,
closeTo(tester.getTopLeft(titleFinder).dy, 0.5),
);
+ expect(
+ tester.getTopRight(eyebrow).dx,
+ lessThanOrEqualTo(tester.getTopLeft(titleFinder).dx),
+ );
expect(tester.getTopLeft(find.text('Item 0')).dy, closeTo(56, 1));
},
);