Merge pull request #587 from morganchen12/master

morganchen12 · web-flow · commit 5feba0ab4a34 · 2019-01-10T13:25:28.000-08:00
Fix missing icons issue
diff --git a/AnonymousAuth/FirebaseAnonymousAuthUI/FUIAnonymousAuth.m b/AnonymousAuth/FirebaseAnonymousAuthUI/FUIAnonymousAuth.m
@@ -88,8 +88,7 @@ - (NSString *)signInLabel {
 }
 
 - (UIImage *)icon {
-  NSBundle *bundle = [NSBundle bundleForClass:[self class]];
-  return [FUIAuthUtils imageNamed:@"ic_anonymous" fromBundle:bundle];
+  return [FUIAuthUtils imageNamed:@"ic_anonymous" fromBundleNameOrNil:FUIAuthBundleName];
 }
 
 - (UIColor *)buttonBackgroundColor {
diff --git a/Auth/FirebaseAuthUI/FUIAuthUtils.m b/Auth/FirebaseAuthUI/FUIAuthUtils.m
@@ -22,29 +22,37 @@ @implementation FUIAuthUtils
 
 + (NSBundle *)bundleNamed:(NSString *)bundleName {
   NSBundle *frameworkBundle = nil;
-  if (bundleName) {
-    NSString *path = [[NSBundle mainBundle] pathForResource:bundleName ofType:@"bundle"];
-    if (path == nil) {
-      // Check framework resources if bundle isn't present in main bundle.
-      path = [[NSBundle mainBundle] pathForResource:bundleName ofType:@"framework"];
-    }
-    frameworkBundle = [NSBundle bundleWithPath:path];
-  } else {
+  if (!bundleName) {
+    bundleName = FUIAuthBundleName;
+  }
+  NSString *path = [[NSBundle mainBundle] pathForResource:bundleName ofType:@"bundle"];
+  if (!path) {
+    // Check framework resources if bundle isn't present in main bundle.
+    path = [[NSBundle mainBundle] pathForResource:bundleName ofType:@"framework"];
+  }
+  frameworkBundle = [NSBundle bundleWithPath:path];
+  if (!frameworkBundle) {
     frameworkBundle = [NSBundle bundleForClass:[self class]];
   }
   return frameworkBundle;
 }
 
 + (UIImage *)imageNamed:(NSString *)name fromBundle:(NSBundle *)bundle {
-  if (bundle == nil) {
+  if (!bundle) {
     bundle = [self bundleNamed:nil];
   }
   NSString *path = [bundle pathForResource:name ofType:@"png"];
+  if (!path) {
+    NSLog(@"Warning: Unable to find asset %@ in bundle %@.", name, bundle);
+  }
   return [UIImage imageWithContentsOfFile:path];
 }
 
 + (UIImage *)imageNamed:(NSString *)name fromBundleNameOrNil:(nullable NSString *)bundleNameOrNil {
   NSString *path = [[FUIAuthUtils bundleNamed:bundleNameOrNil] pathForResource:name ofType:@"png"];
+  if (!path) {
+    NSLog(@"Warning: Unable to find asset %@ in bundle named %@.", name, bundleNameOrNil);
+  }
   return [UIImage imageWithContentsOfFile:path];
 }
 
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m
@@ -119,7 +119,7 @@ - (NSString *)signInLabel {
 }
 
 - (UIImage *)icon {
-  return [FUIAuthUtils imageNamed:@"ic_email" fromBundle:[NSBundle bundleForClass:[self class]]];
+  return [FUIAuthUtils imageNamed:@"ic_email" fromBundleNameOrNil:FUIEmailAuthBundleName];
 }
 
 - (UIColor *)buttonBackgroundColor {
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m
@@ -332,7 +332,7 @@ - (UIButton *)visibilityToggleButtonForPasswordField {
 
 - (void)updateIconForRightViewButton:(UIButton *)button {
   NSString *imageName = _passwordField.secureTextEntry ? @"ic_visibility" : @"ic_visibility_off";
-  UIImage *image = [FUIAuthUtils imageNamed:imageName fromBundle:[FUIAuthUtils bundleNamed:FUIAuthBundleName]];
+  UIImage *image = [FUIAuthUtils imageNamed:imageName fromBundleNameOrNil:FUIAuthBundleName];
   [button setImage:image forState:UIControlStateNormal];
 }
 
diff --git a/FacebookAuth/FirebaseFacebookAuthUI/FUIFacebookAuth.m b/FacebookAuth/FirebaseFacebookAuthUI/FUIFacebookAuth.m
@@ -108,7 +108,7 @@ - (NSString *)signInLabel {
 }
 
 - (UIImage *)icon {
-  return [FUIAuthUtils imageNamed:@"ic_facebook" fromBundle:[NSBundle bundleForClass:[self class]]];
+  return [FUIAuthUtils imageNamed:@"ic_facebook" fromBundleNameOrNil:kBundleName];
 }
 
 - (UIColor *)buttonBackgroundColor {
@@ -222,7 +222,7 @@ - (void)callbackWithCredential:(nullable FIRAuthCredential *)credential
     @brief Validates that Facebook SDK data was filled in Info.plist and creates Facebook login manager 
  */
 - (void)configureProvider {
-  NSBundle *bundle = [FUIAuthUtils bundleNamed:nil];
+  NSBundle *bundle = [NSBundle mainBundle];
   NSString *facebookAppId = [bundle objectForInfoDictionaryKey:kFacebookAppId];
   NSString *facebookDisplayName = [bundle objectForInfoDictionaryKey:kFacebookDisplayName];
 
diff --git a/GoogleAuth/FirebaseGoogleAuthUI/FUIGoogleAuth.m b/GoogleAuth/FirebaseGoogleAuthUI/FUIGoogleAuth.m
@@ -97,7 +97,7 @@ - (NSString *)signInLabel {
 }
 
 - (UIImage *)icon {
-  return [FUIAuthUtils imageNamed:@"ic_google" fromBundle:[NSBundle bundleForClass:[self class]]];
+  return [FUIAuthUtils imageNamed:@"ic_google" fromBundleNameOrNil:kBundleName];
 }
 
 - (UIColor *)buttonBackgroundColor {
diff --git a/PhoneAuth/FirebasePhoneAuthUI/FUIPhoneAuth.m b/PhoneAuth/FirebasePhoneAuthUI/FUIPhoneAuth.m
@@ -102,7 +102,7 @@ - (NSString *)signInLabel {
 }
 
 - (UIImage *)icon {
-  return [FUIAuthUtils imageNamed:@"ic_phone" fromBundle:[NSBundle bundleForClass:[self class]]];
+  return [FUIAuthUtils imageNamed:@"ic_phone" fromBundleNameOrNil:FUIPhoneAuthBundleName];
 }
 
 - (UIColor *)buttonBackgroundColor {
diff --git a/TwitterAuth/FirebaseTwitterAuthUI/FUITwitterAuth.m b/TwitterAuth/FirebaseTwitterAuthUI/FUITwitterAuth.m
@@ -74,7 +74,7 @@ - (NSString *)signInLabel {
 }
 
 - (UIImage *)icon {
-  return [FUIAuthUtils imageNamed:@"ic_twitter" fromBundle:[NSBundle bundleForClass:[self class]]];
+  return [FUIAuthUtils imageNamed:@"ic_twitter" fromBundleNameOrNil:kBundleName];
 }
 
 - (UIColor *)buttonBackgroundColor {
diff --git a/samples/swift/FirebaseUI-demo-swift.xcodeproj/project.pbxproj b/samples/swift/FirebaseUI-demo-swift.xcodeproj/project.pbxproj
@@ -332,7 +332,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = "Firebase, Inc.";
 				TargetAttributes = {
 					8DABC9841D3D82D600453807 = {
@@ -632,14 +632,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -682,14 +690,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/samples/swift/Podfile.lock b/samples/swift/Podfile.lock

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,7 @@ - (NSString *)signInLabel {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`- (UIImage *)icon {`
`91`		`- NSBundle *bundle = [NSBundle bundleForClass:[self class]];`
`92`		`- return [FUIAuthUtils imageNamed:@"ic_anonymous" fromBundle:bundle];`
	`91`	`+ return [FUIAuthUtils imageNamed:@"ic_anonymous" fromBundleNameOrNil:FUIAuthBundleName];`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`- (UIColor *)buttonBackgroundColor {`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ - (NSString *)signInLabel {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`- (UIImage *)icon {`
`122`		`- return [FUIAuthUtils imageNamed:@"ic_email" fromBundle:[NSBundle bundleForClass:[self class]]];`
	`122`	`+ return [FUIAuthUtils imageNamed:@"ic_email" fromBundleNameOrNil:FUIEmailAuthBundleName];`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`- (UIColor *)buttonBackgroundColor {`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ - (UIButton *)visibilityToggleButtonForPasswordField {`
`332`	`332`
`333`	`333`	`- (void)updateIconForRightViewButton:(UIButton *)button {`
`334`	`334`	`NSString *imageName = _passwordField.secureTextEntry ? @"ic_visibility" : @"ic_visibility_off";`
`335`		`- UIImage *image = [FUIAuthUtils imageNamed:imageName fromBundle:[FUIAuthUtils bundleNamed:FUIAuthBundleName]];`
	`335`	`+ UIImage *image = [FUIAuthUtils imageNamed:imageName fromBundleNameOrNil:FUIAuthBundleName];`
`336`	`336`	`[button setImage:image forState:UIControlStateNormal];`
`337`	`337`	`}`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ - (NSString *)signInLabel {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`- (UIImage *)icon {`
`111`		`- return [FUIAuthUtils imageNamed:@"ic_facebook" fromBundle:[NSBundle bundleForClass:[self class]]];`
	`111`	`+ return [FUIAuthUtils imageNamed:@"ic_facebook" fromBundleNameOrNil:kBundleName];`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`- (UIColor *)buttonBackgroundColor {`
`@@ -222,7 +222,7 @@ - (void)callbackWithCredential:(nullable FIRAuthCredential *)credential`
`222`	`222`	`@brief Validates that Facebook SDK data was filled in Info.plist and creates Facebook login manager`
`223`	`223`	`*/`
`224`	`224`	`- (void)configureProvider {`
`225`		`- NSBundle *bundle = [FUIAuthUtils bundleNamed:nil];`
	`225`	`+ NSBundle *bundle = [NSBundle mainBundle];`
`226`	`226`	`NSString *facebookAppId = [bundle objectForInfoDictionaryKey:kFacebookAppId];`
`227`	`227`	`NSString *facebookDisplayName = [bundle objectForInfoDictionaryKey:kFacebookDisplayName];`
`228`	`228`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ - (NSString *)signInLabel {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`- (UIImage *)icon {`
`100`		`- return [FUIAuthUtils imageNamed:@"ic_google" fromBundle:[NSBundle bundleForClass:[self class]]];`
	`100`	`+ return [FUIAuthUtils imageNamed:@"ic_google" fromBundleNameOrNil:kBundleName];`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`- (UIColor *)buttonBackgroundColor {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ - (NSString *)signInLabel {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`- (UIImage *)icon {`
`105`		`- return [FUIAuthUtils imageNamed:@"ic_phone" fromBundle:[NSBundle bundleForClass:[self class]]];`
	`105`	`+ return [FUIAuthUtils imageNamed:@"ic_phone" fromBundleNameOrNil:FUIPhoneAuthBundleName];`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`- (UIColor *)buttonBackgroundColor {`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ - (NSString *)signInLabel {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`- (UIImage *)icon {`
`77`		`- return [FUIAuthUtils imageNamed:@"ic_twitter" fromBundle:[NSBundle bundleForClass:[self class]]];`
	`77`	`+ return [FUIAuthUtils imageNamed:@"ic_twitter" fromBundleNameOrNil:kBundleName];`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`- (UIColor *)buttonBackgroundColor {`