diff --git a/lib/widgets/collection/grid/list_details.dart b/lib/widgets/collection/grid/list_details.dart index 774eb511d..45a1a86ec 100644 --- a/lib/widgets/collection/grid/list_details.dart +++ b/lib/widgets/collection/grid/list_details.dart @@ -85,14 +85,18 @@ class EntryListDetails extends StatelessWidget { final size = entry.burstEntries?.map((v) => v.sizeBytes).sum ?? entry.sizeBytes; final sizeText = size != null ? formatFileSize(locale, size) : AText.valueNotAvailable; - return _buildRow( - [ - _buildIconSpan(AIcons.date), - TextSpan(text: dateText), - _buildIconSpan(AIcons.size, padding: const EdgeInsetsDirectional.only(start: 8)), - TextSpan(text: sizeText), + return Wrap( + spacing: 8, + children: [ + _buildRow( + [_buildIconSpan(AIcons.date), TextSpan(text: dateText)], + style, + ), + _buildRow( + [_buildIconSpan(AIcons.size), TextSpan(text: sizeText)], + style, + ), ], - style, ); } @@ -100,10 +104,7 @@ class EntryListDetails extends StatelessWidget { final location = entry.hasAddress ? entry.shortAddress : settings.coordinateFormat.format(context, entry.latLng!); return _buildRow( - [ - _buildIconSpan(AIcons.location), - TextSpan(text: location), - ], + [_buildIconSpan(AIcons.location), TextSpan(text: location)], style, ); } diff --git a/lib/widgets/viewer/overlay/video/progress_bar.dart b/lib/widgets/viewer/overlay/video/progress_bar.dart index 2c547f16a..2da712a1e 100644 --- a/lib/widgets/viewer/overlay/video/progress_bar.dart +++ b/lib/widgets/viewer/overlay/video/progress_bar.dart @@ -43,6 +43,9 @@ class _VideoProgressBarState extends State { final textStyle = TextStyle( shadows: brightness == Brightness.dark ? AStyles.embossShadows : null, ); + const strutStyle = StrutStyle( + forceStrutHeight: true, + ); return SizeTransition( sizeFactor: widget.scale, child: BlurredRRect.all( @@ -90,12 +93,14 @@ class _VideoProgressBarState extends State { return Text( formatFriendlyDuration(Duration(milliseconds: position)), style: textStyle, + strutStyle: strutStyle, ); }), const Spacer(), Text( formatFriendlyDuration(Duration(milliseconds: controller?.duration ?? 0)), style: textStyle, + strutStyle: strutStyle, ), ], ), @@ -125,6 +130,7 @@ class _VideoProgressBarState extends State { // fake text below to match the height of the text above and center the whole thing '', style: textStyle, + strutStyle: strutStyle, ), ], ),