Skip to content

Commit 7eb864e

Browse files
committed
fix UI sample and tests, with jank
Change-Id: I5fec7ac782307b9d16387d5d3809b610be34fca5
1 parent 670cbad commit 7eb864e

File tree

5 files changed

+152
-249
lines changed

5 files changed

+152
-249
lines changed

FirebaseAuthUI/FUIAuthStrings.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@
137137
}
138138
}
139139
NSBundle *frameworkBundle = [FUIAuthUtils bundleNamed:bundleName];
140+
if (frameworkBundle == nil) {
141+
frameworkBundle = [NSBundle mainBundle];
142+
}
140143
return [frameworkBundle localizedStringForKey:key value:nil table:table];
141144
}
142145

FirebaseAuthUI/FUIAuthUtils.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ + (NSBundle *)bundleNamed:(NSString *)bundleName {
2626
NSBundle *frameworkBundle = nil;
2727
if (bundleName) {
2828
NSString *path = [[NSBundle mainBundle] pathForResource:bundleName ofType:@"bundle"];
29+
if (path == nil) {
30+
// Check framework resources if bundle isn't present in main bundle.
31+
path = [[NSBundle mainBundle] pathForResource:bundleName ofType:@"framework"];
32+
}
2933
frameworkBundle = [NSBundle bundleWithPath:path];
3034
} else {
3135
frameworkBundle = [NSBundle bundleForClass:[self class]];

0 commit comments

Comments
 (0)