Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def wordpress_authenticator_pods
pod 'Alamofire', '4.8'
pod 'CocoaLumberjack', '3.5.2'
pod 'GoogleSignIn', '4.4.0'
pod 'lottie-ios', '2.5.2'
pod 'lottie-ios', '3.1.6'
pod 'NSURL+IDN', '0.4'
pod 'SVProgressHUD', '2.2.5'
end
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PODS:
- "GoogleToolboxForMac/NSString+URLArguments (2.2.2)"
- Gridicons (0.20-beta.1)
- GTMSessionFetcher/Core (1.3.1)
- lottie-ios (2.5.2)
- lottie-ios (3.1.6)
- NSObject-SafeExpectations (0.0.4)
- "NSURL+IDN (0.4)"
- OCMock (3.6)
Expand Down Expand Up @@ -64,7 +64,7 @@ DEPENDENCIES:
- Expecta (= 1.0.6)
- GoogleSignIn (= 4.4.0)
- Gridicons (~> 0.20-beta.1)
- lottie-ios (= 2.5.2)
- lottie-ios (= 3.1.6)
- "NSURL+IDN (= 0.4)"
- OCMock (~> 3.4)
- OHHTTPStubs (= 8.0.0)
Expand Down Expand Up @@ -109,7 +109,7 @@ SPEC CHECKSUMS:
GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3
Gridicons: a89c04840b560895223a2c5c1e1299b518e0fc6f
GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925
lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
lottie-ios: 85ce835dd8c53e02509f20729fc7d6a4e6645a0a
NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374
"NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca
OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
Expand All @@ -122,6 +122,6 @@ SPEC CHECKSUMS:
WordPressUI: 77907b59f39530af1003a30e6148a3ad0d2b179f
wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95

PODFILE CHECKSUM: 068e02be265114c0d3e8b5505b680cb23aceddcd
PODFILE CHECKSUM: 03cc79718f43514bcbc8fcda080d47758031a031

COCOAPODS: 1.8.4
4 changes: 2 additions & 2 deletions WordPressAuthenticator.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "WordPressAuthenticator"
s.version = "1.11.0-beta.8"
s.version = "1.11.0-beta.9"
s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."

s.description = <<-DESC
Expand Down Expand Up @@ -33,7 +33,7 @@ Pod::Spec.new do |s|
s.dependency '1PasswordExtension', '1.8.5'
s.dependency 'Alamofire', '4.8'
s.dependency 'CocoaLumberjack', '~> 3.5'
s.dependency 'lottie-ios', '2.5.2'
s.dependency 'lottie-ios', '3.1.6'
s.dependency 'NSURL+IDN', '0.4'
s.dependency 'SVProgressHUD', '2.2.5'

Expand Down
12 changes: 6 additions & 6 deletions WordPressAuthenticator/Signin/Login.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -403,29 +403,29 @@
<rect key="frame" x="0.0" y="0.0" width="383" height="559"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wnq-Hk-jIw" userLabel="Header" customClass="SiteInfoHeaderView" customModule="WordPressAuthenticator">
<rect key="frame" x="20" y="197.5" width="343" height="40"/>
<rect key="frame" x="20" y="201.5" width="343" height="36"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="rFl-BX-tKE" userLabel="Header Stack View">
<rect key="frame" x="0.0" y="0.0" width="343" height="40"/>
<rect key="frame" x="0.0" y="0.0" width="343" height="36"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="750" verticalHuggingPriority="750" image="icon-url-field" translatesAutoresizingMaskIntoConstraints="NO" id="Dfh-U3-cvf" userLabel="Icon">
<rect key="frame" x="0.0" y="0.0" width="36" height="40"/>
<rect key="frame" x="0.0" y="7" width="18" height="22"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="40" id="F6S-wN-1Jp"/>
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="40" id="Z7H-Ud-llZ"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="uN1-Al-ygf">
<rect key="frame" x="46" y="2" width="297" height="36"/>
<rect key="frame" x="28" y="0.0" width="315" height="36"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ehh-92-XG8" userLabel="Title">
<rect key="frame" x="0.0" y="0.0" width="297" height="18"/>
<rect key="frame" x="0.0" y="0.0" width="315" height="18"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
<color key="textColor" red="0.18039215689999999" green="0.2666666667" blue="0.32549019610000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UL4-G6-7G6" userLabel="Subtitle">
<rect key="frame" x="0.0" y="18" width="297" height="18"/>
<rect key="frame" x="0.0" y="18" width="315" height="18"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
<color key="textColor" red="0.1803921568627451" green="0.26666666666666666" blue="0.32549019607843138" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class LoginProloguePromoViewController: UIViewController {
fileprivate let stackView: UIStackView
fileprivate let headingLabel: UILabel
fileprivate let animationHolder: UIView
fileprivate var animationView: LOTAnimationView
fileprivate var animationView: AnimationView

fileprivate struct Constants {
static let stackSpacing: CGFloat = 36.0
Expand Down Expand Up @@ -41,7 +41,7 @@ class LoginProloguePromoViewController: UIViewController {
case .notifications:
return NSLocalizedString("Your notifications travel with you — see comments and likes as they happen.", comment: "shown in promotional screens during first launch")
case .jetpack:
return NSLocalizedString("Manage your Jetpack-powered site on the go — youve got WordPress in your pocket.", comment: "shown in promotional screens during first launch")
return NSLocalizedString("Manage your Jetpack-powered site on the go — you've got WordPress in your pocket.", comment: "shown in promotional screens during first launch")
}
}

Expand All @@ -57,7 +57,7 @@ class LoginProloguePromoViewController: UIViewController {
animationHolder = UIView()

let bundle = WordPressAuthenticator.bundle
animationView = LOTAnimationView(name: type.animationKey, bundle: bundle)
animationView = AnimationView(name: type.animationKey, bundle: bundle)

super.init(nibName: nil, bundle: nil)
}
Expand Down Expand Up @@ -96,7 +96,7 @@ class LoginProloguePromoViewController: UIViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)

animationView.animationProgress = 0.0
animationView.currentProgress = 0.0
}

override func viewDidAppear(_ animated: Bool) {
Expand Down