diff --git a/RouletteViewDemo.xcodeproj/project.pbxproj b/RouletteViewDemo.xcodeproj/project.pbxproj index 248da92..a2d8f22 100644 --- a/RouletteViewDemo.xcodeproj/project.pbxproj +++ b/RouletteViewDemo.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 5BDE14772656580A0063D824 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5BDE14762656580A0063D824 /* Assets.xcassets */; }; 8EC103B516F270F700BAC998 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC103B416F270F700BAC998 /* UIKit.framework */; }; 8EC103B716F270F700BAC998 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC103B616F270F700BAC998 /* Foundation.framework */; }; 8EC103B916F270F700BAC998 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC103B816F270F700BAC998 /* CoreGraphics.framework */; }; @@ -17,7 +18,6 @@ 8EC103C916F270F700BAC998 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EC103C816F270F700BAC998 /* Default@2x.png */; }; 8EC103CB16F270F700BAC998 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EC103CA16F270F700BAC998 /* Default-568h@2x.png */; }; 8EC103CE16F270F700BAC998 /* RVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC103CD16F270F700BAC998 /* RVViewController.m */; }; - 8EC103D116F270F700BAC998 /* RVViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8EC103CF16F270F700BAC998 /* RVViewController.xib */; }; 8EC1045616F277DA00BAC998 /* RVCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC1045516F277DA00BAC998 /* RVCollectionViewCell.m */; }; 8EC1045A16F27AE500BAC998 /* RVCollectionViewLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC1045916F27AE500BAC998 /* RVCollectionViewLayout.m */; }; 8EC1045D16F2953F00BAC998 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC1045C16F2953F00BAC998 /* QuartzCore.framework */; }; @@ -37,6 +37,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 5BDE14762656580A0063D824 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 8EC103B116F270F700BAC998 /* RouletteViewDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RouletteViewDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8EC103B416F270F700BAC998 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 8EC103B616F270F700BAC998 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -52,7 +53,6 @@ 8EC103CA16F270F700BAC998 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 8EC103CC16F270F700BAC998 /* RVViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RVViewController.h; sourceTree = ""; }; 8EC103CD16F270F700BAC998 /* RVViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RVViewController.m; sourceTree = ""; }; - 8EC103D016F270F700BAC998 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/RVViewController.xib; sourceTree = ""; }; 8EC1045416F277DA00BAC998 /* RVCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RVCollectionViewCell.h; sourceTree = ""; }; 8EC1045516F277DA00BAC998 /* RVCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RVCollectionViewCell.m; sourceTree = ""; }; 8EC1045816F27AE500BAC998 /* RVCollectionViewLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RVCollectionViewLayout.h; sourceTree = ""; }; @@ -127,7 +127,7 @@ 8EC1045516F277DA00BAC998 /* RVCollectionViewCell.m */, 8EC1045816F27AE500BAC998 /* RVCollectionViewLayout.h */, 8EC1045916F27AE500BAC998 /* RVCollectionViewLayout.m */, - 8EC103CF16F270F700BAC998 /* RVViewController.xib */, + 5BDE14762656580A0063D824 /* Assets.xcassets */, 8EC103BB16F270F700BAC998 /* Supporting Files */, ); path = RouletteViewDemo; @@ -203,6 +203,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 8EC103A816F270F700BAC998; @@ -223,8 +224,8 @@ 8EC103BF16F270F700BAC998 /* InfoPlist.strings in Resources */, 8EC103C716F270F700BAC998 /* Default.png in Resources */, 8EC103C916F270F700BAC998 /* Default@2x.png in Resources */, + 5BDE14772656580A0063D824 /* Assets.xcassets in Resources */, 8EC103CB16F270F700BAC998 /* Default-568h@2x.png in Resources */, - 8EC103D116F270F700BAC998 /* RVViewController.xib in Resources */, 8ECAB21716F5512D002B90C2 /* 10.png in Resources */, 8ECAB21816F5512D002B90C2 /* 11.png in Resources */, 8ECAB21916F5512D002B90C2 /* 12.png in Resources */, @@ -267,14 +268,6 @@ name = InfoPlist.strings; sourceTree = ""; }; - 8EC103CF16F270F700BAC998 /* RVViewController.xib */ = { - isa = PBXVariantGroup; - children = ( - 8EC103D016F270F700BAC998 /* en */, - ); - name = RVViewController.xib; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -337,6 +330,7 @@ 8EC103D516F270F700BAC998 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + DEVELOPMENT_TEAM = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RouletteViewDemo/RouletteViewDemo-Prefix.pch"; INFOPLIST_FILE = "RouletteViewDemo/RouletteViewDemo-Info.plist"; @@ -348,6 +342,7 @@ 8EC103D616F270F700BAC998 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + DEVELOPMENT_TEAM = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "RouletteViewDemo/RouletteViewDemo-Prefix.pch"; INFOPLIST_FILE = "RouletteViewDemo/RouletteViewDemo-Info.plist"; diff --git a/RouletteViewDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/RouletteViewDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/RouletteViewDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/RouletteViewDemo.xcodeproj/project.xcworkspace/xcuserdata/yushuhui.xcuserdatad/UserInterfaceState.xcuserstate b/RouletteViewDemo.xcodeproj/project.xcworkspace/xcuserdata/yushuhui.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..3ad5c36 Binary files /dev/null and b/RouletteViewDemo.xcodeproj/project.xcworkspace/xcuserdata/yushuhui.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/RouletteViewDemo.xcodeproj/xcuserdata/yushuhui.xcuserdatad/xcschemes/xcschememanagement.plist b/RouletteViewDemo.xcodeproj/xcuserdata/yushuhui.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..8c622c2 --- /dev/null +++ b/RouletteViewDemo.xcodeproj/xcuserdata/yushuhui.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + RouletteViewDemo.xcscheme_^#shared#^_ + + orderHint + 0 + + + + diff --git a/RouletteViewDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/RouletteViewDemo/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..8121323 --- /dev/null +++ b/RouletteViewDemo/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,53 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/RouletteViewDemo/RVAppDelegate.m b/RouletteViewDemo/RVAppDelegate.m index 451945b..cc3973c 100644 --- a/RouletteViewDemo/RVAppDelegate.m +++ b/RouletteViewDemo/RVAppDelegate.m @@ -16,7 +16,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( { self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; // Override point for customization after application launch. - self.viewController = [[RVViewController alloc] initWithNibName:@"RVViewController" bundle:nil]; + self.viewController = [[RVViewController alloc] init]; self.window.rootViewController = self.viewController; [self.window makeKeyAndVisible]; return YES; diff --git a/RouletteViewDemo/RVViewController.m b/RouletteViewDemo/RVViewController.m index 1554073..db2c94c 100644 --- a/RouletteViewDemo/RVViewController.m +++ b/RouletteViewDemo/RVViewController.m @@ -10,9 +10,11 @@ #import "RVCollectionViewCell.h" #import "RVCollectionViewLayout.h" + + @interface RVViewController () -@property (nonatomic, weak) IBOutlet UICollectionView * collectionView; +@property (nonatomic, weak) UICollectionView * collectionView; @property (nonatomic, strong) NSMutableArray * imagesArray; @property (nonatomic, strong) NSMutableArray * imageNamesArray; @property (nonatomic, strong) RVCollectionViewLayout * collectionViewLayout; @@ -25,6 +27,7 @@ - (void)viewDidLoad { [super viewDidLoad]; [self initImages]; + [self initCollectionView]; [self.collectionView registerClass:[RVCollectionViewCell class] forCellWithReuseIdentifier:@"ItemIdentifier"]; self.collectionView.indicatorStyle = UIScrollViewIndicatorStyleWhite; @@ -33,6 +36,20 @@ - (void)viewDidLoad self.collectionView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; } +- (void)initCollectionView { + CGRect rect=CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 230); + _collectionViewLayout = [[RVCollectionViewLayout alloc] init]; + + UICollectionView *collectionView=[[UICollectionView alloc] initWithFrame:rect collectionViewLayout:_collectionViewLayout]; + collectionView.alwaysBounceHorizontal = YES; + collectionView.showsHorizontalScrollIndicator = NO; + collectionView.backgroundColor =[UIColor clearColor]; + collectionView.dataSource=self; + collectionView.delegate=self; + [self.view addSubview:collectionView]; + self.collectionView=collectionView; +} + #pragma mark - UICollectionViewDataSource - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView*)collectionView { diff --git a/RouletteViewDemo/en.lproj/RVViewController.xib b/RouletteViewDemo/en.lproj/RVViewController.xib deleted file mode 100644 index ebc005a..0000000 --- a/RouletteViewDemo/en.lproj/RVViewController.xib +++ /dev/null @@ -1,239 +0,0 @@ - - - - 1552 - 12D78 - 3084 - 1187.37 - 626.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 - - - IBProxyObject - IBUICollectionView - IBUICollectionViewLayout - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 1314 - - - {{-20, 40}, {360, 310}} - - - - _NS:9 - NO - YES - YES - IBCocoaTouchFramework - YES - NO - 0.0 - 0.0 - - - - - - - {{0, 20}, {320, 548}} - - - - - 3 - MAA - - NO - - - IBUIScreenMetrics - - YES - - - - - - {320, 568} - {568, 320} - - - IBCocoaTouchFramework - Retina 4 Full Screen - 2 - - IBCocoaTouchFramework - - - - - - - collectionView - - - - 15 - - - - view - - - - 18 - - - - dataSource - - - - 16 - - - - delegate - - - - 17 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 6 - - - - - - - - 8 - - - - - - - - 19 - - - - - - - RVViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - RVCollectionViewLayout - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 19 - - - - - RVCollectionViewLayout - UICollectionViewFlowLayout - - IBProjectSource - ./Classes/RVCollectionViewLayout.h - - - - RVViewController - UIViewController - - collectionView - UICollectionView - - - collectionView - - collectionView - UICollectionView - - - - IBProjectSource - ./Classes/RVViewController.h - - - - UICollectionViewFlowLayout - UICollectionViewLayout - - IBProjectSource - ./Classes/UICollectionViewFlowLayout.h - - - - UICollectionViewLayout - NSObject - - IBProjectSource - ./Classes/UICollectionViewLayout.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - 2083 - -