Add way to specify default country code

Author: morganchen12

FirebasePhoneAuthUI/Sources/FUICountryCodes.h

@@ -26,19 +26,19 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *dialCode;
 @property (nonatomic, copy) NSNumber *level;
 
-/** @property defaultCountryCodeInfo
-    @brief Get the default country code info
-    Returns the default country code. Formerly this was set via CTCarrier information, but CTCarrier is now
-    deprecated, so this value must be manually set.
-*/
-@property (nonatomic, copy) FUICountryCodeInfo *defaultCountryCodeInfo;
-
 - (NSString *)countryFlagEmoji;
 
 @end
 
 @interface FUICountryCodes : NSObject
 
+/** @property defaultCountryCodeInfo
+    @brief Get the default country code info
+    The default country code. Formerly this was set via CTCarrier information, but CTCarrier is now
+    deprecated, so this value must be manually set. Defaults to the country code for the United States.
+*/
+@property (nonatomic, copy) FUICountryCodeInfo *defaultCountryCodeInfo;
+
 /** @fn count:
     @brief Return the number of available country codes.
 */

FirebasePhoneAuthUI/Sources/FUICountryCodes.m

@@ -117,6 +117,7 @@ - (FUICountryCodeInfo *)defaultCountryCodeInfo {
   if (_defaultCountryCodeInfo == nil) {
     return [self countryCodeInfoForCode:kFUIDefaultCountryCode] ?: [self countryCodeInfoAtIndex:0];
   }
+  return _defaultCountryCodeInfo;
 }
 
 - (FUICountryCodeInfo *)countryCodeInfoForPhoneNumber:(NSString *)phoneNumber {

FirebasePhoneAuthUI/Sources/FUIPhoneEntryViewController.m

@@ -113,6 +113,10 @@ - (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil
   if (self) {
     self.title = FUIPhoneAuthLocalizedString(kPAStr_EnterPhoneTitle);
     _countryCodes = countryCodes ?: [[FUICountryCodes alloc] init];
+    FUIPhoneAuth *provider = [authUI providerWithID:FIRPhoneAuthProviderID];
+    NSString *defaultCountryCode = provider.defaultCountryCode;
+    _countryCodes.defaultCountryCodeInfo =
+        [_countryCodes countryCodeInfoForCode:defaultCountryCode];
     if (phoneNumber.length) {
       _phoneNumber = [[FUIPhoneNumber alloc] initWithNormalizedPhoneNumber:phoneNumber
                                                               countryCodes:_countryCodes];

FirebasePhoneAuthUI/Sources/FUIPhoneNumber.m

@@ -40,7 +40,7 @@ - (instancetype)initWithNormalizedPhoneNumber:(NSString *)normalizedPhoneNumber
   }
   if (!rawPhoneNumber) {
     rawPhoneNumber = normalizedPhoneNumber;
-    countryCode = [countryCodes defaultCountryCodeInfo];
+    countryCode = countryCodes.defaultCountryCodeInfo;
   }
   return [self initWithRawPhoneNumber:rawPhoneNumber countryCode:countryCode];
 }

FirebasePhoneAuthUI/Sources/Public/FirebasePhoneAuthUI/FUIPhoneAuth.h

@@ -28,6 +28,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, readwrite) FUIButtonAlignment buttonAlignment;
 
+/** @property defaultCountryCode
+    Returns the default country code. If unspecified, this will default to the United States country code.
+*/
+@property (nonatomic, copy, readwrite) NSString *defaultCountryCode;
+
 /** @fn bundle
     @brief Returns the resource bundle required by this class.
  */