ThatOneJackalGuy/OpenContacts
1
0
Fork 0
Code Issues 3 Pull requests Projects 1 Releases 2 Packages Wiki Activity Actions

Improve text formatting with extreme size values and fix session header not getting formatted

Browse source
This commit is contained in:
Nutcake 2023-05-15 11:46:31 +02:00
parent d51eba5009
commit 5e267b7ff0
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/string_formatter.dart
View file

@ -166,15 +166,16 @@ class FormatData {
"size": FormatAction( "size": FormatAction(
style: (param, baseStyle) { style: (param, baseStyle) {
if (param == null) return baseStyle; if (param == null) return baseStyle;
final baseSize = baseStyle.fontSize ?? 12;
if (param.endsWith("%")) { if (param.endsWith("%")) {
final percentage = int.tryParse(param.replaceAll("%", "")); final percentage = int.tryParse(param.replaceAll("%", ""));
if (percentage == null || percentage <= 0) return baseStyle; if (percentage == null || percentage <= 0) return baseStyle;
final baseSize = baseStyle.fontSize ?? 12;
return baseStyle.copyWith(fontSize: baseSize * (percentage / 100)); return baseStyle.copyWith(fontSize: baseSize * (percentage / 100));
} else { } else {
final size = num.tryParse(param); final size = num.tryParse(param);
if (size == null || size <= 0) return baseStyle; if (size == null || size <= 0) return baseStyle;
return baseStyle.copyWith(fontSize: size.toDouble()); final realSize = baseSize * (size / 1000);
return baseStyle.copyWith(fontSize: realSize.toDouble().clamp(8, 400));
} }
} }
), ),

2
lib/widgets/messages/messages_session_header.dart
View file

@ -131,7 +131,7 @@ class SessionTile extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text(session.name), FormattedText(session.formattedName),
Text("${session.sessionUsers.length}/${session.maxUsers} active users") Text("${session.sessionUsers.length}/${session.maxUsers} active users")
], ],
), ),