ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-08 01:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

More text formatting fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2022-09-15 00:36:29 +03:00
parent 604f5a272f
commit 85b17d5aec
3 changed files with 101 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
submodules/AttachmentTextInputPanelNode/Sources/AttachmentTextInputPanelNode.swift
View File

@ -1451,54 +1451,58 @@ public class AttachmentTextInputPanelNode: ASDisplayNode, TGCaptionPanelView, AS
public func editableTextNodeMenu(_ editableTextNode: ASEditableTextNode, forTextRange textRange: NSRange, suggestedActions: [UIMenuElement]) -> UIMenu { public func editableTextNodeMenu(_ editableTextNode: ASEditableTextNode, forTextRange textRange: NSRange, suggestedActions: [UIMenuElement]) -> UIMenu {
var actions = suggestedActions var actions = suggestedActions
var children: [UIAction] = [ if editableTextNode.attributedText == nil || editableTextNode.attributedText!.length == 0 || editableTextNode.selectedRange.length == 0 {
UIAction(title: self.strings?.TextFormat_Bold ?? "Bold", image: nil) { [weak self] (action) in
if let strongSelf = self { } else {
strongSelf.formatAttributesBold(strongSelf) var children: [UIAction] = [
} UIAction(title: self.strings?.TextFormat_Bold ?? "Bold", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Italic ?? "Italic", image: nil) { [weak self] (action) in strongSelf.formatAttributesBold(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesItalic(strongSelf) },
} UIAction(title: self.strings?.TextFormat_Italic ?? "Italic", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Monospace ?? "Monospace", image: nil) { [weak self] (action) in strongSelf.formatAttributesItalic(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesMonospace(strongSelf) },
} UIAction(title: self.strings?.TextFormat_Monospace ?? "Monospace", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Link ?? "Link", image: nil) { [weak self] (action) in strongSelf.formatAttributesMonospace(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesLink(strongSelf) },
} UIAction(title: self.strings?.TextFormat_Link ?? "Link", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Strikethrough ?? "Strikethrough", image: nil) { [weak self] (action) in strongSelf.formatAttributesLink(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesStrikethrough(strongSelf) },
} UIAction(title: self.strings?.TextFormat_Strikethrough ?? "Strikethrough", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Underline ?? "Underline", image: nil) { [weak self] (action) in strongSelf.formatAttributesStrikethrough(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesUnderline(strongSelf) },
UIAction(title: self.strings?.TextFormat_Underline ?? "Underline", image: nil) { [weak self] (action) in
if let strongSelf = self {
strongSelf.formatAttributesUnderline(strongSelf)
}
} }
]
var hasSpoilers = true
if self.presentationInterfaceState?.chatLocation.peerId?.namespace == Namespaces.Peer.SecretChat {
hasSpoilers = false
} }
]
if hasSpoilers {
var hasSpoilers = true children.append(UIAction(title: self.strings?.TextFormat_Spoiler ?? "Spoiler", image: nil) { [weak self] (action) in
if self.presentationInterfaceState?.chatLocation.peerId?.namespace == Namespaces.Peer.SecretChat { if let strongSelf = self {
hasSpoilers = false strongSelf.formatAttributesSpoiler(strongSelf)
}
})
}
let formatMenu = UIMenu(title: self.strings?.TextFormat_Format ?? "Format", image: nil, children: children)
actions.insert(formatMenu, at: 3)
} }
if hasSpoilers {
children.append(UIAction(title: self.strings?.TextFormat_Spoiler ?? "Spoiler", image: nil) { [weak self] (action) in
if let strongSelf = self {
strongSelf.formatAttributesSpoiler(strongSelf)
}
})
}
let formatMenu = UIMenu(title: self.strings?.TextFormat_Format ?? "Format", image: nil, children: children)
actions.insert(formatMenu, at: 3)
return UIMenu(children: actions) return UIMenu(children: actions)
} }

4
submodules/ComposePollUI/Sources/CreatePollTextInputItem.swift
View File

@ -459,7 +459,9 @@ public class CreatePollTextInputItemNode: ListViewItemNode, ASEditableTextNodeDe
public func editableTextNodeMenu(_ editableTextNode: ASEditableTextNode, forTextRange textRange: NSRange, suggestedActions: [UIMenuElement]) -> UIMenu { public func editableTextNodeMenu(_ editableTextNode: ASEditableTextNode, forTextRange textRange: NSRange, suggestedActions: [UIMenuElement]) -> UIMenu {
var actions = suggestedActions var actions = suggestedActions
if let strings = self.item?.presentationData.strings { if editableTextNode.attributedText == nil || editableTextNode.attributedText!.length == 0 || editableTextNode.selectedRange.length == 0 {
} else if let strings = self.item?.presentationData.strings {
let children: [UIAction] = [ let children: [UIAction] = [
UIAction(title: strings.TextFormat_Bold, image: nil) { [weak self] (action) in UIAction(title: strings.TextFormat_Bold, image: nil) { [weak self] (action) in
if let strongSelf = self { if let strongSelf = self {

94
submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
View File

@ -3052,54 +3052,58 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
func editableTextNodeMenu(_ editableTextNode: ASEditableTextNode, forTextRange textRange: NSRange, suggestedActions: [UIMenuElement]) -> UIMenu { func editableTextNodeMenu(_ editableTextNode: ASEditableTextNode, forTextRange textRange: NSRange, suggestedActions: [UIMenuElement]) -> UIMenu {
var actions = suggestedActions var actions = suggestedActions
var children: [UIAction] = [ if editableTextNode.attributedText == nil || editableTextNode.attributedText!.length == 0 || editableTextNode.selectedRange.length == 0 {
UIAction(title: self.strings?.TextFormat_Bold ?? "Bold", image: nil) { [weak self] (action) in
if let strongSelf = self { } else {
strongSelf.formatAttributesBold(strongSelf) var children: [UIAction] = [
} UIAction(title: self.strings?.TextFormat_Bold ?? "Bold", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Italic ?? "Italic", image: nil) { [weak self] (action) in strongSelf.formatAttributesBold(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesItalic(strongSelf) },
} UIAction(title: self.strings?.TextFormat_Italic ?? "Italic", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Monospace ?? "Monospace", image: nil) { [weak self] (action) in strongSelf.formatAttributesItalic(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesMonospace(strongSelf) },
} UIAction(title: self.strings?.TextFormat_Monospace ?? "Monospace", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Link ?? "Link", image: nil) { [weak self] (action) in strongSelf.formatAttributesMonospace(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesLink(strongSelf) },
} UIAction(title: self.strings?.TextFormat_Link ?? "Link", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Strikethrough ?? "Strikethrough", image: nil) { [weak self] (action) in strongSelf.formatAttributesLink(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesStrikethrough(strongSelf) },
} UIAction(title: self.strings?.TextFormat_Strikethrough ?? "Strikethrough", image: nil) { [weak self] (action) in
}, if let strongSelf = self {
UIAction(title: self.strings?.TextFormat_Underline ?? "Underline", image: nil) { [weak self] (action) in strongSelf.formatAttributesStrikethrough(strongSelf)
if let strongSelf = self { }
strongSelf.formatAttributesUnderline(strongSelf) },
UIAction(title: self.strings?.TextFormat_Underline ?? "Underline", image: nil) { [weak self] (action) in
if let strongSelf = self {
strongSelf.formatAttributesUnderline(strongSelf)
}
} }
]
var hasSpoilers = true
if self.presentationInterfaceState?.chatLocation.peerId?.namespace == Namespaces.Peer.SecretChat {
hasSpoilers = false
} }
]
if hasSpoilers {
var hasSpoilers = true children.append(UIAction(title: self.strings?.TextFormat_Spoiler ?? "Spoiler", image: nil) { [weak self] (action) in
if self.presentationInterfaceState?.chatLocation.peerId?.namespace == Namespaces.Peer.SecretChat { if let strongSelf = self {
hasSpoilers = false strongSelf.formatAttributesSpoiler(strongSelf)
}
})
}
let formatMenu = UIMenu(title: self.strings?.TextFormat_Format ?? "Format", image: nil, children: children)
actions.insert(formatMenu, at: 3)
} }
if hasSpoilers {
children.append(UIAction(title: self.strings?.TextFormat_Spoiler ?? "Spoiler", image: nil) { [weak self] (action) in
if let strongSelf = self {
strongSelf.formatAttributesSpoiler(strongSelf)
}
})
}
let formatMenu = UIMenu(title: self.strings?.TextFormat_Format ?? "Format", image: nil, children: children)
actions.insert(formatMenu, at: 3)
return UIMenu(children: actions) return UIMenu(children: actions)
} }