Skip to content

Commit c36b461

Browse files
authored
Merge pull request #837 from firebase/onetimecode
Fix missing text input trait
2 parents 25ccb40 + 19b524b commit c36b461

File tree

5 files changed

+40
-26
lines changed

5 files changed

+40
-26
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
osx_image: xcode11
1+
osx_image: xcode11.3
22
language: objective-c
33
xcode_workspace: FirebaseUI.xcworkspace
44
xcode_scheme: FirebaseUI
55

6-
rvm: 2.3.1
6+
rvm: 2.6.4
77
before_install:
8+
- gem update cocoapods
89
- gem install bundler
910
- bundle install
1011
- gem install xcpretty

PhoneAuth/FirebasePhoneAuthUI/FUICodeField.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ NS_ASSUME_NONNULL_BEGIN
3939

4040
@property (nonatomic, readonly) IBInspectable NSInteger codeLength;
4141

42+
@property (null_unspecified, nonatomic, copy) UITextContentType textContentType;
43+
4244
- (void)clearCodeInput;
4345

4446
@end

PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ - (void)setUpFromNib {
5959
UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
6060
self.inputField.userInteractionEnabled = YES;
6161

62+
if (@available(iOS 12.0, *)) {
63+
if ([self.inputField respondsToSelector:@selector(setTextContentType:)]) {
64+
id<UITextInputTraits> inputField = (id<UITextInputTraits>)self.inputField;
65+
inputField.textContentType = UITextContentTypeOneTimeCode;
66+
}
67+
}
68+
6269
// Initialization code
6370
_codeEntry = [NSMutableString string];
6471

@@ -179,6 +186,10 @@ - (UITextContentType _Null_unspecified)textContentType {
179186
return nil;
180187
}
181188

189+
- (void)setTextContentType:(_Null_unspecified UITextContentType)textContentType {
190+
// do nothing
191+
}
192+
182193
@end
183194

184195
NS_ASSUME_NONNULL_END

PhoneAuth/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PODS:
2323
- GoogleUtilities/Logger (~> 6.5)
2424
- nanopb (~> 0.3.901)
2525
- FirebaseCoreDiagnosticsInterop (1.2.0)
26-
- FirebaseUI/Auth (8.4.0):
26+
- FirebaseUI/Auth (8.4.1):
2727
- Firebase/Auth (~> 6.0)
2828
- GoogleUtilities/UserDefaults
2929
- GoogleDataTransport (3.3.0)
@@ -84,7 +84,7 @@ SPEC CHECKSUMS:
8484
FirebaseCore: 4aeb81ff53dcd9a3634ca725dc1fb8c2a4622046
8585
FirebaseCoreDiagnostics: 5e78803ab276bc5b50340e3c539c06c3de35c649
8686
FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
87-
FirebaseUI: 433550cb9e3d03ec7ee2c25f87493f76358d9b68
87+
FirebaseUI: 69f7e480265758a9a9ea39915694b0949bcab23f
8888
GoogleDataTransport: 574a983e829327d7c18f2627f65d9e80164ea8a4
8989
GoogleDataTransportCCTSupport: cad3cd6cdbdbad6b5c2c9206ec413402755faaaa
9090
GoogleUtilities: f8de7ddf8c706f58e9b405d53e38bbdaa2731e5a

samples/swift/Podfile.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -233,39 +233,39 @@ PODS:
233233
- FirebaseAuthInterop (~> 1.0)
234234
- FirebaseCore (~> 6.0)
235235
- GTMSessionFetcher/Core (~> 1.1)
236-
- FirebaseUI (8.4.0):
237-
- FirebaseUI/Anonymous (= 8.4.0)
238-
- FirebaseUI/Auth (= 8.4.0)
239-
- FirebaseUI/Database (= 8.4.0)
240-
- FirebaseUI/Email (= 8.4.0)
241-
- FirebaseUI/Facebook (= 8.4.0)
242-
- FirebaseUI/Firestore (= 8.4.0)
243-
- FirebaseUI/Google (= 8.4.0)
244-
- FirebaseUI/OAuth (= 8.4.0)
245-
- FirebaseUI/Phone (= 8.4.0)
246-
- FirebaseUI/Storage (= 8.4.0)
247-
- FirebaseUI/Anonymous (8.4.0):
236+
- FirebaseUI (8.4.1):
237+
- FirebaseUI/Anonymous (= 8.4.1)
238+
- FirebaseUI/Auth (= 8.4.1)
239+
- FirebaseUI/Database (= 8.4.1)
240+
- FirebaseUI/Email (= 8.4.1)
241+
- FirebaseUI/Facebook (= 8.4.1)
242+
- FirebaseUI/Firestore (= 8.4.1)
243+
- FirebaseUI/Google (= 8.4.1)
244+
- FirebaseUI/OAuth (= 8.4.1)
245+
- FirebaseUI/Phone (= 8.4.1)
246+
- FirebaseUI/Storage (= 8.4.1)
247+
- FirebaseUI/Anonymous (8.4.1):
248248
- FirebaseUI/Auth
249-
- FirebaseUI/Auth (8.4.0):
249+
- FirebaseUI/Auth (8.4.1):
250250
- Firebase/Auth (~> 6.0)
251251
- GoogleUtilities/UserDefaults
252-
- FirebaseUI/Database (8.4.0):
252+
- FirebaseUI/Database (8.4.1):
253253
- Firebase/Database (~> 6.0)
254-
- FirebaseUI/Email (8.4.0):
254+
- FirebaseUI/Email (8.4.1):
255255
- FirebaseUI/Auth
256-
- FirebaseUI/Facebook (8.4.0):
256+
- FirebaseUI/Facebook (8.4.1):
257257
- FBSDKLoginKit (~> 5.0)
258258
- FirebaseUI/Auth
259-
- FirebaseUI/Firestore (8.4.0):
259+
- FirebaseUI/Firestore (8.4.1):
260260
- Firebase/Firestore
261-
- FirebaseUI/Google (8.4.0):
261+
- FirebaseUI/Google (8.4.1):
262262
- FirebaseUI/Auth
263263
- GoogleSignIn (~> 5.0)
264-
- FirebaseUI/OAuth (8.4.0):
264+
- FirebaseUI/OAuth (8.4.1):
265265
- FirebaseUI/Auth
266-
- FirebaseUI/Phone (8.4.0):
266+
- FirebaseUI/Phone (8.4.1):
267267
- FirebaseUI/Auth
268-
- FirebaseUI/Storage (8.4.0):
268+
- FirebaseUI/Storage (8.4.1):
269269
- Firebase/Storage (~> 6.0)
270270
- SDWebImage (~> 5.0)
271271
- GoogleDataTransport (3.3.0)
@@ -376,7 +376,7 @@ SPEC CHECKSUMS:
376376
FirebaseDatabase: 0144e0706a4761f1b0e8679572eba8095ddb59be
377377
FirebaseFirestore: b7e6adda31974dbd259fc25b541e8850420c92ed
378378
FirebaseStorage: 6c5263796af3b1be82ed173598aade47535fe125
379-
FirebaseUI: 433550cb9e3d03ec7ee2c25f87493f76358d9b68
379+
FirebaseUI: 69f7e480265758a9a9ea39915694b0949bcab23f
380380
GoogleDataTransport: 574a983e829327d7c18f2627f65d9e80164ea8a4
381381
GoogleDataTransportCCTSupport: cad3cd6cdbdbad6b5c2c9206ec413402755faaaa
382382
GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213

0 commit comments

Comments
 (0)