shadowfacts/Tusker
2
10
Fork 2
Code Issues 77 Pull Requests Releases Wiki Activity

Put compose text view attributed string behavior behind feature flag

Browse Source
This commit is contained in:
Shadowfacts 2025-02-06 13:33:42 -05:00
parent e9e08bdadd
commit 96f5ea8af1
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Packages/ComposeUI/Sources/ComposeUI/Views/NewMainTextView.swift
View File

@ -139,12 +139,14 @@ private final class WrappedTextViewCoordinator: NSObject {
attributedText.string.replacingOccurrences(of: "\u{FFFC}", with: "") attributedText.string.replacingOccurrences(of: "\u{FFFC}", with: "")
} }
@MainActor
private func attributedTextFromPlain(_ text: String) -> NSAttributedString { private func attributedTextFromPlain(_ text: String) -> NSAttributedString {
let str = NSMutableAttributedString(string: text) let str = NSMutableAttributedString(string: text)
str.addAttributes([ str.addAttributes([
.foregroundColor: UIColor.label, .foregroundColor: UIColor.label,
.font: UIFontMetrics.default.scaledFont(for: .systemFont(ofSize: 20)), .font: UIFontMetrics.default.scaledFont(for: .systemFont(ofSize: 20)),
], range: NSRange(location: 0, length: str.length)) ], range: NSRange(location: 0, length: str.length))
if Preferences.shared.hasFeatureFlag(.composeTextAttributes) {
let mentionMatches = CharacterCounter.mention.matches(in: text, range: NSRange(location: 0, length: str.length)) let mentionMatches = CharacterCounter.mention.matches(in: text, range: NSRange(location: 0, length: str.length))
for match in mentionMatches.reversed() { for match in mentionMatches.reversed() {
str.insert(NSAttributedString(attachment: Self.attachment), at: match.range.location) str.insert(NSAttributedString(attachment: Self.attachment), at: match.range.location)
@ -154,16 +156,23 @@ private final class WrappedTextViewCoordinator: NSObject {
.foregroundColor: UIColor.tintColor, .foregroundColor: UIColor.tintColor,
], range: range) ], range: range)
} }
}
return str return str
} }
@MainActor
func updateTextViewTextIfNecessary(_ text: String, textView: UITextView) { func updateTextViewTextIfNecessary(_ text: String, textView: UITextView) {
if text != plainTextFromAttributed(textView.attributedText) { if text != plainTextFromAttributed(textView.attributedText) {
textView.attributedText = attributedTextFromPlain(text) textView.attributedText = attributedTextFromPlain(text)
} }
} }
@MainActor
private func updateAttributes(in textView: UITextView) { private func updateAttributes(in textView: UITextView) {
guard Preferences.shared.hasFeatureFlag(.composeTextAttributes) else {
return
}
let str = NSMutableAttributedString(attributedString: textView.attributedText!) let str = NSMutableAttributedString(attributedString: textView.attributedText!)
var changed = false var changed = false
var cursorOffset = 0 var cursorOffset = 0

1
Packages/TuskerPreferences/Sources/TuskerPreferences/Supporting Types/FeatureFlag.swift
View File

@ -10,5 +10,6 @@ import Foundation
public enum FeatureFlag: String, Codable { public enum FeatureFlag: String, Codable {
case iPadBrowserNavigation = "ipad-browser-navigation" case iPadBrowserNavigation = "ipad-browser-navigation"
case composeRewrite = "compose-rewrite" case composeRewrite = "compose-rewrite"
case composeTextAttributes = "compose-text-attributes"
case pushNotifCustomEmoji = "push-notif-custom-emoji" case pushNotifCustomEmoji = "push-notif-custom-emoji"
} }