Skip to content

Commit

Permalink
Slight animation tweak and CPButtonView label position changed
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbpowell
cbpowell committed Feb 22, 2012
1 parent 7cffcd7 commit ae61f36
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 6 deletions.
7 changes: 4 additions & 3 deletions UIColorCrossFadeDemo/CPViewController.m
View file
Expand Up @@ -95,19 +95,20 @@ - (void)colorPickerControllerDidFinish:(InfColorPickerController*)picker {
self.colorB = picker.resultColor;
self.buttonB.backgroundColor = colorB;
} else {
NSLog(@"Wat");
NSLog(@"wat");
}

UIColor *crossFade = [UIColor colorForFadeBetweenFirstColor:self.colorA secondColor:self.colorB atRatio:self.slider.value];
[UIView animateWithDuration:1.0
delay:1.0
delay:0.4
options:UIViewAnimationOptionCurveLinear
animations:^{self.view.backgroundColor = crossFade;}
completion:^(BOOL finished) {
//Done

}];
[self dismissModalViewControllerAnimated: YES];

[self dismissModalViewControllerAnimated:YES];
}

@end
78 changes: 75 additions & 3 deletions UIColorCrossFadeDemo/en.lproj/CPViewController.xib
View file
Expand Up @@ -41,6 +41,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{18, 315}, {284, 23}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="249015919"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
Expand All @@ -53,6 +54,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{125, 345}, {70, 21}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
Expand Down Expand Up @@ -86,8 +88,9 @@
<object class="IBUILabel" id="500180431">
<reference key="NSNextResponder" ref="262281587"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{32, 40}, {57, 21}}</string>
<string key="NSFrame">{{32, 50}, {57, 21}}</string>
<reference key="NSSuperview" ref="262281587"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1070837047"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
Expand All @@ -107,6 +110,7 @@
</array>
<string key="NSFrame">{{20, 68}, {121, 121}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="500180431"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
Expand All @@ -122,8 +126,9 @@
<object class="IBUILabel" id="547540211">
<reference key="NSNextResponder" ref="1070837047"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{32, 40}, {58, 21}}</string>
<string key="NSFrame">{{31, 50}, {58, 21}}</string>
<reference key="NSSuperview" ref="1070837047"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1070974518"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
Expand All @@ -143,6 +148,7 @@
</array>
<string key="NSFrame">{{179, 68}, {121, 121}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="547540211"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
Expand All @@ -154,6 +160,7 @@
</array>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="262281587"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
Expand Down Expand Up @@ -324,7 +331,72 @@
<nil key="sourceID"/>
<int key="maxID">22</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">CPButtonView</string>
<string key="superclassName">UIView</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">viewController</string>
<string key="NS.object.0">UIViewController</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">viewController</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">viewController</string>
<string key="candidateClassName">UIViewController</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/CPButtonView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">CPViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">sliderValueChanged:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">sliderValueChanged:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">sliderValueChanged:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="buttonA">CPButtonView</string>
<string key="buttonB">CPButtonView</string>
<string key="label">UILabel</string>
<string key="slider">UISlider</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="buttonA">
<string key="name">buttonA</string>
<string key="candidateClassName">CPButtonView</string>
</object>
<object class="IBToOneOutletInfo" key="buttonB">
<string key="name">buttonB</string>
<string key="candidateClassName">CPButtonView</string>
</object>
<object class="IBToOneOutletInfo" key="label">
<string key="name">label</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo" key="slider">
<string key="name">slider</string>
<string key="candidateClassName">UISlider</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/CPViewController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
Expand Down

0 comments on commit ae61f36

Please sign in to comment.