From 114df183722a4b56850e2bf07f32915ec670766d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 9 Feb 2018 17:26:38 -0500 Subject: [PATCH] Refine SAE UI. --- .../SharingThreadPickerViewController.m | 6 ++++++ .../contacts/CountryCodeViewController.h | 2 ++ .../contacts/CountryCodeViewController.m | 10 ++++++---- .../contacts/SelectRecipientViewController.h | 2 ++ .../contacts/SelectRecipientViewController.m | 15 ++++++++++----- .../contacts/SelectThreadViewController.m | 1 + SignalShareExtension/ShareViewController.swift | 5 +---- 7 files changed, 28 insertions(+), 13 deletions(-) diff --git a/SignalMessaging/attachments/SharingThreadPickerViewController.m b/SignalMessaging/attachments/SharingThreadPickerViewController.m index b42946c6b..b4d55a890 100644 --- a/SignalMessaging/attachments/SharingThreadPickerViewController.m +++ b/SignalMessaging/attachments/SharingThreadPickerViewController.m @@ -149,6 +149,12 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); NSString *_Nullable messageText = [self convertAttachmentToMessageTextIfPossible]; + // Hide the navigation bar before presenting the approval view. + // + // Note that cancelling in the approval views will dismiss the entire + // share extension, so there is no "back" button. + self.navigationController.navigationBarHidden = YES; + if (messageText) { MessageApprovalViewController *approvalVC = [[MessageApprovalViewController alloc] initWithMessageText:messageText diff --git a/SignalMessaging/contacts/CountryCodeViewController.h b/SignalMessaging/contacts/CountryCodeViewController.h index 1bf349ea5..525db4f9b 100644 --- a/SignalMessaging/contacts/CountryCodeViewController.h +++ b/SignalMessaging/contacts/CountryCodeViewController.h @@ -21,4 +21,6 @@ @property (nonatomic, weak) id countryCodeDelegate; +@property (nonatomic) BOOL isPresentedInNavigationController; + @end diff --git a/SignalMessaging/contacts/CountryCodeViewController.m b/SignalMessaging/contacts/CountryCodeViewController.m index 168c01f88..8b81bfacd 100644 --- a/SignalMessaging/contacts/CountryCodeViewController.m +++ b/SignalMessaging/contacts/CountryCodeViewController.m @@ -31,10 +31,12 @@ self.countryCodes = [PhoneNumberUtil countryCodesForSearchTerm:nil]; - self.navigationItem.leftBarButtonItem = - [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop - target:self - action:@selector(dismissWasPressed:)]; + if (!self.isPresentedInNavigationController) { + self.navigationItem.leftBarButtonItem = + [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop + target:self + action:@selector(dismissWasPressed:)]; + } [self createViews]; } diff --git a/SignalMessaging/contacts/SelectRecipientViewController.h b/SignalMessaging/contacts/SelectRecipientViewController.h index 0feb80427..f6a69d8af 100644 --- a/SignalMessaging/contacts/SelectRecipientViewController.h +++ b/SignalMessaging/contacts/SelectRecipientViewController.h @@ -40,6 +40,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) ContactsViewHelper *contactsViewHelper; +@property (nonatomic) BOOL isPresentedInNavigationController; + @end NS_ASSUME_NONNULL_END diff --git a/SignalMessaging/contacts/SelectRecipientViewController.m b/SignalMessaging/contacts/SelectRecipientViewController.m index 1359f26bd..534da5bef 100644 --- a/SignalMessaging/contacts/SelectRecipientViewController.m +++ b/SignalMessaging/contacts/SelectRecipientViewController.m @@ -238,10 +238,10 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien callingCode:(NSString *)callingCode countryCode:(NSString *)countryCode { - _callingCode = callingCode; - NSString *title = [NSString stringWithFormat:@"%@ (%@)", callingCode, countryCode.uppercaseString]; + NSString *titleFormat = ([UIView new].isRTL ? @"(%2$@) %1$@" : @"%1$@ (%2$@)"); + NSString *title = [NSString stringWithFormat:titleFormat, callingCode, countryCode.uppercaseString]; [self.countryCodeButton setTitle:title forState:UIControlStateNormal]; [self.countryCodeButton layoutSubviews]; @@ -263,9 +263,14 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien { CountryCodeViewController *countryCodeController = [CountryCodeViewController new]; countryCodeController.countryCodeDelegate = self; - UINavigationController *navigationController = - [[UINavigationController alloc] initWithRootViewController:countryCodeController]; - [self presentViewController:navigationController animated:YES completion:[UIUtil modalCompletionBlock]]; + countryCodeController.isPresentedInNavigationController = self.isPresentedInNavigationController; + if (self.isPresentedInNavigationController) { + [self.navigationController pushViewController:countryCodeController animated:YES]; + } else { + UINavigationController *navigationController = + [[UINavigationController alloc] initWithRootViewController:countryCodeController]; + [self presentViewController:navigationController animated:YES completion:[UIUtil modalCompletionBlock]]; + } } - (void)phoneNumberButtonPressed diff --git a/SignalMessaging/contacts/SelectThreadViewController.m b/SignalMessaging/contacts/SelectThreadViewController.m index 198fc3ab2..fbf6940ed 100644 --- a/SignalMessaging/contacts/SelectThreadViewController.m +++ b/SignalMessaging/contacts/SelectThreadViewController.m @@ -181,6 +181,7 @@ NS_ASSUME_NONNULL_BEGIN NewNonContactConversationViewController *viewController = [NewNonContactConversationViewController new]; viewController.nonContactConversationDelegate = weakSelf; + viewController.isPresentedInNavigationController = YES; [weakSelf.navigationController pushViewController:viewController animated:YES]; }]]; diff --git a/SignalShareExtension/ShareViewController.swift b/SignalShareExtension/ShareViewController.swift index eadbe8cf6..d80c7ba19 100644 --- a/SignalShareExtension/ShareViewController.swift +++ b/SignalShareExtension/ShareViewController.swift @@ -10,7 +10,7 @@ import SignalServiceKit import PromiseKit @objc -public class ShareViewController: UINavigationController, ShareViewDelegate, SAEFailedViewDelegate { +public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailedViewDelegate { enum ShareViewControllerError: Error { case assertionError(description: String) @@ -105,8 +105,6 @@ public class ShareViewController: UINavigationController, ShareViewDelegate, SAE self.versionMigrationsDidComplete() }) - self.isNavigationBarHidden = true - // We don't need to use "screen protection" in the SAE. // Ensure OWSContactsSyncing is instantiated. @@ -470,7 +468,6 @@ public class ShareViewController: UINavigationController, ShareViewDelegate, SAE self.buildAttachment().then { attachment -> Void in let conversationPicker = SharingThreadPickerViewController(shareViewDelegate: self) conversationPicker.attachment = attachment - self.shareViewNavigationController.isNavigationBarHidden = true self.progressPoller = nil self.loadViewController = nil self.showPrimaryViewController(conversationPicker)