felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 17:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use textDefaultFont in all variants of the InputToolbarView

Browse Source
This commit is contained in:
aringenbach
2023-03-08 17:30:50 +01:00
parent 935e61e1bb
commit 000d8465d0
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.swift
+6 -4
View File
@@ -31,7 +31,7 @@ extension RoomViewController {
if #available(iOS 15.0, *) {
newAttributedString.append(PillsFormatter.mentionPill(withRoomMember: roomMember,
isHighlighted: false,
font: UIFont.systemFont(ofSize: 14)))
font: inputToolbarView.textDefaultFont))
} else {
newAttributedString.appendString(roomMember.displayname.count > 0 ? roomMember.displayname : roomMember.userId)
}
@@ -42,7 +42,7 @@ extension RoomViewController {
if #available(iOS 15.0, *) {
newAttributedString.append(PillsFormatter.mentionPill(withRoomMember: roomMember,
isHighlighted: false,
font: UIFont.systemFont(ofSize: 14)))
font: inputToolbarView.textDefaultFont))
} else {
newAttributedString.appendString(roomMember.displayname.count > 0 ? roomMember.displayname : roomMember.userId)
}
@@ -169,7 +169,9 @@ extension RoomViewController {
// Switching from RTE -> plain, replace markdown links with Pills.
if !wysiwygInputToolbar.textFormattingEnabled, #available(iOS 15.0, *),
let attributedText = wysiwygInputToolbar.attributedTextMessage {
wysiwygInputToolbar.attributedTextMessage = PillsFormatter.insertPills(in: attributedText, roomState: self.roomDataSource.roomState)
wysiwygInputToolbar.attributedTextMessage = PillsFormatter.insertPills(in: attributedText,
roomState: self.roomDataSource.roomState,
font: self.inputToolbarView.textDefaultFont)
}
}
@@ -281,7 +283,7 @@ extension RoomViewController {
return PillsFormatter.mentionPill(withRoomMember: member,
isHighlighted: false,
font: UIFont.systemFont(ofSize: 14))
font: inputToolbarView.textDefaultFont)
}
@objc func showWaitingOtherParticipantHeader() {