diff options
author | Vitaly Takmazov | 2018-04-01 23:03:29 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2018-04-01 23:03:29 +0300 |
commit | c623f12b2d5e95708a3971e642410c9098f71285 (patch) | |
tree | 795caed3887d28c3cf80fe10fe920a9d9f4268b5 /Juick/ViewControllers | |
parent | 677397be225a3b34f4b26e573fd067f73f9eb75c (diff) |
fix navigation
Diffstat (limited to 'Juick/ViewControllers')
-rw-r--r-- | Juick/ViewControllers/DiscoverViewController.m | 2 | ||||
-rw-r--r-- | Juick/ViewControllers/LoginViewController.m | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Juick/ViewControllers/DiscoverViewController.m b/Juick/ViewControllers/DiscoverViewController.m index fde23ee..11010ae 100644 --- a/Juick/ViewControllers/DiscoverViewController.m +++ b/Juick/ViewControllers/DiscoverViewController.m @@ -75,7 +75,7 @@ AppDelegate *appDelegate; } - (IBAction)filterAction:(id)sender { if (![User isAuthenticated]) { - [self performSegueWithIdentifier:@"loginSegue" sender:self]; + [self.navigationController performSegueWithIdentifier:@"loginSegue" sender:self.navigationController]; return; } UIAlertController *filterAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet]; diff --git a/Juick/ViewControllers/LoginViewController.m b/Juick/ViewControllers/LoginViewController.m index fd3c2b0..917d563 100644 --- a/Juick/ViewControllers/LoginViewController.m +++ b/Juick/ViewControllers/LoginViewController.m @@ -52,7 +52,7 @@ transition.subtype = kCATransitionFromTop; [self.navigationController.view.layer addAnimation:transition forKey:kCATransition]; - [self.navigationController popViewControllerAnimated:NO]; + [self.navigationController dismissViewControllerAnimated:NO completion:nil]; } - (void) doneSignIn { @@ -68,7 +68,7 @@ transition.subtype = kCATransitionFromTop; [self.navigationController.view.layer addAnimation:transition forKey:kCATransition]; - [self.navigationController popToRootViewControllerAnimated:NO]; + [self.navigationController dismissViewControllerAnimated:NO completion:nil]; } else { [User throwUnableToLogin:self]; } |