Center align sign in with Apple button (#829)

Author: renkelvin

AnonymousAuth/FirebaseAnonymousAuthUI/FUIAnonymousAuth.h

@@ -23,6 +23,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface FUIAnonymousAuth : NSObject <FUIAuthProvider>
 
+/** @property buttonAlignment
+    @brief The alignment of the icon and text of the button.
+ */
+@property(nonatomic, readwrite) FUIButtonAlignment buttonAlignment;
+
 /** @fn init
     @brief Initialize the instance with the default AuthUI. 
  */

Auth/FirebaseAuthUI/FUIAuthProvider.h

@@ -48,6 +48,15 @@ typedef void (^FUIAuthProviderSignInCompletionBlock) (
  */
 typedef NSString *FUIAuthProviderSignInUserInfoKey NS_TYPED_ENUM;
 
+/**
+   @typedef FUIButtonAlignment
+   @brief The alignment of the icon and text of the button.
+*/
+typedef NS_ENUM(NSInteger, FUIButtonAlignment) {
+    FUIButtonAlignmentLeading,
+    FUIButtonAlignmentCenter,
+};
+
 /**
     For Firebase-based authentication operations, use this key to obtain the original auth result
     that was returned from the sign-in operation.
@@ -93,6 +102,11 @@ static FUIAuthProviderSignInUserInfoKey FUIAuthProviderSignInUserInfoKeyAuthData
  */
 @property(nonatomic, strong, readonly) UIColor *buttonTextColor;
 
+/** @property buttonAlignment
+    @brief The alignment of the icon and text of the button.
+ */
+@property(nonatomic, readwrite) FUIButtonAlignment buttonAlignment;
+
 /** @fn signInWithEmail:presentingViewController:completion:
     @brief Called when the user wants to sign in using this auth provider.
     @remarks Implementors should invoke the completion block when the sign-in process has terminated

Auth/FirebaseAuthUI/FUIAuthSignInButton.h

@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-@protocol FUIAuthProvider;
+#import "FUIAuthProvider.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -53,7 +53,8 @@ NS_ASSUME_NONNULL_BEGIN
               image:(UIImage *)image
                text:(NSString *)text
     backgroundColor:(UIColor *)backgroundColor
-          textColor:(UIColor *)textColor NS_DESIGNATED_INITIALIZER;
+          textColor:(UIColor *)textColor
+    buttonAlignment:(FUIButtonAlignment)buttonAlignment NS_DESIGNATED_INITIALIZER;
 
 /** @fn initWithFrame:providerUI:
     @brief Convenience initalizer.

Auth/FirebaseAuthUI/FUIAuthSignInButton.m

@@ -52,7 +52,8 @@ - (instancetype)initWithFrame:(CGRect)frame
                         image:(UIImage *)image
                          text:(NSString *)text
               backgroundColor:(UIColor *)backgroundColor
-                    textColor:(UIColor *)textColor {
+                    textColor:(UIColor *)textColor
+              buttonAlignment:(FUIButtonAlignment)buttonAlignment {
   self = [super initWithFrame:frame];
   if (!self) {
     return nil;
@@ -66,7 +67,11 @@ - (instancetype)initWithFrame:(CGRect)frame
   [self setImage:image forState:UIControlStateNormal];
 
   CGFloat paddingTitle = 8.0f;
+  CGFloat contentWidth = self.imageView.frame.size.width + paddingTitle + self.titleLabel.frame.size.width;
   CGFloat paddingImage = 8.0f;
+  if (buttonAlignment == FUIButtonAlignmentCenter) {
+    paddingImage = (frame.size.width - contentWidth) / 2 - 4.0f;
+  }
   BOOL isLTRLayout = [[UIApplication sharedApplication] userInterfaceLayoutDirection] ==
       UIUserInterfaceLayoutDirectionLeftToRight;
   if (isLTRLayout) {
@@ -101,7 +106,8 @@ - (instancetype)initWithFrame:(CGRect)frame providerUI:(id<FUIAuthProvider>)prov
                        image:providerUI.icon
                         text:providerUI.signInLabel
              backgroundColor:providerUI.buttonBackgroundColor
-                   textColor:providerUI.buttonTextColor];
+                   textColor:providerUI.buttonTextColor
+             buttonAlignment:providerUI.buttonAlignment];
 }
 
 @end

EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.h

@@ -36,6 +36,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, strong, readwrite, nullable) NSString *emailLink;
 
+/** @property buttonAlignment
+    @brief The alignment of the icon and text of the button.
+ */
+@property(nonatomic, readwrite) FUIButtonAlignment buttonAlignment;
+
 /** @fn initAuthAuthUI:signInMethod:forceSameDevice:allowNewEmailAccounts:actionCodeSetting:
     @brief Initializer with several configurations.
     @param authUI The auth UI object that this auth UI provider associate with.

FacebookAuth/FirebaseFacebookAuthUI/FUIFacebookAuth.h

@@ -38,6 +38,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, readonly, copy) NSArray<NSString *> *scopes;
 
+/** @property buttonAlignment
+    @brief The alignment of the icon and text of the button.
+ */
+@property(nonatomic, readwrite) FUIButtonAlignment buttonAlignment;
+
 /** @fn init
     @brief Conevenience initializer. Uses a default permission of `@[ "email" ]`.
  */

GoogleAuth/FirebaseGoogleAuthUI/FUIGoogleAuth.h

@@ -50,6 +50,11 @@ static NSString *const kGoogleUserInfoProfileScope = @"https://www.googleapis.co
  */
 @property(nonatomic, copy, readonly) NSArray<NSString *> *scopes;
 
+/** @property buttonAlignment
+    @brief The alignment of the icon and text of the button.
+ */
+@property(nonatomic, readwrite) FUIButtonAlignment buttonAlignment;
+
 /** @fn init
     @brief Convenience initializer. Calls designated init with default
         scopes of "email" and "profile".

OAuth/FirebaseOAuthUI/FUIOAuth.h

@@ -23,6 +23,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface FUIOAuth : NSObject <FUIAuthProvider>
 
+/** @property buttonAlignment
+    @brief The alignment of the icon and text of the button.
+ */
+@property(nonatomic, readwrite) FUIButtonAlignment buttonAlignment;
+
 /** @fn init
     @brief Please use `initWithAuthUI:providerID:providerName:buttonColor:iconImage:scopes:
         customParameters:` instead.

OAuth/FirebaseOAuthUI/FUIOAuth.m

@@ -185,16 +185,18 @@ + (FUIOAuth *)yahooAuthProvider {
 }
 
 + (FUIOAuth *)appleAuthProvider {
-  return [[FUIOAuth alloc] initWithAuthUI:[FUIAuth defaultAuthUI]
-                               providerID:@"apple.com"
-                          buttonLabelText:@"Sign in with Apple"
-                                shortName:@"Apple"
-                              buttonColor:[UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0]
-                                iconImage:[FUIAuthUtils imageNamed:@"ic_apple"
-                                               fromBundleNameOrNil:@"FirebaseOAuthUI"]
-                                   scopes:@[@"name", @"email"]
-                         customParameters:nil
-                             loginHintKey:nil];
+  FUIOAuth *provider = [[FUIOAuth alloc] initWithAuthUI:[FUIAuth defaultAuthUI]
+                                             providerID:@"apple.com"
+                                        buttonLabelText:@"Sign in with Apple"
+                                              shortName:@"Apple"
+                                            buttonColor:[UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0]
+                                              iconImage:[FUIAuthUtils imageNamed:@"ic_apple"
+                                                             fromBundleNameOrNil:@"FirebaseOAuthUI"]
+                                                 scopes:@[@"name", @"email"]
+                                       customParameters:nil
+                                           loginHintKey:nil];
+  provider.buttonAlignment = FUIButtonAlignmentCenter;
+  return provider;
 }
 
 #pragma mark - FUIAuthProvider

PhoneAuth/FirebasePhoneAuthUI/FUIPhoneAuth.h

@@ -23,6 +23,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface FUIPhoneAuth : NSObject <FUIAuthProvider>
 
+/** @property buttonAlignment
+    @brief The alignment of the icon and text of the button.
+ */
+@property(nonatomic, readwrite) FUIButtonAlignment buttonAlignment;
+
 /** @fn init
     @brief Please use @c initWithAuthUI: .
  */