diff --git a/ICETutorial.xcodeproj/project.xcworkspace/xcuserdata/patrick.xcuserdatad/UserInterfaceState.xcuserstate b/ICETutorial.xcodeproj/project.xcworkspace/xcuserdata/patrick.xcuserdatad/UserInterfaceState.xcuserstate index e79cc67..89e12a5 100755 Binary files a/ICETutorial.xcodeproj/project.xcworkspace/xcuserdata/patrick.xcuserdatad/UserInterfaceState.xcuserstate and b/ICETutorial.xcodeproj/project.xcworkspace/xcuserdata/patrick.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ICETutorial/Libraries/ICETutorialController.m b/ICETutorial/Libraries/ICETutorialController.m index 85d77d9..8e4ed91 100755 --- a/ICETutorial/Libraries/ICETutorialController.m +++ b/ICETutorial/Libraries/ICETutorialController.m @@ -263,7 +263,7 @@ - (void)setBackgroundImage:(UIImageView *)imageView withIndex:(NSInteger)index{ if (index >= [_pages count]){ [imageView setImage:nil]; return; - } + } NSString *imageName = [NSString stringWithFormat:@"%@",[[_pages objectAtIndex:index] pictureName]]; [imageView setImage:[UIImage imageNamed:imageName]]; @@ -340,7 +340,8 @@ - (void)scrollingToNextPageWithOffset:(float)offset{ } // Switch pictures, and imageView alpha. - if (page != _currentPageIndex) + if (page != _currentPageIndex || + (page == _currentPageIndex && 0.0 < offset && offset < 1.0)) [self setLayersPicturesWithIndex:page]; // Invert alpha for the front picture. diff --git a/ICETutorial/en.lproj/ICETutorialController_iPhone.xib b/ICETutorial/en.lproj/ICETutorialController_iPhone.xib index 2d6abc6..fea74d9 100755 --- a/ICETutorial/en.lproj/ICETutorialController_iPhone.xib +++ b/ICETutorial/en.lproj/ICETutorialController_iPhone.xib @@ -2,13 +2,13 @@ 1552 - 12E55 - 3084 - 1187.39 + 12F45 + 4510 + 1187.40 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 + 3742 IBNSLayoutConstraint @@ -37,7 +37,7 @@ IBCocoaTouchFramework - + 274 @@ -45,7 +45,6 @@ 274 {320, 548} - _NS:9 2 @@ -57,7 +56,6 @@ 292 {320, 548} - _NS:9 2 @@ -69,7 +67,6 @@ 256 {{0, 348}, {320, 200}} - NO YES @@ -84,9 +81,8 @@ 274 - {320, 462} + {320, 548} - _NS:9 YES @@ -101,19 +97,18 @@ 292 {{20, 494}, {130, 36}} - _NS:9 NO IBCocoaTouchFramework 0 0 - Button 1 - + 3 MQA - + + Button 1 3 MC41AA @@ -126,8 +121,8 @@ 2 15 - - Helvetica-Bold + + HelveticaNeue-Bold 15 16 @@ -137,19 +132,18 @@ 292 {{172, 494}, {130, 36}} - _NS:9 NO IBCocoaTouchFramework 0 0 - Button 2 - + + Button 2 - + @@ -157,7 +151,6 @@ {{141, 453}, {38, 36}} - _NS:9 NO @@ -171,7 +164,6 @@ 292 {{54, 117}, {211, 49}} - _NS:9 NO @@ -199,8 +191,6 @@ {{0, 20}, {320, 548}} - - 1 @@ -222,7 +212,7 @@ IBCocoaTouchFramework - Retina 4 Full Screen + Retina 4-inch Full Screen 2 IBCocoaTouchFramework @@ -337,7 +327,24 @@ 6 - + + + 4 + 0 + + 4 + 1 + + 18 + + 1000 + + 9 + 40 + 3 + NO + + 6 0 @@ -349,25 +356,44 @@ 1000 - 3 - 9 + 9 + 40 3 + NO - + + + 4 + 1 + + 4 + 1 + + 18 + + 1000 + + 9 + 40 + 3 + NO + + 5 0 5 1 - + 20 1000 - 8 - 29 + 9 + 40 3 + NO @@ -381,9 +407,10 @@ 1000 - 6 - 24 + 9 + 40 2 + NO @@ -397,41 +424,44 @@ 1000 - 3 - 9 + 9 + 40 3 + NO - + - 4 + 9 0 - 4 + 9 1 - 59 + 0.0 1000 - 3 - 9 - 3 + 9 + 40 + 2 + NO - - - 9 + + + 4 0 - - 9 + + 4 1 - 0.0 + 59 1000 - 6 - 24 - 2 + 3 + 9 + 3 + NO @@ -445,9 +475,10 @@ 1000 - 8 + 0 29 3 + NO @@ -461,41 +492,44 @@ 1000 - 8 + 0 29 3 + NO - - - 3 + + + 9 0 - - 3 + + 9 1 - 117 + 0.0 1000 - 3 - 9 - 3 + 9 + 40 + 2 + NO - + - 5 + 3 0 - 5 + 3 1 - 54 + 117 1000 3 9 3 + NO @@ -509,9 +543,10 @@ 1000 - 8 + 0 29 3 + NO @@ -525,9 +560,10 @@ 1000 - 8 + 0 29 3 + NO @@ -541,9 +577,10 @@ 1000 - 8 + 0 29 3 + NO @@ -557,9 +594,10 @@ 1000 - 8 + 0 29 3 + NO @@ -573,9 +611,10 @@ 1000 - 8 + 0 29 3 + NO @@ -589,9 +628,10 @@ 1000 - 8 + 0 29 3 + NO @@ -605,9 +645,10 @@ 1000 - 8 + 0 29 3 + NO @@ -621,11 +662,63 @@ 1000 - 8 + 0 29 3 + NO + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 9 + 40 + 3 + NO - + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 9 + 40 + 3 + NO + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 9 + 40 + 3 + NO + + 4 0 @@ -633,13 +726,14 @@ 4 1 - 86 + 0.0 1000 - 3 - 9 + 9 + 40 3 + NO @@ -653,9 +747,10 @@ 1000 - 8 - 29 + 9 + 40 3 + NO @@ -669,9 +764,10 @@ 1000 - 8 - 29 + 9 + 40 3 + NO @@ -685,9 +781,10 @@ 1000 - 8 - 29 + 9 + 40 3 + NO @@ -766,7 +863,42 @@ 120 - + + + + 8 + 0 + + 0 + 1 + + 36 + + 1000 + + 9 + 40 + 1 + NO + + + + 7 + 0 + + 0 + 1 + + 130 + + 1000 + + 9 + 40 + 1 + NO + + @@ -777,7 +909,42 @@ 128 - + + + + 8 + 0 + + 0 + 1 + + 36 + + 1000 + + 9 + 40 + 1 + NO + + + + 7 + 0 + + 0 + 1 + + 130 + + 1000 + + 9 + 40 + 1 + NO + + @@ -790,26 +957,11 @@ - - 190 - - - 205 - - 211 - - - - - 213 - - - 221 @@ -834,6 +986,7 @@ 3 9 1 + NO @@ -850,6 +1003,7 @@ 3 9 1 + NO @@ -864,11 +1018,6 @@ - - 247 - - - 249 @@ -880,11 +1029,6 @@ - - 184 - - - 156 @@ -900,6 +1044,76 @@ + + 296 + + + + + 297 + + + + + 298 + + + + + 299 + + + + + 300 + + + + + 301 + + + + + 302 + + + + + 303 + + + + + 304 + + + + + 306 + + + + + 307 + + + + + 309 + + + + + 310 + + + + + 311 + + + @@ -911,9 +1125,17 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -923,11 +1145,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -938,18 +1156,34 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + - + + + + @@ -958,16 +1192,18 @@ - + - + - - + + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -981,78 +1217,20 @@ - 295 - - - - - ICETutorialController - UIViewController - - id - id - UIPageControl - - - - didClickOnButton1: - id - - - didClickOnButton2: - id - - - didClickOnPageControl: - UIPageControl - - - - UIImageView - UIImageView - UILabel - UIPageControl - UIScrollView - - - - _backLayerView - UIImageView - - - _frontLayerView - UIImageView - - - _overlayTitle - UILabel - - - _pageControl - UIPageControl - - - _scrollView - UIScrollView - - - - IBProjectSource - ./Classes/ICETutorialController.h - - - - NSLayoutConstraint - NSObject - - IBProjectSource - ./Classes/NSLayoutConstraint.h - - - + 311 + 0 IBCocoaTouchFramework + YES + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + YES 3 @@ -1060,6 +1238,6 @@ {130, 36} YES - 2083 + 3742