Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mob][photos] Preserve closing quote in captions

ashilknd3b86cf5ad3c
diff --git a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
index 0b7cb920ca..13e29f8ce5 100644
--- a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
@@ -1210,9 +1210,10 @@ class _MemoryViewerOverlays extends StatelessWidget {
if (safeIndex == null) return const SizedBox.shrink();
final file = inheritedData.memories[safeIndex].file;
final caption = file.caption;
- final captionText = caption == null || caption.isEmpty
- ? null
- : '"$caption"';
+ final captionText = caption == null || caption.isEmpty ? null : caption;
+ final captionStyle = component.TextStyles.mini.copyWith(
+ color: Colors.white.withValues(alpha: 0.8),
+ );
return Stack(
fit: StackFit.expand,
children: [
@@ -1289,13 +1290,20 @@ class _MemoryViewerOverlays extends StatelessWidget {
onTap: () => fullScreenState._runWithViewerPaused(
() => showDetailsSheet(context, file),
),
- child: Text(
- captionText,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- style: component.TextStyles.mini.copyWith(
- color: Colors.white.withValues(alpha: 0.8),
- ),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Text('"', style: captionStyle),
+ Flexible(
+ child: Text(
+ captionText,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: captionStyle,
+ ),
+ ),
+ Text('"', style: captionStyle),
+ ],
),
),
),
diff --git a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
index a917f0db16..50d34490a6 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
@@ -699,15 +699,16 @@ class _GalleryBottomOverlay extends StatelessWidget {
Widget build(BuildContext context) {
final isVideo = file.fileType == FileType.video;
final caption = file.caption;
- final captionText = caption == null || caption.isEmpty
- ? null
- : '"$caption"';
+ final captionText = caption == null || caption.isEmpty ? null : caption;
final hasBottomBar = mode != DetailPageMode.minimalistic && !isGuestView;
if (captionText == null && (isVideo || !hasBottomBar)) {
return const SizedBox.shrink();
}
final safePadding = MediaQuery.paddingOf(context);
+ final captionStyle = getEnteTextTheme(
+ context,
+ ).mini.copyWith(color: textBaseDark.withValues(alpha: 0.8));
return ValueListenableBuilder<bool>(
valueListenable: enableFullScreenNotifier,
builder: (context, isFullScreen, _) {
@@ -764,13 +765,20 @@ class _GalleryBottomOverlay extends StatelessWidget {
alignment: Alignment.centerLeft,
child: GestureDetector(
onTap: () => showDetailsSheet(context, file),
- child: Text(
- captionText,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- style: getEnteTextTheme(context).mini.copyWith(
- color: textBaseDark.withValues(alpha: 0.8),
- ),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Text('"', style: captionStyle),
+ Flexible(
+ child: Text(
+ captionText,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: captionStyle,
+ ),
+ ),
+ Text('"', style: captionStyle),
+ ],
),
),
),