Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
erica committed Jul 30, 2012
1 parent cec11bb commit ec37aa7
Show file tree
Hide file tree
Showing 96 changed files with 4,505 additions and 93 deletions.
Binary file modified C05/09-Split View Controller/.DS_Store
Binary file not shown.
Binary file modified C05/11-Cube/.DS_Store
Binary file not shown.
Binary file not shown.
33 changes: 1 addition & 32 deletions C06/13-Image View Animations/main.m
Expand Up @@ -18,38 +18,7 @@ @interface TestBedViewController : UIViewController

@implementation TestBedViewController

- (void) updateButterfly: (NSTimer *) timer
{
[UIView animateWithDuration:0.6f animations:^(void){
butterflyView.center = [butterflyView randomCenterInView:self.view withInset:10.0f];
}];
}

- (void) loadView
{
[super loadView];
self.view.backgroundColor = [UIColor whiteColor];
self.navigationController.navigationBar.tintColor = COOKBOOK_PURPLE_COLOR;

// Load butterfly images
NSMutableArray *bflies = [NSMutableArray array];
for (int i = 1; i <= 17; i++)
[bflies addObject:[UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:[NSString stringWithFormat:@"bf_%d", i] ofType:@"png"]]];

butterflyView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 60.0f, 60.0f)];
butterflyView.animationImages = bflies;
butterflyView.animationDuration = 0.75f;
[self.view addSubview:butterflyView];
[butterflyView startAnimating];

[NSTimer scheduledTimerWithTimeInterval:3.0f target:self selector:@selector(updateButterfly:) userInfo:nil repeats:YES];
}

- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{
return YES;
}
@end
w@end

#pragma mark -

Expand Down
Binary file modified C07/01-Image Picker/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file modified C07/09-Live Sampling/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file modified C07/11-Scroller/.DS_Store
Binary file not shown.
Binary file modified C08/03-Gesture Recognizers/.DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions C08/03-Gesture Recognizers/DragView.h
Expand Up @@ -6,6 +6,7 @@


#import <UIKit/UIKit.h>
#import "UIView-Transform.h"


@interface DragView : UIImageView <UIGestureRecognizerDelegate>
Expand Down
3 changes: 2 additions & 1 deletion C08/03-Gesture Recognizers/DragView.m
Expand Up @@ -6,7 +6,6 @@

#import "DragView.h"


@implementation DragView
- (void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
{
Expand Down Expand Up @@ -40,6 +39,8 @@ - (void) updateTransformWithOffset: (CGPoint) translation
self.transform = CGAffineTransformMakeTranslation(translation.x + tx, translation.y + ty);
self.transform = CGAffineTransformRotate(self.transform, theta);
self.transform = CGAffineTransformScale(self.transform, scale, scale);

NSLog(@"Xscale: %f YScale: %f Rotation: %f", self.xscale, self.yscale, self.rotation * (180 / M_PI));
}

- (void) handlePan: (UIPanGestureRecognizer *) uigr
Expand Down
Expand Up @@ -19,6 +19,7 @@
8E3EA0E513AB9BB700D6C49B /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E3EA0E413AB9BB700D6C49B /* icon@2x.png */; };
8E3EA0E713AB9BBC00D6C49B /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E3EA0E613AB9BBC00D6C49B /* icon.png */; };
8EB86EC613D613D7005B2CD3 /* DragView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EB86EC513D613D7005B2CD3 /* DragView.m */; };
8EF11644155087E800B0DC44 /* UIView-Transform.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EF11643155086F100B0DC44 /* UIView-Transform.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -38,6 +39,8 @@
8E3EA0E613AB9BBC00D6C49B /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
8EB86EC413D613D7005B2CD3 /* DragView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragView.h; sourceTree = "<group>"; };
8EB86EC513D613D7005B2CD3 /* DragView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DragView.m; sourceTree = "<group>"; };
8EF11642155086F100B0DC44 /* UIView-Transform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView-Transform.h"; sourceTree = "<group>"; };
8EF11643155086F100B0DC44 /* UIView-Transform.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView-Transform.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -66,6 +69,8 @@
isa = PBXGroup;
children = (
29B97316FDCFA39411CA2CEA /* main.m */,
8EF11642155086F100B0DC44 /* UIView-Transform.h */,
8EF11643155086F100B0DC44 /* UIView-Transform.m */,
8EB86EC413D613D7005B2CD3 /* DragView.h */,
8EB86EC513D613D7005B2CD3 /* DragView.m */,
29B97317FDCFA39411CA2CEA /* Resources */,
Expand Down Expand Up @@ -178,6 +183,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8EF11644155087E800B0DC44 /* UIView-Transform.m in Sources */,
1D60589B0D05DD56006BFB54 /* main.m in Sources */,
8EB86EC613D613D7005B2CD3 /* DragView.m in Sources */,
);
Expand Down
Binary file not shown.
16 changes: 16 additions & 0 deletions C08/03-Gesture Recognizers/UIView-Transform.h
@@ -0,0 +1,16 @@
//
// UIView-Transform.h
// HelloWorld
//
// Created by Erica Sadun on 5/1/12.
// Copyright (c) 2012 Up To No Good, Inc. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

@interface UIView (Transform)
@property (readonly) CGFloat rotation;
@property (readonly) CGFloat xscale;
@property (readonly) CGFloat yscale;
@end
29 changes: 29 additions & 0 deletions C08/03-Gesture Recognizers/UIView-Transform.m
@@ -0,0 +1,29 @@
//
// UIView-Transform.m
// HelloWorld
//
// Created by Erica Sadun on 5/1/12.
// Copyright (c) 2012 Up To No Good, Inc. All rights reserved.
//

#import "UIView-Transform.h"

@implementation UIView (Transform)
- (CGFloat) rotation
{
CGAffineTransform t = self.transform;
return atan2f(t.b, t.a);
}

- (CGFloat) xscale
{
CGAffineTransform t = self.transform;
return sqrt(t.a * t.a + t.c * t.c);
}

- (CGFloat) yscale
{
CGAffineTransform t = self.transform;
return sqrt(t.b * t.b + t.d * t.d);
}
@end
Binary file modified C08/06-Testing with Alpha/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file modified C09/01b-Wrap/.DS_Store
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
32 changes: 16 additions & 16 deletions C09/01b-Wrap/HelloWorld.xcodeproj/project.pbxproj
Expand Up @@ -11,10 +11,6 @@
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
8E38B87413D9D3CC006B0481 /* green.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E38B87013D9D3CC006B0481 /* green.png */; };
8E38B87513D9D3CC006B0481 /* green2.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E38B87113D9D3CC006B0481 /* green2.png */; };
8E38B87613D9D3CC006B0481 /* red.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E38B87213D9D3CC006B0481 /* red.png */; };
8E38B87713D9D3CC006B0481 /* red2.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E38B87313D9D3CC006B0481 /* red2.png */; };
8E38B87A13D9D4E1006B0481 /* Geometry.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E38B87913D9D4E1006B0481 /* Geometry.m */; };
8E3EA0DB13AB9B7800D6C49B /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E3EA0DA13AB9B7800D6C49B /* Default-Portrait~ipad.png */; };
8E3EA0DD13AB9B9400D6C49B /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E3EA0DC13AB9B9400D6C49B /* Default-Landscape~ipad.png */; };
Expand All @@ -23,6 +19,10 @@
8E3EA0E313AB9BB100D6C49B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E3EA0E213AB9BB100D6C49B /* Default.png */; };
8E3EA0E513AB9BB700D6C49B /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E3EA0E413AB9BB700D6C49B /* icon@2x.png */; };
8E3EA0E713AB9BBC00D6C49B /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E3EA0E613AB9BBC00D6C49B /* icon.png */; };
8E6BED1515900BD10031D646 /* green-in.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E6BED1115900BD10031D646 /* green-in.png */; };
8E6BED1615900BD10031D646 /* green-out.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E6BED1215900BD10031D646 /* green-out.png */; };
8E6BED1715900BD10031D646 /* red-in.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E6BED1315900BD10031D646 /* red-in.png */; };
8E6BED1815900BD10031D646 /* red-out.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E6BED1415900BD10031D646 /* red-out.png */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -33,10 +33,6 @@
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* HelloWorld_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorld_Prefix.pch; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* HelloWorld-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "HelloWorld-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
8E38B87013D9D3CC006B0481 /* green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = green.png; sourceTree = "<group>"; };
8E38B87113D9D3CC006B0481 /* green2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = green2.png; sourceTree = "<group>"; };
8E38B87213D9D3CC006B0481 /* red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = red.png; sourceTree = "<group>"; };
8E38B87313D9D3CC006B0481 /* red2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = red2.png; sourceTree = "<group>"; };
8E38B87813D9D4E1006B0481 /* Geometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geometry.h; sourceTree = "<group>"; };
8E38B87913D9D4E1006B0481 /* Geometry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Geometry.m; sourceTree = "<group>"; };
8E3EA0DA13AB9B7800D6C49B /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait~ipad.png"; sourceTree = "<group>"; };
Expand All @@ -46,6 +42,10 @@
8E3EA0E213AB9BB100D6C49B /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
8E3EA0E413AB9BB700D6C49B /* icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon@2x.png"; sourceTree = "<group>"; };
8E3EA0E613AB9BBC00D6C49B /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
8E6BED1115900BD10031D646 /* green-in.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "green-in.png"; sourceTree = "<group>"; };
8E6BED1215900BD10031D646 /* green-out.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "green-out.png"; sourceTree = "<group>"; };
8E6BED1315900BD10031D646 /* red-in.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red-in.png"; sourceTree = "<group>"; };
8E6BED1415900BD10031D646 /* red-out.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red-out.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -107,10 +107,10 @@
8E38B86F13D9D3CC006B0481 /* Button Art */ = {
isa = PBXGroup;
children = (
8E38B87013D9D3CC006B0481 /* green.png */,
8E38B87113D9D3CC006B0481 /* green2.png */,
8E38B87213D9D3CC006B0481 /* red.png */,
8E38B87313D9D3CC006B0481 /* red2.png */,
8E6BED1115900BD10031D646 /* green-in.png */,
8E6BED1215900BD10031D646 /* green-out.png */,
8E6BED1315900BD10031D646 /* red-in.png */,
8E6BED1415900BD10031D646 /* red-out.png */,
);
name = "Button Art";
path = Art;
Expand Down Expand Up @@ -189,10 +189,10 @@
8E3EA0E313AB9BB100D6C49B /* Default.png in Resources */,
8E3EA0E513AB9BB700D6C49B /* icon@2x.png in Resources */,
8E3EA0E713AB9BBC00D6C49B /* icon.png in Resources */,
8E38B87413D9D3CC006B0481 /* green.png in Resources */,
8E38B87513D9D3CC006B0481 /* green2.png in Resources */,
8E38B87613D9D3CC006B0481 /* red.png in Resources */,
8E38B87713D9D3CC006B0481 /* red2.png in Resources */,
8E6BED1515900BD10031D646 /* green-in.png in Resources */,
8E6BED1615900BD10031D646 /* green-out.png in Resources */,
8E6BED1715900BD10031D646 /* red-in.png in Resources */,
8E6BED1815900BD10031D646 /* red-out.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file not shown.
12 changes: 7 additions & 5 deletions C09/01b-Wrap/main.m
Expand Up @@ -12,10 +12,10 @@

#define CAPWIDTH 110.0f
#define INSETS (UIEdgeInsets){0.0f, CAPWIDTH, 0.0f, CAPWIDTH}
#define BASEGREEN [[UIImage imageNamed:@"green.png"] resizableImageWithCapInsets:INSETS]
#define ALTGREEN [[UIImage imageNamed:@"green2.png"] resizableImageWithCapInsets:INSETS]
#define BASERED [[UIImage imageNamed:@"red.png"] resizableImageWithCapInsets:INSETS]
#define ALTRED [[UIImage imageNamed:@"red2.png"] resizableImageWithCapInsets:INSETS]
#define BASEGREEN [[UIImage imageNamed:@"green-out.png"] resizableImageWithCapInsets:INSETS]
#define ALTGREEN [[UIImage imageNamed:@"green-in.png"] resizableImageWithCapInsets:INSETS]
#define BASERED [[UIImage imageNamed:@"red-out.png"] resizableImageWithCapInsets:INSETS]
#define ALTRED [[UIImage imageNamed:@"red-in.png"] resizableImageWithCapInsets:INSETS]

@interface TestBedViewController : UIViewController
{
Expand Down Expand Up @@ -66,11 +66,13 @@ - (void) loadView
[self toggleButton:button];

// Let label handle carriage returns
button.titleLabel.font = [UIFont boldSystemFontOfSize:36.0f];
/*
button.titleLabel.font = [UIFont boldSystemFontOfSize:36.0f];
[button setTitle:@"Lorem Ipsum Dolor Sit" forState: UIControlStateNormal];
button.titleLabel.textAlignment = UITextAlignmentCenter;
button.titleLabel.lineBreakMode = UILineBreakModeWordWrap;
*/
}

- (void) viewDidAppear:(BOOL)animated
Expand Down
Binary file modified C09/01c-Translucent/.DS_Store
Binary file not shown.
Binary file added C09/01c-Translucent/Art/gray-in.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added C09/01c-Translucent/Art/gray-out.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit ec37aa7

Please sign in to comment.