Merge pull request firebase#403 from firebase/project-fixes

Project fixes

Author: morganchen12

FirebaseAuthUI/FUIAuthStrings.m

@@ -137,6 +137,9 @@
  }
  }
  NSBundle *frameworkBundle = [FUIAuthUtils bundleNamed:bundleName];
+ if (frameworkBundle == nil) {
+ frameworkBundle = [NSBundle mainBundle];
+ }
  return [frameworkBundle localizedStringForKey:key value:nil table:table];
 }
 

FirebaseAuthUI/FUIAuthUtils.m

@@ -26,6 +26,10 @@ + (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 {
  frameworkBundle = [NSBundle bundleForClass:[self class]];

FirebaseDatabaseUI/FUIArray.h

@@ -18,7 +18,7 @@
 
 // clang-format on
 
-@import FirebaseDatabase;
+#import <FirebaseDatabase/FirebaseDatabase.h>
 
 #import "FUICollection.h"
 

FirebaseDatabaseUI/FUICollectionViewDataSource.m

@@ -21,8 +21,6 @@
 #import "FUICollectionViewDataSource.h"
 #import "FUIArray.h"
 
-@import FirebaseDatabase;
-
 @interface FUICollectionViewDataSource () <FUICollectionDelegate>
 
 @property (nonatomic, readonly, nonnull) id<FUICollection> collection;

FirebaseDatabaseUI/FUIIndexCollectionViewDataSource.h

@@ -14,9 +14,8 @@
 // limitations under the License.
 //
 
-@import UIKit;
-
-@import FirebaseDatabase;
+#import <FirebaseDatabase/FirebaseDatabase.h>
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseDatabaseUI/FUIIndexTableViewDataSource.h

@@ -14,9 +14,8 @@
 // limitations under the License.
 //
 
-@import UIKit;
-
-@import FirebaseDatabase;
+#import <UIKit/UIKit.h>
+#import <FirebaseDatabase/FirebaseDatabase.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseDatabaseUI/FUISortedArray.h

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-@import FirebaseDatabase;
-
-#import "FirebaseDatabaseUI.h"
+#import "FUIArray.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseDatabaseUI/FUITableViewDataSource.m

@@ -21,8 +21,6 @@
 #import "FUIArray.h"
 #import "FUITableViewDataSource.h"
 
-@import FirebaseDatabase;
-
 @interface FUITableViewDataSource () <FUICollectionDelegate>
 
 @property (strong, nonatomic, readwrite) UITableViewCell *(^populateCell)

FirebaseFirestoreUI/FUIBatchedArray.h

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import "FUISnapshotArrayDiff.h"
 

FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.m

@@ -20,8 +20,6 @@
 
 #import "FUIFirestoreTableViewDataSource.h"
 
-@import FirebaseFirestore;
-
 @interface FUIFirestoreTableViewDataSource () <FUIBatchedArrayDelegate>
 
 @property (strong, nonatomic, readwrite) UITableViewCell *(^populateCell)