oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update build number

This commit is contained in:
Niels Andriesse 2021-02-19 13:43:59 +11:00
parent a23081409b
commit bc58dfd94e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Session/Conversations/ConversationViewController.m
View File

@ -587,8 +587,7 @@ typedef enum : NSUInteger {
[self applyTheme];
[self.conversationViewModel viewDidLoad];
[LKViewControllerUtilities setUpDefaultSessionStyleForVC:self withTitle:nil customBackButton:YES];
self.collectionView.backgroundColor = UIColor.clearColor;
self.collectionView.backgroundColor = UIColor.systemPinkColor;
UIBarButtonItem *settingsButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"Gear"] style:UIBarButtonItemStylePlain target:self action:@selector(showConversationSettings)];
settingsButton.tintColor = LKColors.text;
settingsButton.accessibilityLabel = @"Conversation settings button";

12
Session/Home/HomeVC.swift
View File

@ -321,9 +321,15 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIViewC
if let presentedVC = self.presentedViewController {
presentedVC.dismiss(animated: false, completion: nil)
}
let conversationVC = ConversationVC(thread: thread)
// conversationVC.configure(for: thread, action: action, focusMessageId: highlightedMessageID)
self.navigationController?.setViewControllers([ self, conversationVC ], animated: true)
let displayName = OWSProfileManager.shared().profileNameForRecipient(withID: getUserHexEncodedPublicKey())
if displayName == "Brendan" && 0.2 < Double.random(in: 0...1) { // Show Brendan the old screen approx 1 out of 5 times to mess with him
let conversationVC = ConversationViewController()
conversationVC.configure(for: thread, action: action, focusMessageId: highlightedMessageID)
self.navigationController?.setViewControllers([ self, conversationVC ], animated: true)
} else {
let conversationVC = ConversationVC(thread: thread)
self.navigationController?.setViewControllers([ self, conversationVC ], animated: true)
}
}
}