8052441bd7
- Fix sheet backgrounds in dark mode. - Fix background colours for reaction buttons. - Reply view layout. - Update separator colours. - Don't show sender name/avatar in DMs. - Fix inconsistent line heights with formatted body text. - Use plain text for reply - Increase tappable size of collapsed state changes button. - Blockquote layout and text colour. - Tap to expand the topic in room details. - Change the topic and security font size in room details. - Add cancel button when inviting someone to an existing room. - Reword Add Friends to Add People in start chat screen. - Update compound.
84 lines
3.0 KiB
Objective-C
84 lines
3.0 KiB
Objective-C
//
|
|
// Copyright 2022 New Vector Ltd
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
#import "UIFont+AttributedStringBuilder.h"
|
|
|
|
@import UIKit;
|
|
@import CoreText;
|
|
@import ObjectiveC;
|
|
|
|
#pragma mark - UIFont DTCoreText fix
|
|
|
|
@interface UIFont (vc_DTCoreTextFix)
|
|
|
|
+ (UIFont *)vc_fixedFontWithCTFont:(CTFontRef)ctFont;
|
|
|
|
@end
|
|
|
|
@implementation UIFont (vc_DTCoreTextFix)
|
|
|
|
+ (UIFont *)vc_fixedFontWithCTFont:(CTFontRef)ctFont {
|
|
NSString *fontName = (__bridge_transfer NSString *)CTFontCopyName(ctFont, kCTFontPostScriptNameKey);
|
|
|
|
CGFloat fontSize = CTFontGetSize(ctFont);
|
|
UIFont *font = [UIFont fontWithName:fontName size:fontSize];
|
|
|
|
// On iOS 13+ "TimesNewRomanPSMT" will be used instead of "SFUI"
|
|
// In case of "Times New Roman" fallback, use system font and reuse UIFontDescriptorSymbolicTraits.
|
|
if ([font.familyName.lowercaseString containsString:@"times"]) {
|
|
UIFontDescriptorSymbolicTraits symbolicTraits = (UIFontDescriptorSymbolicTraits)CTFontGetSymbolicTraits(ctFont);
|
|
|
|
// Start with the body text style and update it to keep consistent line spacing with plain text messages.
|
|
UIFontDescriptor *fontDescriptor = [UIFontDescriptor preferredFontDescriptorWithTextStyle:UIFontTextStyleBody];
|
|
fontDescriptor = [fontDescriptor fontDescriptorWithSize:fontSize];
|
|
fontDescriptor = [fontDescriptor fontDescriptorWithSymbolicTraits:symbolicTraits];
|
|
|
|
font = [UIFont fontWithDescriptor:fontDescriptor size:fontSize];
|
|
}
|
|
|
|
|
|
return font;
|
|
}
|
|
|
|
@end
|
|
|
|
#pragma mark - Implementation
|
|
|
|
@implementation UIFont(DTCoreTextFix)
|
|
|
|
// DTCoreText iOS 13 fix. See issue and comment here: https://github.com/Cocoanetics/DTCoreText/issues/1168#issuecomment-583541514
|
|
// Also see https://github.com/Cocoanetics/DTCoreText/pull/1245 for a possible future solution
|
|
+ (void)load
|
|
{
|
|
static dispatch_once_t onceToken;
|
|
|
|
dispatch_once(&onceToken, ^{
|
|
Class originalClass = object_getClass([UIFont class]);
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wundeclared-selector"
|
|
SEL originalSelector = @selector(fontWithCTFont:); // DTCoreText method we're overriding
|
|
SEL ourSelector = @selector(vc_fixedFontWithCTFont:); // Use custom implementation
|
|
#pragma clang diagnostic pop
|
|
|
|
Method originalMethod = class_getClassMethod(originalClass, originalSelector);
|
|
Method swizzledMethod = class_getClassMethod(originalClass, ourSelector);
|
|
|
|
method_exchangeImplementations(originalMethod, swizzledMethod);
|
|
});
|
|
}
|
|
|
|
@end
|