oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'mkirk/perf-tweaks'

Browse source
This commit is contained in:
Michael Kirk 2018-12-17 14:44:56 -07:00
parent 6764d3e754 fd6a56b3af
commit 7245307c92
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
View file

@ -222,17 +222,11 @@ const CGFloat kMaxTextViewHeight = 98;
// Momentarily switch to a non-default keyboard, else reloadInputViews
// will not affect the displayed keyboard. In practice this isn't perceptable to the user.
// The alternative would be to dismiss-and-pop the keyboard, but that can cause a more pronounced animation.
//
// This is surprisingly expensive (~5ms), so we do it async, *after* the message is rendered.
dispatch_async(dispatch_get_main_queue(), ^{
[BenchManager benchWithTitle:@"toggleDefaultKeyboard" block:^{
self.inputTextView.keyboardType = UIKeyboardTypeNumbersAndPunctuation;
[self.inputTextView reloadInputViews];
self.inputTextView.keyboardType = UIKeyboardTypeNumbersAndPunctuation;
[self.inputTextView reloadInputViews];
self.inputTextView.keyboardType = UIKeyboardTypeDefault;
[self.inputTextView reloadInputViews];
}];
});
self.inputTextView.keyboardType = UIKeyboardTypeDefault;
[self.inputTextView reloadInputViews];
}
- (void)setQuotedReply:(nullable OWSQuotedReplyModel *)quotedReply

19
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View file

@ -3898,10 +3898,21 @@ typedef enum : NSUInteger {
[self messageWasSent:message];
if (updateKeyboardState) {
[self.inputToolbar toggleDefaultKeyboard];
}
[self.inputToolbar clearTextMessageAnimated:YES];
dispatch_async(dispatch_get_main_queue(), ^{
[BenchManager benchWithTitle:@"toggleDefaultKeyboard"
block:^{
if (updateKeyboardState) {
[self.inputToolbar toggleDefaultKeyboard];
}
}];
[BenchManager benchWithTitle:@"clearTextMessageAnimated"
block:^{
[self.inputToolbar clearTextMessageAnimated:YES];
}];
});
[self clearDraft];
if (didAddToProfileWhitelist) {
[self.conversationViewModel ensureDynamicInteractions];

3
SignalMessaging/utils/Bench.swift
View file

@ -18,7 +18,8 @@ public func BenchAsync(title: String, block: (@escaping () -> Void) -> Void) {
block {
let timeElapsed = CFAbsoluteTimeGetCurrent() - startTime
Logger.debug("[Bench] title: \(title), duration: \(timeElapsed)")
let formattedTime = String(format: "%0.2fms", timeElapsed * 1000)
Logger.debug("[Bench] title: \(title), duration: \(formattedTime)")
}
}