GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-06 20:19:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/replies-font-size' into 'main'

Browse Source 
fix: Font size settings did not affect replies

Closes #471

See merge request famedly/fluffychat!469
This commit is contained in:
Krille Fear 2021-08-01 13:05:39 +00:00
commit 282fe9c504
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/widgets/event_content/reply_content.dart
View File

@ -21,6 +21,8 @@ class ReplyContent extends StatelessWidget {
final displayEvent = replyEvent != null && timeline != null final displayEvent = replyEvent != null && timeline != null
? replyEvent.getDisplayEvent(timeline) ? replyEvent.getDisplayEvent(timeline)
: replyEvent; : replyEvent;
final fontSize =
DefaultTextStyle.of(context).style.fontSize * AppConfig.fontSizeFactor;
if (displayEvent != null && if (displayEvent != null &&
AppConfig.renderHtml && AppConfig.renderHtml &&
[EventTypes.Message, EventTypes.Encrypted] [EventTypes.Message, EventTypes.Encrypted]
@ -34,7 +36,6 @@ class ReplyContent extends StatelessWidget {
if (displayEvent.messageType == MessageTypes.Emote) { if (displayEvent.messageType == MessageTypes.Emote) {
html = '* $html'; html = '* $html';
} }
final fontSize = DefaultTextStyle.of(context).style.fontSize;
replyBody = HtmlMessage( replyBody = HtmlMessage(
html: html, html: html,
defaultTextStyle: TextStyle( defaultTextStyle: TextStyle(
@ -61,7 +62,7 @@ class ReplyContent extends StatelessWidget {
color: lightText color: lightText
? Colors.white ? Colors.white
: Theme.of(context).textTheme.bodyText2.color, : Theme.of(context).textTheme.bodyText2.color,
fontSize: DefaultTextStyle.of(context).style.fontSize, fontSize: fontSize,
), ),
); );
} }
@ -70,7 +71,7 @@ class ReplyContent extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Container( Container(
width: 3, width: 3,
height: 36, height: fontSize * 2 + 6,
color: lightText ? Colors.white : Theme.of(context).primaryColor, color: lightText ? Colors.white : Theme.of(context).primaryColor,
), ),
SizedBox(width: 6), SizedBox(width: 6),
@ -87,6 +88,7 @@ class ReplyContent extends StatelessWidget {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: color:
lightText ? Colors.white : Theme.of(context).primaryColor, lightText ? Colors.white : Theme.of(context).primaryColor,
fontSize: fontSize,
), ),
), ),
replyBody, replyBody,