minor fixes

This commit is contained in:
Thibault Deckers 2023-12-13 23:28:53 +01:00
parent 14579932ae
commit 4a095fa70d
2 changed files with 18 additions and 11 deletions

View file

@ -85,14 +85,18 @@ class EntryListDetails extends StatelessWidget {
final size = entry.burstEntries?.map((v) => v.sizeBytes).sum ?? entry.sizeBytes; final size = entry.burstEntries?.map((v) => v.sizeBytes).sum ?? entry.sizeBytes;
final sizeText = size != null ? formatFileSize(locale, size) : AText.valueNotAvailable; final sizeText = size != null ? formatFileSize(locale, size) : AText.valueNotAvailable;
return _buildRow( return Wrap(
[ spacing: 8,
_buildIconSpan(AIcons.date), children: [
TextSpan(text: dateText), _buildRow(
_buildIconSpan(AIcons.size, padding: const EdgeInsetsDirectional.only(start: 8)), [_buildIconSpan(AIcons.date), TextSpan(text: dateText)],
TextSpan(text: sizeText), 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!); final location = entry.hasAddress ? entry.shortAddress : settings.coordinateFormat.format(context, entry.latLng!);
return _buildRow( return _buildRow(
[ [_buildIconSpan(AIcons.location), TextSpan(text: location)],
_buildIconSpan(AIcons.location),
TextSpan(text: location),
],
style, style,
); );
} }

View file

@ -43,6 +43,9 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
final textStyle = TextStyle( final textStyle = TextStyle(
shadows: brightness == Brightness.dark ? AStyles.embossShadows : null, shadows: brightness == Brightness.dark ? AStyles.embossShadows : null,
); );
const strutStyle = StrutStyle(
forceStrutHeight: true,
);
return SizeTransition( return SizeTransition(
sizeFactor: widget.scale, sizeFactor: widget.scale,
child: BlurredRRect.all( child: BlurredRRect.all(
@ -90,12 +93,14 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
return Text( return Text(
formatFriendlyDuration(Duration(milliseconds: position)), formatFriendlyDuration(Duration(milliseconds: position)),
style: textStyle, style: textStyle,
strutStyle: strutStyle,
); );
}), }),
const Spacer(), const Spacer(),
Text( Text(
formatFriendlyDuration(Duration(milliseconds: controller?.duration ?? 0)), formatFriendlyDuration(Duration(milliseconds: controller?.duration ?? 0)),
style: textStyle, style: textStyle,
strutStyle: strutStyle,
), ),
], ],
), ),
@ -125,6 +130,7 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
// fake text below to match the height of the text above and center the whole thing // fake text below to match the height of the text above and center the whole thing
'', '',
style: textStyle, style: textStyle,
strutStyle: strutStyle,
), ),
], ],
), ),