Skip to content

Commit 4c4733c

Browse files
cbesscbess
committed
Merge branch 'master' of github.com:firebase/FirebaseUI-iOS into auth-ui-update
2 parents affdec5 + fc25655 commit 4c4733c

File tree

16 files changed

+567
-281
lines changed

16 files changed

+567
-281
lines changed

‎AnonymousAuth/Podfile.lock‎

Lines changed: 48 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,56 @@
11
PODS:
2-
- Firebase/Auth (6.5.0):
2+
- Firebase/Auth (6.7.0):
33
- Firebase/CoreOnly
4-
- FirebaseAuth (~> 6.2.1)
5-
- Firebase/CoreOnly (6.5.0):
6-
- FirebaseCore (= 6.1.0)
7-
- FirebaseAuth (6.2.1):
4+
- FirebaseAuth (~> 6.2.3)
5+
- Firebase/CoreOnly (6.7.0):
6+
- FirebaseCore (= 6.2.1)
7+
- FirebaseAuth (6.2.3):
88
- FirebaseAuthInterop (~> 1.0)
9-
- FirebaseCore (~> 6.0)
9+
- FirebaseCore (~> 6.2)
1010
- GoogleUtilities/AppDelegateSwizzler (~> 6.2)
1111
- GoogleUtilities/Environment (~> 6.2)
1212
- GTMSessionFetcher/Core (~> 1.1)
1313
- FirebaseAuthInterop (1.0.0)
14-
- FirebaseCore (6.1.0):
15-
- GoogleUtilities/Environment (~> 6.0)
16-
- GoogleUtilities/Logger (~> 6.0)
14+
- FirebaseCore (6.2.1):
15+
- FirebaseCoreDiagnostics (~> 1.0)
16+
- FirebaseCoreDiagnosticsInterop (~> 1.0)
17+
- GoogleUtilities/Environment (~> 6.2)
18+
- GoogleUtilities/Logger (~> 6.2)
19+
- FirebaseCoreDiagnostics (1.0.1):
20+
- FirebaseCoreDiagnosticsInterop (~> 1.0)
21+
- GoogleDataTransportCCTSupport (~> 1.0)
22+
- GoogleUtilities/Environment (~> 6.2)
23+
- GoogleUtilities/Logger (~> 6.2)
24+
- FirebaseCoreDiagnosticsInterop (1.0.0)
1725
- FirebaseUI/Auth (8.0.3):
1826
- Firebase/Auth (~> 6.0)
1927
- GoogleUtilities/UserDefaults
20-
- GoogleUtilities/AppDelegateSwizzler (6.2.3):
28+
- GoogleDataTransport (1.1.3)
29+
- GoogleDataTransportCCTSupport (1.0.2):
30+
- GoogleDataTransport (~> 1.1)
31+
- nanopb
32+
- GoogleUtilities/AppDelegateSwizzler (6.2.5):
2133
- GoogleUtilities/Environment
2234
- GoogleUtilities/Logger
2335
- GoogleUtilities/Network
24-
- GoogleUtilities/Environment (6.2.3)
25-
- GoogleUtilities/Logger (6.2.3):
36+
- GoogleUtilities/Environment (6.2.5)
37+
- GoogleUtilities/Logger (6.2.5):
2638
- GoogleUtilities/Environment
27-
- GoogleUtilities/Network (6.2.3):
39+
- GoogleUtilities/Network (6.2.5):
2840
- GoogleUtilities/Logger
2941
- "GoogleUtilities/NSData+zlib"
3042
- GoogleUtilities/Reachability
31-
- "GoogleUtilities/NSData+zlib (6.2.3)"
32-
- GoogleUtilities/Reachability (6.2.3):
43+
- "GoogleUtilities/NSData+zlib (6.2.5)"
44+
- GoogleUtilities/Reachability (6.2.5):
3345
- GoogleUtilities/Logger
34-
- GoogleUtilities/UserDefaults (6.2.3):
46+
- GoogleUtilities/UserDefaults (6.2.5):
3547
- GoogleUtilities/Logger
3648
- GTMSessionFetcher/Core (1.2.2)
49+
- nanopb (0.3.901):
50+
- nanopb/decode (= 0.3.901)
51+
- nanopb/encode (= 0.3.901)
52+
- nanopb/decode (0.3.901)
53+
- nanopb/encode (0.3.901)
3754
- OCMock (3.4.3)
3855

3956
DEPENDENCIES:
@@ -47,22 +64,32 @@ SPEC REPOS:
4764
- FirebaseAuth
4865
- FirebaseAuthInterop
4966
- FirebaseCore
67+
- FirebaseCoreDiagnostics
68+
- FirebaseCoreDiagnosticsInterop
69+
- GoogleDataTransport
70+
- GoogleDataTransportCCTSupport
5071
- GoogleUtilities
5172
- GTMSessionFetcher
73+
- nanopb
5274
- OCMock
5375

5476
EXTERNAL SOURCES:
5577
FirebaseUI:
5678
:path: "../"
5779

5880
SPEC CHECKSUMS:
59-
Firebase: dedc9e48ea3f3649ad5f6b982f8a0c73508a14b5
60-
FirebaseAuth: a06ad63e9bf4c86165b54cceb1c14d4f4c38d419
81+
Firebase: 291d7b0a7b393f252358083b5d224884126fa46d
82+
FirebaseAuth: e7f86c2dfc57281cd01f7da5e4b40e01e4510a4a
6183
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
62-
FirebaseCore: aecf02fb2274ec361b9bebeac112f5daa18273bd
63-
FirebaseUI: 00797dc0010d0b269a9b9f3486154728c654b1da
64-
GoogleUtilities: d2b0e277a95962e09bb27f5cd42f5f0b6a506c7d
84+
FirebaseCore: 32b48f41c84a56fbde73b35ed01a830b3b6dc048
85+
FirebaseCoreDiagnostics: 4c04ae09d0ab027c30179828c6bb47764df1bd13
86+
FirebaseCoreDiagnosticsInterop: 6829da2b8d1fc795ff1bd99df751d3788035d2cb
87+
FirebaseUI: 84a450a38d0556d6ec876926406ec1e3fe9712c5
88+
GoogleDataTransport: 91e682bd60a49d3f8f69f2e909a66efaed5a1e7a
89+
GoogleDataTransportCCTSupport: 6b545f7149111180763dc18c6f372c963de4a310
90+
GoogleUtilities: e7dc37039b19df7fe543479d3e4a02ac8d11bb69
6591
GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
92+
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
6693
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
6794

6895
PODFILE CHECKSUM: dd5f618b7b3efad7d3eb9d842878ab03d443c8d4

‎Auth/FirebaseAuthUI/FUIAuthPickerViewController.m‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil
9191
- (void)viewDidLoad {
9292
[super viewDidLoad];
9393

94+
// Makes sure that embedded scroll view properly handles translucent navigation bar
95+
if (!self.navigationController.navigationBar.isTranslucent) {
96+
self.extendedLayoutIncludesOpaqueBars = true;
97+
}
98+
9499
if (!self.authUI.shouldHideCancelButton) {
95100
UIBarButtonItem *cancelBarButton =
96101
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel

‎Auth/Podfile.lock‎

Lines changed: 46 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,51 @@
11
PODS:
2-
- Firebase/Auth (6.5.0):
2+
- Firebase/Auth (6.7.0):
33
- Firebase/CoreOnly
4-
- FirebaseAuth (~> 6.2.1)
5-
- Firebase/CoreOnly (6.5.0):
6-
- FirebaseCore (= 6.1.0)
7-
- FirebaseAuth (6.2.1):
4+
- FirebaseAuth (~> 6.2.3)
5+
- Firebase/CoreOnly (6.7.0):
6+
- FirebaseCore (= 6.2.1)
7+
- FirebaseAuth (6.2.3):
88
- FirebaseAuthInterop (~> 1.0)
9-
- FirebaseCore (~> 6.0)
9+
- FirebaseCore (~> 6.2)
1010
- GoogleUtilities/AppDelegateSwizzler (~> 6.2)
1111
- GoogleUtilities/Environment (~> 6.2)
1212
- GTMSessionFetcher/Core (~> 1.1)
1313
- FirebaseAuthInterop (1.0.0)
14-
- FirebaseCore (6.1.0):
15-
- GoogleUtilities/Environment (~> 6.0)
16-
- GoogleUtilities/Logger (~> 6.0)
17-
- GoogleUtilities/AppDelegateSwizzler (6.2.3):
14+
- FirebaseCore (6.2.1):
15+
- FirebaseCoreDiagnostics (~> 1.0)
16+
- FirebaseCoreDiagnosticsInterop (~> 1.0)
17+
- GoogleUtilities/Environment (~> 6.2)
18+
- GoogleUtilities/Logger (~> 6.2)
19+
- FirebaseCoreDiagnostics (1.0.1):
20+
- FirebaseCoreDiagnosticsInterop (~> 1.0)
21+
- GoogleDataTransportCCTSupport (~> 1.0)
22+
- GoogleUtilities/Environment (~> 6.2)
23+
- GoogleUtilities/Logger (~> 6.2)
24+
- FirebaseCoreDiagnosticsInterop (1.0.0)
25+
- GoogleDataTransport (1.1.3)
26+
- GoogleDataTransportCCTSupport (1.0.2):
27+
- GoogleDataTransport (~> 1.1)
28+
- nanopb
29+
- GoogleUtilities/AppDelegateSwizzler (6.2.5):
1830
- GoogleUtilities/Environment
1931
- GoogleUtilities/Logger
2032
- GoogleUtilities/Network
21-
- GoogleUtilities/Environment (6.2.3)
22-
- GoogleUtilities/Logger (6.2.3):
33+
- GoogleUtilities/Environment (6.2.5)
34+
- GoogleUtilities/Logger (6.2.5):
2335
- GoogleUtilities/Environment
24-
- GoogleUtilities/Network (6.2.3):
36+
- GoogleUtilities/Network (6.2.5):
2537
- GoogleUtilities/Logger
2638
- "GoogleUtilities/NSData+zlib"
2739
- GoogleUtilities/Reachability
28-
- "GoogleUtilities/NSData+zlib (6.2.3)"
29-
- GoogleUtilities/Reachability (6.2.3):
40+
- "GoogleUtilities/NSData+zlib (6.2.5)"
41+
- GoogleUtilities/Reachability (6.2.5):
3042
- GoogleUtilities/Logger
3143
- GTMSessionFetcher/Core (1.2.2)
44+
- nanopb (0.3.901):
45+
- nanopb/decode (= 0.3.901)
46+
- nanopb/encode (= 0.3.901)
47+
- nanopb/decode (0.3.901)
48+
- nanopb/encode (0.3.901)
3249

3350
DEPENDENCIES:
3451
- Firebase/Auth
@@ -39,16 +56,26 @@ SPEC REPOS:
3956
- FirebaseAuth
4057
- FirebaseAuthInterop
4158
- FirebaseCore
59+
- FirebaseCoreDiagnostics
60+
- FirebaseCoreDiagnosticsInterop
61+
- GoogleDataTransport
62+
- GoogleDataTransportCCTSupport
4263
- GoogleUtilities
4364
- GTMSessionFetcher
65+
- nanopb
4466

4567
SPEC CHECKSUMS:
46-
Firebase: dedc9e48ea3f3649ad5f6b982f8a0c73508a14b5
47-
FirebaseAuth: a06ad63e9bf4c86165b54cceb1c14d4f4c38d419
68+
Firebase: 291d7b0a7b393f252358083b5d224884126fa46d
69+
FirebaseAuth: e7f86c2dfc57281cd01f7da5e4b40e01e4510a4a
4870
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
49-
FirebaseCore: aecf02fb2274ec361b9bebeac112f5daa18273bd
50-
GoogleUtilities: d2b0e277a95962e09bb27f5cd42f5f0b6a506c7d
71+
FirebaseCore: 32b48f41c84a56fbde73b35ed01a830b3b6dc048
72+
FirebaseCoreDiagnostics: 4c04ae09d0ab027c30179828c6bb47764df1bd13
73+
FirebaseCoreDiagnosticsInterop: 6829da2b8d1fc795ff1bd99df751d3788035d2cb
74+
GoogleDataTransport: 91e682bd60a49d3f8f69f2e909a66efaed5a1e7a
75+
GoogleDataTransportCCTSupport: 6b545f7149111180763dc18c6f372c963de4a310
76+
GoogleUtilities: e7dc37039b19df7fe543479d3e4a02ac8d11bb69
5177
GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
78+
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
5279

5380
PODFILE CHECKSUM: b52e77a8635fdab60813531d42d397d13cda156e
5481

‎Database/Podfile.lock‎

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,38 @@
11
PODS:
2-
- Firebase/CoreOnly (6.5.0):
3-
- FirebaseCore (= 6.1.0)
4-
- Firebase/Database (6.5.0):
2+
- Firebase/CoreOnly (6.7.0):
3+
- FirebaseCore (= 6.2.1)
4+
- Firebase/Database (6.7.0):
55
- Firebase/CoreOnly
6-
- FirebaseDatabase (~> 6.0.0)
6+
- FirebaseDatabase (~> 6.1.0)
77
- FirebaseAuthInterop (1.0.0)
8-
- FirebaseCore (6.1.0):
9-
- GoogleUtilities/Environment (~> 6.0)
10-
- GoogleUtilities/Logger (~> 6.0)
11-
- FirebaseDatabase (6.0.0):
8+
- FirebaseCore (6.2.1):
9+
- FirebaseCoreDiagnostics (~> 1.0)
10+
- FirebaseCoreDiagnosticsInterop (~> 1.0)
11+
- GoogleUtilities/Environment (~> 6.2)
12+
- GoogleUtilities/Logger (~> 6.2)
13+
- FirebaseCoreDiagnostics (1.0.1):
14+
- FirebaseCoreDiagnosticsInterop (~> 1.0)
15+
- GoogleDataTransportCCTSupport (~> 1.0)
16+
- GoogleUtilities/Environment (~> 6.2)
17+
- GoogleUtilities/Logger (~> 6.2)
18+
- FirebaseCoreDiagnosticsInterop (1.0.0)
19+
- FirebaseDatabase (6.1.0):
1220
- FirebaseAuthInterop (~> 1.0)
1321
- FirebaseCore (~> 6.0)
1422
- leveldb-library (~> 1.18)
15-
- GoogleUtilities/Environment (6.2.3)
16-
- GoogleUtilities/Logger (6.2.3):
23+
- GoogleDataTransport (1.1.3)
24+
- GoogleDataTransportCCTSupport (1.0.2):
25+
- GoogleDataTransport (~> 1.1)
26+
- nanopb
27+
- GoogleUtilities/Environment (6.2.5)
28+
- GoogleUtilities/Logger (6.2.5):
1729
- GoogleUtilities/Environment
18-
- leveldb-library (1.20)
30+
- leveldb-library (1.22)
31+
- nanopb (0.3.901):
32+
- nanopb/decode (= 0.3.901)
33+
- nanopb/encode (= 0.3.901)
34+
- nanopb/decode (0.3.901)
35+
- nanopb/encode (0.3.901)
1936

2037
DEPENDENCIES:
2138
- Firebase/Database
@@ -25,17 +42,27 @@ SPEC REPOS:
2542
- Firebase
2643
- FirebaseAuthInterop
2744
- FirebaseCore
45+
- FirebaseCoreDiagnostics
46+
- FirebaseCoreDiagnosticsInterop
2847
- FirebaseDatabase
48+
- GoogleDataTransport
49+
- GoogleDataTransportCCTSupport
2950
- GoogleUtilities
3051
- leveldb-library
52+
- nanopb
3153

3254
SPEC CHECKSUMS:
33-
Firebase: dedc9e48ea3f3649ad5f6b982f8a0c73508a14b5
55+
Firebase: 291d7b0a7b393f252358083b5d224884126fa46d
3456
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
35-
FirebaseCore: aecf02fb2274ec361b9bebeac112f5daa18273bd
36-
FirebaseDatabase: f48e067716864be2b855cf716b927ef375d6cfa0
37-
GoogleUtilities: d2b0e277a95962e09bb27f5cd42f5f0b6a506c7d
38-
leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5
57+
FirebaseCore: 32b48f41c84a56fbde73b35ed01a830b3b6dc048
58+
FirebaseCoreDiagnostics: 4c04ae09d0ab027c30179828c6bb47764df1bd13
59+
FirebaseCoreDiagnosticsInterop: 6829da2b8d1fc795ff1bd99df751d3788035d2cb
60+
FirebaseDatabase: 518cd94286de2ee999e19383a2a6ae04c81ce993
61+
GoogleDataTransport: 91e682bd60a49d3f8f69f2e909a66efaed5a1e7a
62+
GoogleDataTransportCCTSupport: 6b545f7149111180763dc18c6f372c963de4a310
63+
GoogleUtilities: e7dc37039b19df7fe543479d3e4a02ac8d11bb69
64+
leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7
65+
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
3966

4067
PODFILE CHECKSUM: 4a5d8ca50779b0745cc8a6eed485c325bb517b35
4168

‎EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignInViewController.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
249249
cell.textField.delegate = self;
250250
if (indexPath.row == 0) {
251251
cell.label.text = FUILocalizedString(kStr_Email);
252+
cell.textField.enabled = NO;
252253
_emailField = cell.textField;
253254
_emailField.text = _email;
254255
_emailField.placeholder = FUILocalizedString(kStr_EnterYourEmail);

‎EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
271271
if (indexPath.row == 0) {
272272
cell.label.text = FUILocalizedString(kStr_Email);
273273
cell.accessibilityIdentifier = kEmailSignUpCellAccessibilityID;
274+
cell.textField.enabled = NO;
274275
_emailField = cell.textField;
275276
_emailField.text = _email;
276277
_emailField.placeholder = FUILocalizedString(kStr_EnterYourEmail);

0 commit comments

Comments
 (0)