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

Commit 82e958b

Browse files
mindgraffitimindgraffiti
authored
Merge pull request #204 from wordpress-mobile/issue/84-update-lottie
Update Lottie
2 parents db817ea + 662a401 commit 82e958b

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def wordpress_authenticator_pods
2222
pod 'Alamofire', '4.8'
2323
pod 'CocoaLumberjack', '3.5.2'
2424
pod 'GoogleSignIn', '4.4.0'
25-
pod 'lottie-ios', '2.5.2'
25+
pod 'lottie-ios', '3.1.6'
2626
pod 'NSURL+IDN', '0.4'
2727
pod 'SVProgressHUD', '2.2.5'
2828
end

‎Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ PODS:
2222
- "GoogleToolboxForMac/NSString+URLArguments (2.2.2)"
2323
- Gridicons (0.20-beta.1)
2424
- GTMSessionFetcher/Core (1.3.1)
25-
- lottie-ios (2.5.2)
25+
- lottie-ios (3.1.6)
2626
- NSObject-SafeExpectations (0.0.4)
2727
- "NSURL+IDN (0.4)"
2828
- OCMock (3.6)
@@ -64,7 +64,7 @@ DEPENDENCIES:
6464
- Expecta (= 1.0.6)
6565
- GoogleSignIn (= 4.4.0)
6666
- Gridicons (~> 0.20-beta.1)
67-
- lottie-ios (= 2.5.2)
67+
- lottie-ios (= 3.1.6)
6868
- "NSURL+IDN (= 0.4)"
6969
- OCMock (~> 3.4)
7070
- OHHTTPStubs (= 8.0.0)
@@ -109,7 +109,7 @@ SPEC CHECKSUMS:
109109
GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3
110110
Gridicons: a89c04840b560895223a2c5c1e1299b518e0fc6f
111111
GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925
112-
lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
112+
lottie-ios: 85ce835dd8c53e02509f20729fc7d6a4e6645a0a
113113
NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374
114114
"NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca
115115
OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
@@ -122,6 +122,6 @@ SPEC CHECKSUMS:
122122
WordPressUI: 77907b59f39530af1003a30e6148a3ad0d2b179f
123123
wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95
124124

125-
PODFILE CHECKSUM: 068e02be265114c0d3e8b5505b680cb23aceddcd
125+
PODFILE CHECKSUM: 03cc79718f43514bcbc8fcda080d47758031a031
126126

127127
COCOAPODS: 1.8.4

‎WordPressAuthenticator.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPressAuthenticator"
3-
s.version = "1.11.0-beta.8"
3+
s.version = "1.11.0-beta.9"
44
s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
55

66
s.description = <<-DESC
@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
3333
s.dependency '1PasswordExtension', '1.8.5'
3434
s.dependency 'Alamofire', '4.8'
3535
s.dependency 'CocoaLumberjack', '~> 3.5'
36-
s.dependency 'lottie-ios', '2.5.2'
36+
s.dependency 'lottie-ios', '3.1.6'
3737
s.dependency 'NSURL+IDN', '0.4'
3838
s.dependency 'SVProgressHUD', '2.2.5'
3939

‎WordPressAuthenticator/Signin/Login.storyboard‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,29 +403,29 @@
403403
<rect key="frame" x="0.0" y="0.0" width="383" height="559"/>
404404
<subviews>
405405
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wnq-Hk-jIw" userLabel="Header" customClass="SiteInfoHeaderView" customModule="WordPressAuthenticator">
406-
<rect key="frame" x="20" y="197.5" width="343" height="40"/>
406+
<rect key="frame" x="20" y="201.5" width="343" height="36"/>
407407
<subviews>
408408
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="rFl-BX-tKE" userLabel="Header Stack View">
409-
<rect key="frame" x="0.0" y="0.0" width="343" height="40"/>
409+
<rect key="frame" x="0.0" y="0.0" width="343" height="36"/>
410410
<subviews>
411411
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="750" verticalHuggingPriority="750" image="icon-url-field" translatesAutoresizingMaskIntoConstraints="NO" id="Dfh-U3-cvf" userLabel="Icon">
412-
<rect key="frame" x="0.0" y="0.0" width="36" height="40"/>
412+
<rect key="frame" x="0.0" y="7" width="18" height="22"/>
413413
<constraints>
414414
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="40" id="F6S-wN-1Jp"/>
415415
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="40" id="Z7H-Ud-llZ"/>
416416
</constraints>
417417
</imageView>
418418
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="uN1-Al-ygf">
419-
<rect key="frame" x="46" y="2" width="297" height="36"/>
419+
<rect key="frame" x="28" y="0.0" width="315" height="36"/>
420420
<subviews>
421421
<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">
422-
<rect key="frame" x="0.0" y="0.0" width="297" height="18"/>
422+
<rect key="frame" x="0.0" y="0.0" width="315" height="18"/>
423423
<fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
424424
<color key="textColor" red="0.18039215689999999" green="0.2666666667" blue="0.32549019610000002" alpha="1" colorSpace="calibratedRGB"/>
425425
<nil key="highlightedColor"/>
426426
</label>
427427
<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">
428-
<rect key="frame" x="0.0" y="18" width="297" height="18"/>
428+
<rect key="frame" x="0.0" y="18" width="315" height="18"/>
429429
<fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
430430
<color key="textColor" red="0.1803921568627451" green="0.26666666666666666" blue="0.32549019607843138" alpha="1" colorSpace="calibratedRGB"/>
431431
<nil key="highlightedColor"/>

‎WordPressAuthenticator/Signin/LoginProloguePromoViewController.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class LoginProloguePromoViewController: UIViewController {
88
fileprivate let stackView: UIStackView
99
fileprivate let headingLabel: UILabel
1010
fileprivate let animationHolder: UIView
11-
fileprivate var animationView: LOTAnimationView
11+
fileprivate var animationView: AnimationView
1212

1313
fileprivate struct Constants {
1414
static let stackSpacing: CGFloat = 36.0
@@ -41,7 +41,7 @@ class LoginProloguePromoViewController: UIViewController {
4141
case .notifications:
4242
return NSLocalizedString("Your notifications travel with you — see comments and likes as they happen.", comment: "shown in promotional screens during first launch")
4343
case .jetpack:
44-
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")
44+
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")
4545
}
4646
}
4747

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

5959
let bundle = WordPressAuthenticator.bundle
60-
animationView = LOTAnimationView(name: type.animationKey, bundle: bundle)
60+
animationView = AnimationView(name: type.animationKey, bundle: bundle)
6161

6262
super.init(nibName: nil, bundle: nil)
6363
}
@@ -96,7 +96,7 @@ class LoginProloguePromoViewController: UIViewController {
9696
override func viewWillAppear(_ animated: Bool) {
9797
super.viewWillAppear(animated)
9898

99-
animationView.animationProgress = 0.0
99+
animationView.currentProgress = 0.0
100100
}
101101

102102
override func viewDidAppear(_ animated: Bool) {

0 commit comments

Comments
 (0)