Updated to version 1.7.5

Examples/Chameleon Demo/iCarouselChameleonDemo.xcodeproj/xcuserdata/nick.xcuserdatad/xcschemes/iCarouselChameleonDemo.xcscheme

@@ -23,8 +23,8 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       buildConfiguration = "Debug">
       <Testables>
@@ -41,7 +41,7 @@
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"

Examples/Mac Demo/iCarouselMac.xcodeproj/project.pbxproj

@@ -166,7 +166,7 @@
 		018BBC5B13A37041005CA505 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0500;
 			};
 			buildConfigurationList = 018BBC5E13A37041005CA505 /* Build configuration list for PBXProject "iCarouselMac" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -245,14 +245,22 @@
 		018BBC8013A37041005CA505 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
@@ -263,11 +271,19 @@
 		018BBC8113A37041005CA505 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				SDKROOT = macosx;
@@ -278,6 +294,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -293,6 +310,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;

Examples/Storyboard Demo/StoryboardExample.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0134E14C177C85B10007BF1A /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0134E14B177C85B10007BF1A /* Default-568h@2x.png */; };
 		B2E56E5C158250730090ECAC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2E56E5B158250730090ECAC /* UIKit.framework */; };
 		B2E56E5E158250730090ECAC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2E56E5D158250730090ECAC /* Foundation.framework */; };
 		B2E56E60158250730090ECAC /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2E56E5F158250730090ECAC /* CoreGraphics.framework */; };
@@ -22,6 +23,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		0134E14B177C85B10007BF1A /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
 		B2E56E57158250730090ECAC /* StoryboardExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StoryboardExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		B2E56E5B158250730090ECAC /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		B2E56E5D158250730090ECAC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -103,6 +105,7 @@
 		B2E56E62158250730090ECAC /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				0134E14B177C85B10007BF1A /* Default-568h@2x.png */,
 				B2E56E63158250730090ECAC /* StoryboardExample-Info.plist */,
 				B2E56E64158250730090ECAC /* InfoPlist.strings */,
 				B2E56E67158250730090ECAC /* main.m */,
@@ -157,7 +160,7 @@
 		B2E56E4E158250730090ECAC /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0460;
 			};
 			buildConfigurationList = B2E56E51158250730090ECAC /* Build configuration list for PBXProject "StoryboardExample" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -185,6 +188,7 @@
 				B2E56E6F158250740090ECAC /* MainStoryboard.storyboard in Resources */,
 				B2E56E88158250D30090ECAC /* background.png in Resources */,
 				B2E56E89158250D30090ECAC /* page.png in Resources */,
+				0134E14C177C85B10007BF1A /* Default-568h@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -230,6 +234,10 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -255,6 +263,10 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

Examples/Storyboard Demo/StoryboardExample/ViewController.m

@@ -82,10 +82,10 @@ - (UIView *)carousel:(iCarousel *)carousel viewForItemAtIndex:(NSUInteger)index
     //create new view if no view is available for recycling
     if (view == nil)
     {
-        view = [[[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 200.0f, 200.0f)] autorelease];
+        view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 200.0f, 200.0f)];
         ((UIImageView *)view).image = [UIImage imageNamed:@"page.png"];
         view.contentMode = UIViewContentModeCenter;
-        label = [[[UILabel alloc] initWithFrame:view.bounds] autorelease];
+        label = [[UILabel alloc] initWithFrame:view.bounds];
         label.backgroundColor = [UIColor clearColor];
         label.textAlignment = UITextAlignmentCenter;
         label.font = [label.font fontWithSize:50];

Examples/Storyboard Demo/StoryboardExample/en.lproj/MainStoryboard.storyboard

@@ -1,27 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2182" systemVersion="11E53" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="2">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="2">
     <dependencies>
-        <deployment defaultVersion="1296" identifier="iOS"/>
-        <development defaultVersion="4200" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1181"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="5">
             <objects>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/>
                 <viewController id="2" customClass="ViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="3">
                         <rect key="frame" x="0.0" y="20" width="320" height="460"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="background.png" id="0A7-cj-qH0">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            </imageView>
-                            <view contentMode="scaleToFill" id="DVp-6S-Sja" userLabel="iCarousel" customClass="iCarousel">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="background.png" translatesAutoresizingMaskIntoConstraints="NO" id="0A7-cj-qH0"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DVp-6S-Sja" userLabel="iCarousel" customClass="iCarousel">
                                 <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
                                 <connections>
                                     <outlet property="dataSource" destination="2" id="CJd-Xa-3NT"/>
@@ -30,18 +22,32 @@
                             </view>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="0A7-cj-qH0" firstAttribute="bottom" secondItem="3" secondAttribute="bottom" type="default" id="9GC-8y-2fs"/>
+                            <constraint firstItem="0A7-cj-qH0" firstAttribute="top" secondItem="3" secondAttribute="top" type="default" id="AyH-oq-y0f"/>
+                            <constraint firstItem="DVp-6S-Sja" firstAttribute="leading" secondItem="3" secondAttribute="leading" type="default" id="E3e-Be-nis"/>
+                            <constraint firstItem="0A7-cj-qH0" firstAttribute="leading" secondItem="3" secondAttribute="leading" type="default" id="I9E-6k-PxB"/>
+                            <constraint firstItem="DVp-6S-Sja" firstAttribute="bottom" secondItem="3" secondAttribute="bottom" type="default" id="KOT-67-YHk"/>
+                            <constraint firstItem="DVp-6S-Sja" firstAttribute="trailing" secondItem="3" secondAttribute="trailing" type="default" id="X6r-O1-WEy"/>
+                            <constraint firstItem="0A7-cj-qH0" firstAttribute="trailing" secondItem="3" secondAttribute="trailing" type="default" id="hBn-da-KhD"/>
+                            <constraint firstItem="DVp-6S-Sja" firstAttribute="top" secondItem="3" secondAttribute="top" type="default" id="q8Z-AN-KMo"/>
+                        </constraints>
                     </view>
                     <connections>
                         <outlet property="carousel" destination="DVp-6S-Sja" id="hhs-PK-ZPO"/>
                     </connections>
                 </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/>
             </objects>
         </scene>
     </scenes>
     <resources>
         <image name="background.png" width="50" height="468"/>
     </resources>
     <classes>
+        <class className="NSLayoutConstraint" superclassName="NSObject">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/NSLayoutConstraint.h"/>
+        </class>
         <class className="ViewController" superclassName="UIViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/ViewController.h"/>
             <relationships>

Examples/iOS Demo/iCarouselExample.xcodeproj/project.pbxproj

@@ -158,7 +158,7 @@
 		01308D8513491C3500453707 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0460;
 			};
 			buildConfigurationList = 01308D8813491C3500453707 /* Build configuration list for PBXProject "iCarouselExample" */;
 			compatibilityVersion = "Xcode 3.2";

Examples/iOS Demo/iCarouselExampleViewController.m

@@ -137,8 +137,8 @@ - (IBAction)removeItem
     if (carousel.numberOfItems > 0)
     {
         NSInteger index = carousel.currentItemIndex;
-        [carousel removeItemAtIndex:index animated:YES];
         [items removeObjectAtIndex:index];
+        [carousel removeItemAtIndex:index animated:YES];
     }
 }
 
@@ -284,4 +284,13 @@ - (CGFloat)carousel:(iCarousel *)_carousel valueForOption:(iCarouselOption)optio
     }
 }
 
+#pragma mark -
+#pragma mark iCarousel taps
+
+- (void)carousel:(iCarousel *)carousel didSelectItemAtIndex:(NSInteger)index
+{
+    NSNumber *item = [self.items objectAtIndex:index];
+    NSLog(@"Tapped view number: %@", item);
+}
+
 @end

LICENCE.md

@@ -1,6 +1,6 @@
 iCarousel
 
-Version 1.7.4, February 1st, 2013
+Version 1.7.5, February 1st, 2013
 
 Copyright (C) 2011 Charcoal Design
 

README.md

@@ -173,10 +173,6 @@ By default, the carousel will come to rest at an exact item boundary when it is
 
 By default whenever the carousel stops moving it will automatically scroll to the nearest item boundary. If you set this property to NO, the carousel will not scroll after stopping and will stay wherever it is, even if it's not perfectly aligned on the current index. The exception to this is that if wrapping is disabled and `bounces` is set to YES then regardless of this setting, the carousel will automatically scroll back to the first or last item index if it comes to rest beyond the end of the carousel.
 
-	@property (nonatomic, assign) BOOL useDisplayLink;
-
-By default on iOS iCarousel will use CADisplayLink instead of NSTimer for animations. On Mac OS, the CVDisplayLink API is used instead. This provides better synchronisation with the screen refresh, but can occasionally prevents the animation working properly when the carousel is combined with other views or animations. If you find that the carousel is not continuing to move after being dragged, try setting this property to NO.
-
 	@property (nonatomic, assign, getter = isVertical) BOOL vertical;
 
 This property toggles whether the carousel is displayed horizontally or vertically on screen. All the built-in carousel types work in both orientations. Switching to vertical changes both the layout of the carousel and also the direction of swipe detection on screen. Note that custom carousel transforms are not affected by this property, however the swipe gesture direction will still be affected.

RELEASE NOTES.md

@@ -1,3 +1,8 @@
+Version 1.7.5
+
+- Fixed an issue with latest llvm compiler
+- Fixed confict between iCarousel animation and UIScrollView scrolling
+
 Version 1.7.4
 
 - Fixed deprecation warnings when using Xcode 4.6

iCarousel.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = "iCarousel"
-  s.version      = "1.7.4"
+  s.version      = "1.7.5"
   s.license      = { :type => 'zlib', :file => 'LICENCE.md' }
   s.summary      = "A class designed to simplify the implementation of various types of carousel."
   s.homepage     = "https://github.com/nicklockwood/iCarousel"
   s.authors      = { "Nick Lockwood" => "support@charcoaldesign.co.uk" }  
-  s.source       = { :git => "https://github.com/nicklockwood/iCarousel.git", :tag => "1.7.4" }
+  s.source       = { :git => "https://github.com/nicklockwood/iCarousel.git", :tag => "1.7.5" }
   s.source_files = 'iCarousel'
   s.requires_arc = false
   s.frameworks = 'QuartzCore'

iCarousel/iCarousel.h

@@ -1,7 +1,7 @@
 //
 //  iCarousel.h
 //
-//  Version 1.7.4
+//  Version 1.7.5
 //
 //  Created by Nick Lockwood on 01/04/2011.
 //  Copyright 2011 Charcoal Design