Skip to content

update #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hiliuxu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions FastAnimationWithPopDemo.xcworkspace/xcshareddata/FastAnimationWithPopDemo.xccheckout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,48 +5,48 @@
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>A0215063-9B2E-4AEF-9F00-ADE69CE39203</string>
<string>A3CABABC-DA9F-4030-A2F7-40F1CC8CB4F6</string>
<key>IDESourceControlProjectName</key>
<string>FastAnimationWithPopDemo</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>634DA2FF-8AE3-4C26-905B-C74B0B8F299E</key>
<string>ssh://github.com/WilliamZang/FastAnimationWithPopDemo.git</string>
<key>C9658CEF-A55D-49A7-B07E-8469BB9A0107</key>
<string>ssh://github.com/WilliamZang/FastAnimationWithPOP.git</string>
<key>7FE37BA9-9617-4D89-8320-2299770CCCE7</key>
<string>https://github.com/WilliamZang/FastAnimationWithPOP</string>
<key>F0AC5CE7-6D41-4BD9-9752-F4EEA45AD276</key>
<string>https://github.com/hiliuxu/FastAnimationWithPopDemo</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>FastAnimationWithPopDemo.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>634DA2FF-8AE3-4C26-905B-C74B0B8F299E</key>
<string>..</string>
<key>C9658CEF-A55D-49A7-B07E-8469BB9A0107</key>
<key>7FE37BA9-9617-4D89-8320-2299770CCCE7</key>
<string>../../FastAnimationWithPOP</string>
<key>F0AC5CE7-6D41-4BD9-9752-F4EEA45AD276</key>
<string>..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>ssh://github.com/WilliamZang/FastAnimationWithPopDemo.git</string>
<string>https://github.com/hiliuxu/FastAnimationWithPopDemo</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>634DA2FF-8AE3-4C26-905B-C74B0B8F299E</string>
<string>F0AC5CE7-6D41-4BD9-9752-F4EEA45AD276</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>C9658CEF-A55D-49A7-B07E-8469BB9A0107</string>
<string>7FE37BA9-9617-4D89-8320-2299770CCCE7</string>
<key>IDESourceControlWCCName</key>
<string>FastAnimationWithPOP</string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>634DA2FF-8AE3-4C26-905B-C74B0B8F299E</string>
<string>F0AC5CE7-6D41-4BD9-9752-F4EEA45AD276</string>
<key>IDESourceControlWCCName</key>
<string>FastAnimationWithPopDemo</string>
<string>ForkFastAnimationWithPopDemo</string>
</dict>
</array>
</dict>
Expand Down
69 changes: 47 additions & 22 deletions FastAnimationWithPopDemo/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="48b-x3-4RL">
<dependencies>
<deployment defaultVersion="1536" identifier="iOS"/>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
</dependencies>
<scenes>
Expand All @@ -14,76 +14,101 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoDark" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="7MY-7Q-f7j">
<rect key="frame" x="223" y="355" width="22" height="22"/>
<rect key="frame" x="37" y="351" width="22" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="animationType" value="ZoomOutX"/>
<userDefinedRuntimeAttribute type="number" keyPath="delay">
<real key="value" value="2.5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="ie3-Bc-rdF">
<rect key="frame" x="25" y="336" width="123" height="29"/>
<rect key="frame" x="37" y="301" width="123" height="29"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<segments>
<segment title="First"/>
<segment title="Second"/>
</segments>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="animationType" value="BounceDown"/>
<userDefinedRuntimeAttribute type="number" keyPath="delay">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</segmentedControl>
<view contentMode="scaleToFill" id="ajK-mi-jQa">
<rect key="frame" x="14" y="71" width="94" height="91"/>
<rect key="frame" x="37" y="71" width="179" height="53"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UIView" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Syu-Ri-ikc">
<rect key="frame" x="0.0" y="0.0" width="179" height="53"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.11764706671237946" green="0.87843143939971924" blue="0.5215686559677124" alpha="1" colorSpace="deviceRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="animationType" value="Shake"/>
<userDefinedRuntimeAttribute type="number" keyPath="animationParams.velocity">
<integer key="value" value="-7000"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="delay">
<real key="value" value="0.5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" id="vMN-tc-vvc">
<rect key="frame" x="113" y="394" width="94" height="91"/>
<rect key="frame" x="37" y="184" width="94" height="91"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UIView" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bnu-es-4Xm">
<rect key="frame" x="0.0" y="0.0" width="94" height="91"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.0" green="0.65882354974746704" blue="0.89803928136825562" alpha="1" colorSpace="deviceRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="animationType" value="Group"/>
<userDefinedRuntimeAttribute type="string" keyPath="animationParams.animations" value="BounceDown, Shake"/>
<userDefinedRuntimeAttribute type="string" keyPath="animationParams.animations" value="BounceRight"/>
<userDefinedRuntimeAttribute type="number" keyPath="delay">
<real key="value" value="1.5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="ynm-X8-z0Z">
<rect key="frame" x="187" y="71" width="94" height="276"/>
<rect key="frame" x="37" y="381" width="263" height="178"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
<mutableString key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</mutableString>
<color key="textColor" red="0.90196084976196289" green="0.18039216101169586" blue="0.50196081399917603" alpha="1" colorSpace="deviceRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="animationType" value="ZoomOutY"/>
<userDefinedRuntimeAttribute type="number" keyPath="delay">
<integer key="value" value="3"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textView>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label111" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jun-s7-Ruc">
<rect key="frame" x="25" y="273" width="147" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="animationType" value="BounceRight"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Q3v-Nt-rKB">
<rect key="frame" x="40" y="179" width="42" height="21"/>
<rect key="frame" x="37" y="143" width="113" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0039215688589999999" green="0.82352948189999997" blue="0.66666668650000005" alpha="1" colorSpace="deviceRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="animationType" value="BounceRight"/>
<userDefinedRuntimeAttribute type="number" keyPath="delay">
<integer key="value" value="2"/>
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
Expand Down