Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit 0554279

Browse files
mindgraffitimindgraffiti
authored
Merge pull request #10 from wordpress-mobile/feature/nux-button-appearance
NUXButton configurable using UIAppearance
2 parents 1814d55 + 74e297b commit 0554279

36 files changed

+413
-752
lines changed

‎Podfile.lock‎

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
PODS:
22
- 1PasswordExtension (1.8.5)
3-
- AFNetworking (3.2.1):
4-
- AFNetworking/NSURLSession (= 3.2.1)
5-
- AFNetworking/Reachability (= 3.2.1)
6-
- AFNetworking/Security (= 3.2.1)
7-
- AFNetworking/Serialization (= 3.2.1)
8-
- AFNetworking/UIKit (= 3.2.1)
9-
- AFNetworking/NSURLSession (3.2.1):
10-
- AFNetworking/Reachability
11-
- AFNetworking/Security
12-
- AFNetworking/Serialization
13-
- AFNetworking/Reachability (3.2.1)
14-
- AFNetworking/Security (3.2.1)
15-
- AFNetworking/Serialization (3.2.1)
16-
- AFNetworking/UIKit (3.2.1):
17-
- AFNetworking/NSURLSession
183
- Alamofire (4.7.2)
194
- CocoaLumberjack (3.4.2):
205
- CocoaLumberjack/Default (= 3.4.2)
@@ -37,11 +22,11 @@ PODS:
3722
- GoogleToolboxForMac/Defines (= 2.1.4)
3823
- "GoogleToolboxForMac/NSString+URLArguments (= 2.1.4)"
3924
- "GoogleToolboxForMac/NSString+URLArguments (2.1.4)"
40-
- Gridicons (0.15)
25+
- Gridicons (0.16)
4126
- lottie-ios (2.5.0)
4227
- NSObject-SafeExpectations (0.0.3)
4328
- "NSURL+IDN (0.3)"
44-
- OCMock (3.4.1)
29+
- OCMock (3.4.2)
4530
- OHHTTPStubs (6.1.0):
4631
- OHHTTPStubs/Default (= 6.1.0)
4732
- OHHTTPStubs/Core (6.1.0)
@@ -60,18 +45,17 @@ PODS:
6045
- Specta (1.0.7)
6146
- SVProgressHUD (2.2.5)
6247
- UIDeviceIdentifier (0.5.0)
63-
- WordPressKit (1.0.5):
64-
- AFNetworking (= 3.2.1)
65-
- Alamofire (= 4.7.2)
48+
- WordPressKit (1.1):
49+
- Alamofire (~> 4.7)
6650
- CocoaLumberjack (= 3.4.2)
6751
- NSObject-SafeExpectations (= 0.0.3)
6852
- UIDeviceIdentifier (~> 0.4)
69-
- WordPressShared (= 1.0.3)
53+
- WordPressShared (~> 1.0.3)
7054
- wpxmlrpc (= 0.8.3)
71-
- WordPressShared (1.0.3):
55+
- WordPressShared (1.0.8):
7256
- CocoaLumberjack (~> 3.4)
7357
- FormatterKit/TimeIntervalFormatter (= 1.8.2)
74-
- WordPressUI (1.0.2)
58+
- WordPressUI (1.0.6)
7559
- wpxmlrpc (0.8.3)
7660

7761
DEPENDENCIES:
@@ -97,7 +81,6 @@ DEPENDENCIES:
9781
SPEC REPOS:
9882
https://github.com/cocoapods/specs.git:
9983
- 1PasswordExtension
100-
- AFNetworking
10184
- Alamofire
10285
- CocoaLumberjack
10386
- Expecta
@@ -120,25 +103,24 @@ SPEC REPOS:
120103

121104
SPEC CHECKSUMS:
122105
1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
123-
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
124106
Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
125107
CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
126108
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
127109
FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98
128110
GoogleSignInRepacked: d357702618c555f38923576924661325eb1ef22b
129111
GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
130-
Gridicons: 0e5e76ad9fc6f7cbc3da137a9751ef516c5aef73
112+
Gridicons: 8cc5cb666d5ad8b8f1771d3c7a93d27ae25b7c2e
131113
lottie-ios: d699fdee68d7b63e721d949388b015fef1aaa4ac
132114
NSObject-SafeExpectations: b989b68a8a9b7b9f2b264a8b52ba9d7aab8f3129
133115
"NSURL+IDN": 82355a0afd532fe1de08f6417c134b49b1a1c4b3
134-
OCMock: 2cd0716969bab32a2283ff3a46fd26a8c8b4c5e3
116+
OCMock: ebe9ee1dca7fbed0ff9193ac0b3e2d8862ea56f6
135117
OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
136118
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
137119
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
138120
UIDeviceIdentifier: a959a6d4f51036b4180dd31fb26483a820f1cc46
139-
WordPressKit: afe6d2c23db6d4f110638c25e86b029e899ffc34
140-
WordPressShared: b8e910d8133a54e9452ab7bd9d8e27e78dc2f5ba
141-
WordPressUI: 70bceaff582bdd6fd8f3ed67aaa200e72fce245d
121+
WordPressKit: a24baaa783c3a221f2d9a51c19318cbb27333373
122+
WordPressShared: 063e1e8b1a7aaf635abf17f091a2d235a068abdc
123+
WordPressUI: af141587ec444f9af753a00605bd0d3f14d8d8a3
142124
wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4
143125

144126
PODFILE CHECKSUM: adec9882e25404ab01a7a461fcdd3ddd937d5ba6

‎WordPressAuthenticator.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
B56090CB208A4F5400399AE4 /* NUXNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56090BD208A4F5400399AE4 /* NUXNavigationController.swift */; };
2323
B56090CC208A4F5400399AE4 /* NUXTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56090BE208A4F5400399AE4 /* NUXTableViewController.swift */; };
2424
B56090CD208A4F5400399AE4 /* NUXSegueHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56090BF208A4F5400399AE4 /* NUXSegueHandler.swift */; };
25-
B56090CE208A4F5400399AE4 /* NUXSubmitButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56090C0208A4F5400399AE4 /* NUXSubmitButton.swift */; };
2625
B56090CF208A4F5400399AE4 /* NUXCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56090C1208A4F5400399AE4 /* NUXCollectionViewController.swift */; };
2726
B56090D0208A4F5400399AE4 /* NUXViewControllerBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56090C2208A4F5400399AE4 /* NUXViewControllerBase.swift */; };
2827
B56090D1208A4F5400399AE4 /* NUXViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56090C3208A4F5400399AE4 /* NUXViewController.swift */; };
@@ -97,6 +96,11 @@
9796
B5ED791D207E993E00A8FD8C /* WPAuthenticatorLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = B5ED7918207E993E00A8FD8C /* WPAuthenticatorLogging.h */; settings = {ATTRIBUTES = (Public, ); }; };
9897
B5ED791F207E993E00A8FD8C /* CocoaLumberjack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ED791A207E993E00A8FD8C /* CocoaLumberjack.swift */; };
9998
B5ED7920207E993E00A8FD8C /* WPAuthenticatorLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = B5ED791B207E993E00A8FD8C /* WPAuthenticatorLogging.m */; };
99+
CE1B18C920EEC2C200BECC3F /* SocialService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1B18C820EEC2C200BECC3F /* SocialService.swift */; };
100+
CE1B18CC20EEC32400BECC3F /* WordPressCredentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1B18CB20EEC32400BECC3F /* WordPressCredentials.swift */; };
101+
CE1B18CE20EEC3CB00BECC3F /* WordPressAuthenticatorDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1B18CD20EEC3CB00BECC3F /* WordPressAuthenticatorDelegateProtocol.swift */; };
102+
CE1B18D020EEC41600BECC3F /* WordPressAuthenticatorConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1B18CF20EEC41600BECC3F /* WordPressAuthenticatorConfiguration.swift */; };
103+
CE1B18D220EEC44400BECC3F /* WordPressAuthenticatorStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1B18D120EEC44400BECC3F /* WordPressAuthenticatorStyles.swift */; };
100104
E8AF6B9EF50902F2117DFAF9 /* Pods_WordPressAuthenticatorTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A441EC80D2B8D2209C2E228 /* Pods_WordPressAuthenticatorTests.framework */; };
101105
/* End PBXBuildFile section */
102106

@@ -149,7 +153,6 @@
149153
B56090BD208A4F5400399AE4 /* NUXNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NUXNavigationController.swift; sourceTree = "<group>"; };
150154
B56090BE208A4F5400399AE4 /* NUXTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NUXTableViewController.swift; sourceTree = "<group>"; };
151155
B56090BF208A4F5400399AE4 /* NUXSegueHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NUXSegueHandler.swift; sourceTree = "<group>"; };
152-
B56090C0208A4F5400399AE4 /* NUXSubmitButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NUXSubmitButton.swift; sourceTree = "<group>"; };
153156
B56090C1208A4F5400399AE4 /* NUXCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NUXCollectionViewController.swift; sourceTree = "<group>"; };
154157
B56090C2208A4F5400399AE4 /* NUXViewControllerBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NUXViewControllerBase.swift; sourceTree = "<group>"; };
155158
B56090C3208A4F5400399AE4 /* NUXViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NUXViewController.swift; sourceTree = "<group>"; };
@@ -231,6 +234,11 @@
231234
B5ED791A207E993E00A8FD8C /* CocoaLumberjack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CocoaLumberjack.swift; sourceTree = "<group>"; };
232235
B5ED791B207E993E00A8FD8C /* WPAuthenticatorLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPAuthenticatorLogging.m; sourceTree = "<group>"; };
233236
C736FF243DE333FCAB1C2614 /* Pods_WordPressAuthenticator.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WordPressAuthenticator.framework; sourceTree = BUILT_PRODUCTS_DIR; };
237+
CE1B18C820EEC2C200BECC3F /* SocialService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialService.swift; sourceTree = "<group>"; };
238+
CE1B18CB20EEC32400BECC3F /* WordPressCredentials.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressCredentials.swift; sourceTree = "<group>"; };
239+
CE1B18CD20EEC3CB00BECC3F /* WordPressAuthenticatorDelegateProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressAuthenticatorDelegateProtocol.swift; sourceTree = "<group>"; };
240+
CE1B18CF20EEC41600BECC3F /* WordPressAuthenticatorConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressAuthenticatorConfiguration.swift; sourceTree = "<group>"; };
241+
CE1B18D120EEC44400BECC3F /* WordPressAuthenticatorStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressAuthenticatorStyles.swift; sourceTree = "<group>"; };
234242
E9414A95E29F3297555AC92B /* Pods-WordPressAuthenticator.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressAuthenticator.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressAuthenticator/Pods-WordPressAuthenticator.debug.xcconfig"; sourceTree = "<group>"; };
235243
FF475C5056EB60A277696BA9 /* Pods-WordPressAuthenticatorTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressAuthenticatorTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressAuthenticatorTests/Pods-WordPressAuthenticatorTests.release.xcconfig"; sourceTree = "<group>"; };
236244
/* End PBXFileReference section */
@@ -354,7 +362,6 @@
354362
B56090BB208A4F5300399AE4 /* NUXLinkMailViewController.swift */,
355363
B56090BD208A4F5400399AE4 /* NUXNavigationController.swift */,
356364
B56090BF208A4F5400399AE4 /* NUXSegueHandler.swift */,
357-
B56090C0208A4F5400399AE4 /* NUXSubmitButton.swift */,
358365
B56090BE208A4F5400399AE4 /* NUXTableViewController.swift */,
359366
B56090C3208A4F5400399AE4 /* NUXViewController.swift */,
360367
B56090C2208A4F5400399AE4 /* NUXViewControllerBase.swift */,
@@ -390,7 +397,10 @@
390397
B56090F2208A533100399AE4 /* WordPressAuthenticator+Errors.swift */,
391398
B56090F4208A533200399AE4 /* WordPressAuthenticator+Events.swift */,
392399
B56090F3208A533100399AE4 /* WordPressAuthenticator+Notifications.swift */,
400+
CE1B18CD20EEC3CB00BECC3F /* WordPressAuthenticatorDelegateProtocol.swift */,
393401
B56090F6208A533200399AE4 /* WordPressSupportSourceTag.swift */,
402+
CE1B18CF20EEC41600BECC3F /* WordPressAuthenticatorConfiguration.swift */,
403+
CE1B18D120EEC44400BECC3F /* WordPressAuthenticatorStyles.swift */,
394404
);
395405
path = Authenticator;
396406
sourceTree = "<group>";
@@ -403,6 +413,7 @@
403413
B5609105208A54F800399AE4 /* OnePasswordFacade.swift */,
404414
B5609104208A54F800399AE4 /* SafariCredentialsService.swift */,
405415
B56090FE208A54F700399AE4 /* SignupService.swift */,
416+
CE1B18C820EEC2C200BECC3F /* SocialService.swift */,
406417
B56090FF208A54F800399AE4 /* WordPressComAccountService.swift */,
407418
B56090FC208A54F700399AE4 /* WordPressComBlogService.swift */,
408419
B56090FD208A54F700399AE4 /* WordPressComOAuthClientFacade.h */,
@@ -468,6 +479,7 @@
468479
B5ED78F6207E976500A8FD8C /* WordPressAuthenticator */ = {
469480
isa = PBXGroup;
470481
children = (
482+
CE1B18CA20EEC31000BECC3F /* Credentials */,
471483
B5609099208A4EAF00399AE4 /* Authenticator */,
472484
B560909B208A4EB000399AE4 /* Extensions */,
473485
B5ED7917207E993E00A8FD8C /* Logging */,
@@ -519,6 +531,14 @@
519531
path = Logging;
520532
sourceTree = "<group>";
521533
};
534+
CE1B18CA20EEC31000BECC3F /* Credentials */ = {
535+
isa = PBXGroup;
536+
children = (
537+
CE1B18CB20EEC32400BECC3F /* WordPressCredentials.swift */,
538+
);
539+
path = Credentials;
540+
sourceTree = "<group>";
541+
};
522542
/* End PBXGroup section */
523543

524544
/* Begin PBXHeadersBuildPhase section */
@@ -731,7 +751,6 @@
731751
"${BUILT_PRODUCTS_DIR}/OHHTTPStubs/OHHTTPStubs.framework",
732752
"${BUILT_PRODUCTS_DIR}/Specta/Specta.framework",
733753
"${BUILT_PRODUCTS_DIR}/1PasswordExtension/OnePasswordExtension.framework",
734-
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
735754
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
736755
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
737756
"${BUILT_PRODUCTS_DIR}/FormatterKit/FormatterKit.framework",
@@ -755,7 +774,6 @@
755774
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OHHTTPStubs.framework",
756775
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Specta.framework",
757776
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OnePasswordExtension.framework",
758-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
759777
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
760778
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
761779
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FormatterKit.framework",
@@ -790,11 +808,13 @@
790808
B5609140208A563800399AE4 /* LoginSocialErrorCell.swift in Sources */,
791809
B56090F7208A533200399AE4 /* WordPressAuthenticator+Errors.swift in Sources */,
792810
B56090D2208A4F5400399AE4 /* NUXButton.swift in Sources */,
811+
CE1B18C920EEC2C200BECC3F /* SocialService.swift in Sources */,
793812
B56090D3208A4F5400399AE4 /* NUXLinkAuthViewController.swift in Sources */,
794813
B5609120208A555E00399AE4 /* SignupNavigationController.swift in Sources */,
795814
B5609143208A563800399AE4 /* LoginSocialErrorViewController.swift in Sources */,
796815
B56090F8208A533200399AE4 /* WordPressAuthenticator+Notifications.swift in Sources */,
797816
B56090EA208A51D000399AE4 /* LoginFields+Validation.swift in Sources */,
817+
CE1B18CC20EEC32400BECC3F /* WordPressCredentials.swift in Sources */,
798818
98AA5A5720AA1A7000A5958A /* WPHelpIndicatorView.swift in Sources */,
799819
B560913C208A563800399AE4 /* LoginProloguePromoViewController.swift in Sources */,
800820
B560910F208A54F800399AE4 /* SafariCredentialsService.swift in Sources */,
@@ -816,7 +836,10 @@
816836
B560910C208A54F800399AE4 /* WordPressComOAuthClientFacade.m in Sources */,
817837
B55272C320B2FE4100E18BC5 /* WPAuthenticatorLoggingPrivate.m in Sources */,
818838
B56090C7208A4F5400399AE4 /* NUXKeyboardResponder.swift in Sources */,
839+
CE1B18D020EEC41600BECC3F /* WordPressAuthenticatorConfiguration.swift in Sources */,
840+
CE1B18D220EEC44400BECC3F /* WordPressAuthenticatorStyles.swift in Sources */,
819841
B56090F0208A527000399AE4 /* FancyAlertViewController+LoginError.swift in Sources */,
842+
CE1B18CE20EEC3CB00BECC3F /* WordPressAuthenticatorDelegateProtocol.swift in Sources */,
820843
B5609110208A54F800399AE4 /* OnePasswordFacade.swift in Sources */,
821844
B5609109208A54F800399AE4 /* SignupService.swift in Sources */,
822845
B560913D208A563800399AE4 /* LoginProloguePageViewController.swift in Sources */,
@@ -840,7 +863,6 @@
840863
B56090E4208A4F9D00399AE4 /* WPNUXMainButton.m in Sources */,
841864
B560913B208A563800399AE4 /* LoginSelfHostedViewController.swift in Sources */,
842865
B5609136208A563800399AE4 /* Login2FAViewController.swift in Sources */,
843-
B56090CE208A4F5400399AE4 /* NUXSubmitButton.swift in Sources */,
844866
B56090E1208A4F9D00399AE4 /* WPWalkthroughTextField.m in Sources */,
845867
B56090EF208A527000399AE4 /* WPStyleGuide+Login.swift in Sources */,
846868
B56090D0208A4F5400399AE4 /* NUXViewControllerBase.swift in Sources */,

0 commit comments

Comments
 (0)