Update TransitionSample2

Author: xcatsan

TransitionSample2/Classes/TransitionSample2ViewController.h

@@ -10,20 +10,29 @@
 
 @interface TransitionSample2ViewController : UIViewController {
 
+	UIView* baseView;
 	UIImageView* imageView1;
 	UIImageView* imageView2;
+
 	UISlider* slider;
 	UILabel* duration;
 
 	NSMutableArray* images;
 	NSInteger imageIndex;
 
+	UISegmentedControl* mainType;
+	UISegmentedControl* subType;
 }
+@property (nonatomic, retain) IBOutlet UIView* baseView;
 @property (nonatomic, retain) IBOutlet UIImageView* imageView1;
 @property (nonatomic, retain) IBOutlet UIImageView* imageView2;
 @property (nonatomic, retain) IBOutlet 	UISlider* slider;
 @property (nonatomic, retain) NSMutableArray* images;
 @property (nonatomic, retain) IBOutlet 	UILabel* duration;
+
+@property (nonatomic, retain) IBOutlet UISegmentedControl* mainType;
+@property (nonatomic, retain) IBOutlet UISegmentedControl* subType;
+
 -(IBAction)didChangeDuration:(id)sender;
 -(IBAction)doTransition:(id)sender;
 

TransitionSample2/Classes/TransitionSample2ViewController.m

@@ -11,8 +11,10 @@
 
 @implementation TransitionSample2ViewController
 
+@synthesize baseView;
 @synthesize imageView1, imageView2, slider,duration;
 @synthesize images;
+@synthesize mainType, subType;
 
 /*
 // The designated initializer. Override to perform setup that is required before the view is loaded.
@@ -76,14 +78,24 @@ - (void)dealloc {
 
 -(IBAction)doTransition:(id)sender;
 {
+	
+	
 	// setup next image
 	imageIndex = (imageIndex+1)%8;
 	imageView2.image = [images objectAtIndex:imageIndex];
 
+	// transition
 	CATransition* transition = [CATransition animation];
 	transition.duration = self.slider.value;
 	transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-	transition.type = kCATransitionFade;
+	
+	NSString *maintypes[4] = {kCATransitionMoveIn, kCATransitionPush, kCATransitionReveal, kCATransitionFade};
+	NSString *subtypes[4] = {kCATransitionFromLeft, kCATransitionFromRight, kCATransitionFromTop, kCATransitionFromBottom};
+
+	transition.type = maintypes[mainType.selectedSegmentIndex];
+	if (mainType.selectedSegmentIndex < 3) {
+		transition.subtype = subtypes[subType.selectedSegmentIndex];
+	}
 
 	[self.view.layer addAnimation:transition forKey:nil];