Merge branch 'feature/layout-contraints' into develop

Author: pyby

Sources/SRGIdentity/SRGIdentityLoginViewController~tvos.m

@@ -93,13 +93,13 @@ - (void)viewDidDisappear:(BOOL)animated
 - (void)loadCredentialsStackViewInView:(UIView *)view
 {
     UIStackView *credentialsStackView = [[UIStackView alloc] init];
-    credentialsStackView.translatesAutoresizingMaskIntoConstraints = NO;
     credentialsStackView.axis = UILayoutConstraintAxisVertical;
     credentialsStackView.alignment = UIStackViewAlignmentCenter;
     credentialsStackView.distribution = UIStackViewDistributionFill;
     credentialsStackView.spacing = 40.f;
     [view addSubview:credentialsStackView];
 
+    credentialsStackView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [credentialsStackView.centerXAnchor constraintEqualToAnchor:view.centerXAnchor],
         [credentialsStackView.centerYAnchor constraintEqualToAnchor:view.centerYAnchor],
@@ -125,10 +125,10 @@ - (void)loadFixedSpacerWithHeight:(CGFloat)height inStackView:(UIStackView *)sta
 {
     // Zero height, but adds two stack spacing contributions and thus some spacing
     UIView *spacerView = [[UIView alloc] init];
-    spacerView.translatesAutoresizingMaskIntoConstraints = NO;
     spacerView.backgroundColor = UIColor.clearColor;
     [stackView addArrangedSubview:spacerView];
 
+    spacerView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [spacerView.widthAnchor constraintEqualToAnchor:stackView.widthAnchor],
         [spacerView.heightAnchor constraintEqualToConstant:height]
@@ -138,7 +138,6 @@ - (void)loadFixedSpacerWithHeight:(CGFloat)height inStackView:(UIStackView *)sta
 - (void)loadEmailAddressTextFieldInStackView:(UIStackView *)stackView
 {
     UITextField *emailAddressTextField = [[UITextField alloc] init];
-    emailAddressTextField.translatesAutoresizingMaskIntoConstraints = NO;
     emailAddressTextField.text = self.emailAddress;
     emailAddressTextField.placeholder = SRGIdentityLocalizedString(@"Email address", @"Email address text field placeholder on Apple TV");
     emailAddressTextField.font = [SRGFont fontWithStyle:SRGFontStyleButton];
@@ -148,6 +147,7 @@ - (void)loadEmailAddressTextFieldInStackView:(UIStackView *)stackView
     [stackView addArrangedSubview:emailAddressTextField];
     self.emailAddressTextField = emailAddressTextField;
 
+    emailAddressTextField.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [emailAddressTextField.widthAnchor constraintEqualToAnchor:stackView.widthAnchor],
         [emailAddressTextField.heightAnchor constraintEqualToConstant:70.f]
@@ -157,7 +157,6 @@ - (void)loadEmailAddressTextFieldInStackView:(UIStackView *)stackView
 - (void)loadPasswordTextFieldInStackView:(UIStackView *)stackView
 {
     UITextField *passwordTextField = [[UITextField alloc] init];
-    passwordTextField.translatesAutoresizingMaskIntoConstraints = NO;
     passwordTextField.delegate = self;
     passwordTextField.placeholder = SRGIdentityLocalizedString(@"Password", @"Password text field placeholder on Apple TV");
     passwordTextField.font = [SRGFont fontWithStyle:SRGFontStyleButton];
@@ -167,6 +166,7 @@ - (void)loadPasswordTextFieldInStackView:(UIStackView *)stackView
     [stackView addArrangedSubview:passwordTextField];
     self.passwordTextField = passwordTextField;
 
+    passwordTextField.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [passwordTextField.widthAnchor constraintEqualToAnchor:stackView.widthAnchor],
         [passwordTextField.heightAnchor constraintEqualToConstant:70.f]
@@ -186,12 +186,12 @@ - (void)loadLoginButtonInStackView:(UIStackView *)stackView
 - (void)loadInstructionsStackViewInView:(UIView *)view
 {
     UIStackView *instructionsStackView = [[UIStackView alloc] init];
-    instructionsStackView.translatesAutoresizingMaskIntoConstraints = NO;
     instructionsStackView.axis = UILayoutConstraintAxisVertical;
     instructionsStackView.alignment = UIStackViewAlignmentFill;
     instructionsStackView.distribution = UIStackViewDistributionFill;
     [view addSubview:instructionsStackView];
 
+    instructionsStackView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [instructionsStackView.centerXAnchor constraintEqualToAnchor:view.centerXAnchor],
         [instructionsStackView.bottomAnchor constraintEqualToAnchor:view.bottomAnchor constant:-38.f],

Sources/SRGIdentity/SRGIdentityModalTransition~ios.m

@@ -56,9 +56,7 @@ - (void)setupTransition:(id<UIViewControllerContextTransitioning>)transitionCont
 
     UIView *containerView = [transitionContext containerView];
 
-    UIView *dimmingView = [[UIView alloc] initWithFrame:containerView.bounds];
-    dimmingView.frame = containerView.bounds;
-    dimmingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    UIView *dimmingView = [[UIView alloc] init];
     dimmingView.backgroundColor = [UIColor colorWithWhite:0.f alpha:0.3f];
     self.dimmingView = dimmingView;
 
@@ -78,6 +76,14 @@ - (void)setupTransition:(id<UIViewControllerContextTransitioning>)transitionCont
         [containerView insertSubview:toView atIndex:0];
     }
 
+    dimmingView.translatesAutoresizingMaskIntoConstraints = NO;
+    [NSLayoutConstraint activateConstraints:@[
+        [dimmingView.topAnchor constraintEqualToAnchor:containerView.topAnchor],
+        [dimmingView.bottomAnchor constraintEqualToAnchor:containerView.bottomAnchor],
+        [dimmingView.leadingAnchor constraintEqualToAnchor:containerView.leadingAnchor],
+        [dimmingView.trailingAnchor constraintEqualToAnchor:containerView.trailingAnchor]
+    ]];
+    
     [self updateTransition:transitionContext withProgress:0.f];
 }
 

Sources/SRGIdentity/SRGIdentityWebViewController~ios.m

@@ -116,14 +116,14 @@ - (void)viewWillLayoutSubviews
 
 - (void)layoutWebViewInView:(UIView *)view
 {
-    WKWebView *webView = [[WKWebView alloc] initWithFrame:view.bounds];
+    WKWebView *webView = [[WKWebView alloc] init];
     webView.backgroundColor = UIColor.clearColor;
-    webView.translatesAutoresizingMaskIntoConstraints = NO;
     webView.navigationDelegate = self;
     webView.scrollView.delegate = self;
     [view addSubview:webView];
     self.webView = webView;
 
+    webView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [webView.leadingAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.leadingAnchor],
         [webView.trailingAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.trailingAnchor],
@@ -135,10 +135,10 @@ - (void)layoutWebViewInView:(UIView *)view
 - (void)layoutProgressViewInView:(UIView *)view
 {
     UIProgressView *progressView = [[UIProgressView alloc] init];
-    progressView.translatesAutoresizingMaskIntoConstraints = NO;
     [view addSubview:progressView];
     self.progressView = progressView;
 
+    progressView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [progressView.topAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.topAnchor],
         [progressView.leadingAnchor constraintEqualToAnchor:view.leadingAnchor],
@@ -149,12 +149,12 @@ - (void)layoutProgressViewInView:(UIView *)view
 - (void)layoutErrorLabelInView:(UIView *)view
 {
     UILabel *errorLabel = [[UILabel alloc] init];
-    errorLabel.translatesAutoresizingMaskIntoConstraints = NO;
     errorLabel.font = [UIFont systemFontOfSize:20.f];
     errorLabel.textColor = UIColor.grayColor;
     [view addSubview:errorLabel];
     self.errorLabel = errorLabel;
 
+    errorLabel.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [errorLabel.centerYAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.centerYAnchor],
         [errorLabel.leadingAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.leadingAnchor constant:40.f],