Skip to content

Hide cancel button #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 18, 2018
Merged

Hide cancel button #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8121923
hideCancelButton implementation
najdanovicivan May 17, 2018
3e84fdd
Removed line break to keep the same code style
najdanovicivan May 17, 2018
0d68466
renamed hideCancelButton to shouldHideCancelButton
najdanovicivan May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions FirebaseAuthUI/FUIAuth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@ __attribute__((deprecated("Instead use authUI:didSignInWithAuthDataResult:error:
*/
@property(nonatomic, assign) BOOL allowNewEmailAccounts;

/** @property shouldHideCancelButton
@brief Whether to hide the canel button, defaults to NO.
*/
@property(nonatomic, assign) BOOL shouldHideCancelButton;

/** @property customStringsBundle
@brief Custom strings bundle supplied by the developer. Nil when there is no custom strings
bundle set. In which case the default bundle will be used.
Expand Down
12 changes: 7 additions & 5 deletions FirebaseAuthUI/FUIAuthPickerViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,13 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil
- (void)viewDidLoad {
[super viewDidLoad];

UIBarButtonItem *cancelBarButton =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self
action:@selector(cancelAuthorization)];
self.navigationItem.leftBarButtonItem = cancelBarButton;
if (!self.authUI.shouldHideCancelButton) {
UIBarButtonItem *cancelBarButton =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self
action:@selector(cancelAuthorization)];
self.navigationItem.leftBarButtonItem = cancelBarButton;
}
self.navigationItem.backBarButtonItem =
[[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back)
style:UIBarButtonItemStylePlain
Expand Down
12 changes: 7 additions & 5 deletions FirebaseAuthUI/FUIEmailEntryViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,13 @@ - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];

if (self.navigationController.viewControllers.firstObject == self) {
UIBarButtonItem *cancelBarButton =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self
action:@selector(cancelAuthorization)];
self.navigationItem.leftBarButtonItem = cancelBarButton;
if (!self.authUI.shouldHideCancelButton) {
UIBarButtonItem *cancelBarButton =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self
action:@selector(cancelAuthorization)];
self.navigationItem.leftBarButtonItem = cancelBarButton;
}
self.navigationItem.backBarButtonItem =
[[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back)
style:UIBarButtonItemStylePlain
Expand Down
28 changes: 15 additions & 13 deletions FirebaseAuthUI/FUIPasswordSignInViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,22 @@ - (void)viewDidLoad {
}

- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];

if (self.navigationController.viewControllers.firstObject == self) {
UIBarButtonItem *cancelBarButton =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self
action:@selector(cancelAuthorization)];
self.navigationItem.leftBarButtonItem = cancelBarButton;
self.navigationItem.backBarButtonItem =
[[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back)
style:UIBarButtonItemStylePlain
target:nil
action:nil];
[super viewWillAppear:animated];

if (self.navigationController.viewControllers.firstObject == self) {
if (!self.authUI.shouldHideCancelButton) {
UIBarButtonItem *cancelBarButton =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self
action:@selector(cancelAuthorization)];
self.navigationItem.leftBarButtonItem = cancelBarButton;
}
self.navigationItem.backBarButtonItem =
[[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back)
style:UIBarButtonItemStylePlain
target:nil
action:nil];
}
}

#pragma mark - Actions
Expand Down
19 changes: 14 additions & 5 deletions FirebasePhoneAuthUI/FUIPhoneEntryViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,20 @@ - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];

if (self.navigationController.viewControllers.firstObject == self) {
UIBarButtonItem *cancelBarButton =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self
action:@selector(cancelAuthorization)];
self.navigationItem.leftBarButtonItem = cancelBarButton;
if (self.authUI.providers.count != 1){
UIBarButtonItem *cancelBarButton =
[[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back)
style:UIBarButtonItemStylePlain
target:self
action:@selector(cancelAuthorization)];
self.navigationItem.leftBarButtonItem = cancelBarButton;
} else if (!self.authUI.shouldHideCancelButton) {
UIBarButtonItem *cancelBarButton =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self
action:@selector(cancelAuthorization)];
self.navigationItem.leftBarButtonItem = cancelBarButton;
}
self.navigationItem.backBarButtonItem =
[[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back)
style:UIBarButtonItemStylePlain
Expand Down