From d05ec13c0115d364e69b237839cd874689921458 Mon Sep 17 00:00:00 2001 From: dmaclach Date: Thu, 14 Jul 2011 20:40:57 +0000 Subject: Added by hand due to perforce problems. GTMKeyValueAnimation is a simple key path animation class based on NSAnimation --- AppKit/GTMKeyValueAnimation.h | 36 +++++++++++++++++++++++++ AppKit/GTMKeyValueAnimation.m | 52 ++++++++++++++++++++++++++++++++++++ AppKit/GTMKeyValueAnimationTest.m | 55 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 AppKit/GTMKeyValueAnimation.h create mode 100644 AppKit/GTMKeyValueAnimation.m create mode 100644 AppKit/GTMKeyValueAnimationTest.m (limited to 'AppKit') diff --git a/AppKit/GTMKeyValueAnimation.h b/AppKit/GTMKeyValueAnimation.h new file mode 100644 index 0000000..6860012 --- /dev/null +++ b/AppKit/GTMKeyValueAnimation.h @@ -0,0 +1,36 @@ +// +// GTMKeyValueAnimation.h +// Copyright 2011 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy +// of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations under +// the License. +// + +#import + +// Simple class for doing key value path animation on a target. +// The key value path of target will be set to the currentValue +// (not the currentProgress) of the animation. +// Defaults to NSAnimationNonblocking as opposed to NSAnimationBlocking +// because in our experience most use cases don't want blocking animations. +// KeyPath of target must represent a CGFloat value. +@interface GTMKeyValueAnimation : NSAnimation { + @private + id target_; + NSString *keyPath_; +} + +- (id)initWithTarget:(id)target keyPath:(NSString*)keyPath; +- (id)target; +- (NSString *)keyPath; + +@end diff --git a/AppKit/GTMKeyValueAnimation.m b/AppKit/GTMKeyValueAnimation.m new file mode 100644 index 0000000..31e6fd4 --- /dev/null +++ b/AppKit/GTMKeyValueAnimation.m @@ -0,0 +1,52 @@ +// +// GTMKeyValueAnimation.m +// Copyright 2011 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy +// of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations under +// the License. +// + +#import "GTMKeyValueAnimation.h" + + +@implementation GTMKeyValueAnimation + +- (id)initWithTarget:(id)target keyPath:(NSString*)keyPath { + if ((self = [super init])) { + target_ = [target retain]; + keyPath_ = [keyPath copy]; + [self setAnimationBlockingMode:NSAnimationNonblocking]; + } + return self; +} + +- (void)dealloc { + [target_ release]; + [keyPath_ release]; + [super dealloc]; +} + +- (void)setCurrentProgress:(NSAnimationProgress)progress { + [super setCurrentProgress:progress]; + [target_ setValue:[NSNumber numberWithDouble:[self currentValue]] + forKeyPath:keyPath_]; +} + +- (id)target { + return target_; +} + +- (NSString *)keyPath { + return keyPath_; +} + +@end diff --git a/AppKit/GTMKeyValueAnimationTest.m b/AppKit/GTMKeyValueAnimationTest.m new file mode 100644 index 0000000..665a9f9 --- /dev/null +++ b/AppKit/GTMKeyValueAnimationTest.m @@ -0,0 +1,55 @@ +// +// GTMKeyValueAnimationTest.m +// +// Copyright 2011 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy +// of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations under +// the License. +// + +#import "GTMSenTestCase.h" +#import "GTMKeyValueAnimation.h" +#import "GTMFoundationUnitTestingUtilities.h" + +@interface GTMKeyValueAnimationTest : GTMTestCase { + @private + GTMUnitTestingBooleanRunLoopContext *context_; + BOOL shouldStartHit_; +} +@end + +@implementation GTMKeyValueAnimationTest + +- (void)testAnimation { + shouldStartHit_ = NO; + GTMKeyValueAnimation *anim = + [[[GTMKeyValueAnimation alloc] initWithTarget:self + keyPath:@"oggle"] autorelease]; + [anim setDelegate:self]; + [anim startAnimation]; + context_ = [GTMUnitTestingBooleanRunLoopContext context]; + [[NSRunLoop currentRunLoop] gtm_runUpToSixtySecondsWithContext:context_]; + [anim stopAnimation]; + STAssertTrue([context_ shouldStop], @"Animation value never got set"); + STAssertTrue(shouldStartHit_, @"animationShouldStart not called"); +} + +- (BOOL)animationShouldStart:(NSAnimation*)animation { + shouldStartHit_ = YES; + return YES; +} + +- (void)setOggle:(CGFloat)oggle { + [context_ setShouldStop:YES]; +} + +@end -- cgit v1.2.3