Skip to content

Commit d17bda5

Browse files
author
andrewtweber
committed
Change image
1 parent 8a89419 commit d17bda5

File tree

10 files changed

+19
-31
lines changed

10 files changed

+19
-31
lines changed

‎Popping.xcodeproj/project.pbxproj

+9-21
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
4915D98921CAFCC200A1D373 /* ButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4915D98821CAFCC200A1D373 /* ButtonViewController.swift */; };
11+
4915D98B21CB0B4B00A1D373 /* winnie.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 4915D98A21CB0B4B00A1D373 /* winnie.jpg */; };
1112
491D3D3421CAEA4C00D72279 /* PaperButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 491D3D3321CAEA4C00D72279 /* PaperButton.swift */; };
1213
491D3D3621CAED9900D72279 /* PaperButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 491D3D3521CAED9900D72279 /* PaperButtonViewController.swift */; };
1314
49A58FB621C9DF0E001F775C /* DismissingAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49A58FB521C9DF0E001F775C /* DismissingAnimator.swift */; };
@@ -33,14 +34,12 @@
3334
B785AD1519196A2D00621820 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B785AD1419196A2D00621820 /* Foundation.framework */; };
3435
B785AD1719196A2D00621820 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B785AD1619196A2D00621820 /* CoreGraphics.framework */; };
3536
B785AD1919196A2D00621820 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B785AD1819196A2D00621820 /* UIKit.framework */; };
36-
B785AD1F19196A2D00621820 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B785AD1D19196A2D00621820 /* InfoPlist.strings */; };
3737
B785AD2719196A2D00621820 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B785AD2619196A2D00621820 /* Images.xcassets */; };
3838
B785AD2E19196A2D00621820 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B785AD2D19196A2D00621820 /* XCTest.framework */; };
3939
B785AD2F19196A2D00621820 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B785AD1419196A2D00621820 /* Foundation.framework */; };
4040
B785AD3019196A2D00621820 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B785AD1819196A2D00621820 /* UIKit.framework */; };
4141
B785AD3819196A2D00621820 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B785AD3619196A2D00621820 /* InfoPlist.strings */; };
4242
B785AD3A19196A2D00621820 /* PoppingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B785AD3919196A2D00621820 /* PoppingTests.m */; };
43-
B7F8B05F19326C310036193C /* boat.jpg in Resources */ = {isa = PBXBuildFile; fileRef = B7F8B05E19326C310036193C /* boat.jpg */; };
4443
D26921FD32BE44A8B661720F /* Pods_Popping.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F0418B8F5248013F1DDEB1F /* Pods_Popping.framework */; };
4544
/* End PBXBuildFile section */
4645

@@ -56,6 +55,7 @@
5655

5756
/* Begin PBXFileReference section */
5857
4915D98821CAFCC200A1D373 /* ButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonViewController.swift; sourceTree = "<group>"; };
58+
4915D98A21CB0B4B00A1D373 /* winnie.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = winnie.jpg; sourceTree = "<group>"; };
5959
491D3D3321CAEA4C00D72279 /* PaperButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaperButton.swift; sourceTree = "<group>"; };
6060
491D3D3521CAED9900D72279 /* PaperButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaperButtonViewController.swift; sourceTree = "<group>"; };
6161
49A58FB521C9DF0E001F775C /* DismissingAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DismissingAnimator.swift; sourceTree = "<group>"; };
@@ -85,15 +85,13 @@
8585
B785AD1419196A2D00621820 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
8686
B785AD1619196A2D00621820 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
8787
B785AD1819196A2D00621820 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
88-
B785AD1C19196A2D00621820 /* Popping-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Popping-Info.plist"; sourceTree = "<group>"; };
89-
B785AD1E19196A2D00621820 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
88+
B785AD1C19196A2D00621820 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9089
B785AD2619196A2D00621820 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
9190
B785AD2C19196A2D00621820 /* PoppingTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PoppingTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
9291
B785AD2D19196A2D00621820 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
9392
B785AD3519196A2D00621820 /* PoppingTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PoppingTests-Info.plist"; sourceTree = "<group>"; };
9493
B785AD3719196A2D00621820 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
9594
B785AD3919196A2D00621820 /* PoppingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PoppingTests.m; sourceTree = "<group>"; };
96-
B7F8B05E19326C310036193C /* boat.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = boat.jpg; sourceTree = "<group>"; };
9795
/* End PBXFileReference section */
9896

9997
/* Begin PBXFrameworksBuildPhase section */
@@ -180,11 +178,10 @@
180178
B785AD1B19196A2D00621820 /* Supporting Files */ = {
181179
isa = PBXGroup;
182180
children = (
183-
B7F8B05E19326C310036193C /* boat.jpg */,
184-
B785AD1C19196A2D00621820 /* Popping-Info.plist */,
185-
B785AD1D19196A2D00621820 /* InfoPlist.strings */,
181+
B785AD1C19196A2D00621820 /* Info.plist */,
182+
4915D98A21CB0B4B00A1D373 /* winnie.jpg */,
186183
);
187-
name = "Supporting Files";
184+
path = "Supporting Files";
188185
sourceTree = "<group>";
189186
};
190187
B785AD3319196A2D00621820 /* PoppingTests */ = {
@@ -343,9 +340,8 @@
343340
isa = PBXResourcesBuildPhase;
344341
buildActionMask = 2147483647;
345342
files = (
346-
B785AD1F19196A2D00621820 /* InfoPlist.strings in Resources */,
347-
B7F8B05F19326C310036193C /* boat.jpg in Resources */,
348343
B785AD2719196A2D00621820 /* Images.xcassets in Resources */,
344+
4915D98B21CB0B4B00A1D373 /* winnie.jpg in Resources */,
349345
);
350346
runOnlyForDeploymentPostprocessing = 0;
351347
};
@@ -456,14 +452,6 @@
456452
/* End PBXTargetDependency section */
457453

458454
/* Begin PBXVariantGroup section */
459-
B785AD1D19196A2D00621820 /* InfoPlist.strings */ = {
460-
isa = PBXVariantGroup;
461-
children = (
462-
B785AD1E19196A2D00621820 /* en */,
463-
);
464-
name = InfoPlist.strings;
465-
sourceTree = "<group>";
466-
};
467455
B785AD3619196A2D00621820 /* InfoPlist.strings */ = {
468456
isa = PBXVariantGroup;
469457
children = (
@@ -585,7 +573,7 @@
585573
DEVELOPMENT_TEAM = EUHBJ29876;
586574
GCC_PRECOMPILE_PREFIX_HEADER = YES;
587575
GCC_PREFIX_HEADER = "";
588-
INFOPLIST_FILE = "Popping/Popping-Info.plist";
576+
INFOPLIST_FILE = "$(SRCROOT)/Popping/Supporting Files/Info.plist";
589577
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
590578
PRODUCT_BUNDLE_IDENTIFIER = cool.andrew.Popping;
591579
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -606,7 +594,7 @@
606594
DEVELOPMENT_TEAM = EUHBJ29876;
607595
GCC_PRECOMPILE_PREFIX_HEADER = YES;
608596
GCC_PREFIX_HEADER = "";
609-
INFOPLIST_FILE = "Popping/Popping-Info.plist";
597+
INFOPLIST_FILE = "$(SRCROOT)/Popping/Supporting Files/Info.plist";
610598
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
611599
PRODUCT_BUNDLE_IDENTIFIER = cool.andrew.Popping;
612600
PRODUCT_NAME = "$(TARGET_NAME)";

‎Popping/Animators/DismissingAnimator.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Popping
44
//
55
// Created by Andrew Weber on 12/18/18.
6-
// Copyright © 2018 André Schneider. All rights reserved.
6+
// Copyright © 2018 Andrew Weber. All rights reserved.
77
//
88

99
import pop

‎Popping/Controls/FoldingView.swift

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class FoldingView: UIView
5151
self.topView.isUserInteractionEnabled = true
5252
self.topView.contentMode = .scaleAspectFill
5353

54+
// TODO: blurred image is too small
5455
self.backView = UIImageView(frame: self.topView.bounds)
5556
self.backView.image = image.blurred
5657
self.backView.alpha = 0.0

‎Popping/Popping-Info.plist renamed to ‎Popping/Supporting Files/Info.plist

File renamed without changes.

‎Popping/Supporting Files/winnie.jpg

163 KB
Loading

‎Popping/ViewControllers/FoldingViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class FoldingViewController: UIViewController
3030
let width: CGFloat = self.view.bounds.width - (padding * 2)
3131
let frame: CGRect = CGRect(x: 0, y: 0, width: width, height: width)
3232

33-
self.foldView = FoldingView(frame: frame, image: UIImage(named: "boat.jpg")!)
33+
self.foldView = FoldingView(frame: frame, image: UIImage(named: "winnie.jpg")!)
3434
self.foldView.center = self.view.center
3535
self.view.addSubview(self.foldView)
3636
}

‎Popping/ViewControllers/ImageViewController.swift

+4-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ImageViewController: UIViewController
3232
let height = width * 0.75
3333
let imageView = ImageView(frame: CGRect(x: 0, y: 0, width: width, height: height))
3434
imageView.center = self.view.center
35-
imageView.setImage(UIImage(named: "boat.jpg")!)
35+
imageView.setImage(UIImage(named: "winnie.jpg")!)
3636
imageView.addTarget(self, action: #selector(touchDown), for: .touchDown)
3737
imageView.addTarget(self, action: #selector(touchUpInside), for: .touchUpInside)
3838
imageView.addGestureRecognizer(recognizer)
@@ -114,17 +114,16 @@ class ImageViewController: UIViewController
114114

115115
func pauseAllAnimations(_ pause: Bool, forLayer layer: CALayer)
116116
{
117-
// TODO for some reason layer is nil when called from touchDown
118-
if (pause == true) {
117+
guard let keys = layer.pop_animationKeys() else {
119118
return
120119
}
121-
for key in layer.pop_animationKeys() {
120+
for key in keys {
122121
let animation: POPAnimation = layer.pop_animation(forKey: key as? String) as! POPAnimation
123122
animation.isPaused = pause
124123
}
125124
}
126125

127-
// TODO this never happens?
126+
// TODO: this never happens?
128127
func scaleUpView(_ view: UIView) {
129128
if let positionAnimation = POPSpringAnimation(propertyNamed: kPOPLayerPosition) {
130129
positionAnimation.toValue = self.view.center

‎Popping/ViewControllers/PaperButtonViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class PaperButtonViewController: UIViewController
5757
@objc func animateTitleLabel(_ sender: Any) {
5858
let toValue: CGFloat = self.view.bounds.midX
5959

60-
// TODO on screen animation is not springy
60+
// TODO: on screen animation is not springy
6161
guard let onscreenAnimation = POPSpringAnimation(propertyNamed: kPOPLayerPositionX) else {
6262
return
6363
}

‎Popping/boat.jpg

-99.6 KB
Binary file not shown.

‎PoppingTests/PoppingTests.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// PoppingTests.m
33
// PoppingTests
44
//
5-
// Created by André Schneider on 06.05.14.
6-
// Copyright (c) 2014 André Schneider. All rights reserved.
5+
// Created by Andrew Weber on 06.05.14.
6+
// Copyright © 2018 Andrew Weber. All rights reserved.
77
//
88

99
#import <XCTest/XCTest.h>

0 commit comments

Comments
 (0)