Merge pull request #5892 from vector-im/andy/5875_login_button

Ensure the login button is always visible
element-hq · Mar 23, 2022 · db26880 · db26880
2 parents 70d39ef + ef45cc0
commit db26880
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 86 deletions.
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.h b/Riot/Modules/Authentication/AuthenticationViewController.h
@@ -31,8 +31,6 @@
 @property (weak, nonatomic) IBOutlet UIButton *skipButton;
 @property (weak, nonatomic) IBOutlet UIButton *forgotPasswordButton;
 
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *submitButtonMinLeadingConstraint;
-
 @property (weak, nonatomic) IBOutlet UIView *serverOptionsContainer;
 @property (weak, nonatomic) IBOutlet UIButton *customServersTickButton;
 @property (weak, nonatomic) IBOutlet UIView *customServersContainer;

diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -1058,17 +1058,6 @@ - (void)updateForgotPwdButtonVisibility
     }
 
     self.forgotPasswordButton.hidden = !showForgotPasswordButton;
-
-    // Adjust minimum leading constraint of the submit button
-    if (self.forgotPasswordButton.isHidden)
-    {
-        self.submitButtonMinLeadingConstraint.constant = 19;
-    }
-    else
-    {
-        CGRect frame = self.forgotPasswordButton.frame;
-        self.submitButtonMinLeadingConstraint.constant =  frame.origin.x + frame.size.width + 10;
-    }
 }
 
 - (void)afterSetPinFlowCompletedWithCredentials:(MXCredentials*)credentials