Unify mobile typography tokens across the app #3162
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| included: | ||
| - ios/T3Code | ||
| - modules/t3-composer-editor/ios | ||
| - modules/t3-terminal/ios | ||
| - modules/t3-review-diff/ios | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -275,8 +275,8 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate { | |
| fileTint: "#737373" | ||
| ) | ||
| private var fontFamily = "DMSans_400Regular" | ||
| private var fontSize: CGFloat = 14 | ||
| private var lineHeight: CGFloat = 20 | ||
| private var contentInsetVertical: CGFloat = 0 | ||
| private var shouldAutoFocus = false | ||
| private var didAutoFocus = false | ||
|
|
@@ -460,9 +460,19 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate { | |
| guard !isApplyingControlledValue else { | ||
| return | ||
| } | ||
| restoreBaseTypingAttributes() | ||
| emitSelection() | ||
| } | ||
|
|
||
| public func textView( | ||
| _ textView: UITextView, | ||
| shouldChangeTextIn range: NSRange, | ||
| replacementText text: String | ||
| ) -> Bool { | ||
| restoreBaseTypingAttributes() | ||
| return true | ||
| } | ||
|
|
||
| public func textViewDidBeginEditing(_ textView: UITextView) { | ||
| onComposerFocus() | ||
| } | ||
|
|
@@ -484,6 +494,7 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate { | |
| let targetSelection = requestedSelection ?? previousSelection | ||
| requestedSelection = nil | ||
| textView.selectedRange = displayRange(for: targetSelection) | ||
| restoreBaseTypingAttributes() | ||
| isApplyingControlledValue = false | ||
| updatePlaceholderVisibility() | ||
| emitContentSizeIfNeeded() | ||
|
|
@@ -556,7 +567,12 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate { | |
| size: image.size, | ||
| baselineOffset: baselineOffset | ||
| ) | ||
| let attributedAttachment = NSMutableAttributedString(attachment: attachment) | ||
| attributedAttachment.addAttributes( | ||
| baseAttributes(), | ||
| range: NSRange(location: 0, length: attributedAttachment.length) | ||
| ) | ||
| return attributedAttachment | ||
| } | ||
|
|
||
| private func renderChip( | ||
|
|
@@ -660,11 +676,18 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate { | |
| let font = UIFont(name: fontFamily, size: fontSize) | ||
| ?? UIFont.systemFont(ofSize: fontSize) | ||
| textView.font = font | ||
| restoreBaseTypingAttributes() | ||
| placeholderLabel.font = font | ||
| setNeedsLayout() | ||
| } | ||
|
|
||
| private func restoreBaseTypingAttributes() { | ||
| guard textView.markedTextRange == nil else { | ||
| return | ||
| } | ||
| textView.typingAttributes = baseAttributes() | ||
| } | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Selection sync skips typing restoreMedium Severity
Additional Locations (1)  Reviewed by Cursor Bugbot for commit 124e471. Configure here. |
||
| private func applyTheme() { | ||
| textView.textColor = UIColor(composerHex: theme.text) ?? .label | ||
| placeholderLabel.textColor = UIColor(composerHex: theme.placeholder) ?? .placeholderText | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inline chips clip line height
Medium Severity
Applying
baseAttributes()to inline attachments inmakeAttachmentStringforces a 20pt line height on token glyphs. This conflicts withrenderChipstill drawing 24pt tall chip images, causing file/skill chips to clip or misalign in the composer.Reviewed by Cursor Bugbot for commit 124e471. Configure here.