Merge pull request jwilling#152 from jwilling/jonathan/cleanup

Project cleanup

JNWCollectionView.xcodeproj/project.xcworkspace/xcshareddata/JNWCollectionView.xcscmblueprint

@@ -0,0 +1,44 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "623FF6F374D22BC9E79608E37B443A964F3B5FF7",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "8884BD3B878631A1500EC9895E6A3CF4CB0AB3DB" : 0,
+    "2FD0F96481B39E576130E173BF6923CF52C91FF7" : 0,
+    "52FC6C770A2EDF17C166C3492851DDC1B14F32C1" : 0,
+    "623FF6F374D22BC9E79608E37B443A964F3B5FF7" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "F46380DD-3E35-4BA3-94FD-E3089D4D267C",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "8884BD3B878631A1500EC9895E6A3CF4CB0AB3DB" : "JNWCollectionViewexternal\/Expecta",
+    "2FD0F96481B39E576130E173BF6923CF52C91FF7" : "JNWCollectionViewexternal\/Specta",
+    "52FC6C770A2EDF17C166C3492851DDC1B14F32C1" : "JNWCollectionViewexternal\/JNWScrollView",
+    "623FF6F374D22BC9E79608E37B443A964F3B5FF7" : "JNWCollectionView"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "JNWCollectionView",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "JNWCollectionView.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/petejkim\/specta.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2FD0F96481B39E576130E173BF6923CF52C91FF7"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/jwilling\/JNWScrollView.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "52FC6C770A2EDF17C166C3492851DDC1B14F32C1"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/jwilling\/JNWCollectionView.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "623FF6F374D22BC9E79608E37B443A964F3B5FF7"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/petejkim\/expecta.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8884BD3B878631A1500EC9895E6A3CF4CB0AB3DB"
+    }
+  ]
+}

JNWCollectionView/JNWCollectionView-Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.jwilling.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

JNWCollectionView/JNWCollectionViewFramework.h

@@ -188,13 +188,13 @@ typedef NS_ENUM(NSInteger, JNWCollectionViewScrollPosition) {
 /// at the time. If this is a repeating pattern image, it will scroll along with the content.
 ///
 /// Defaults to a white color.
-@property (nonatomic, strong) NSColor *backgroundColor;
+@property (copy) NSColor *backgroundColor;
 
 /// Whether or not the collection view draws the background color. If the collection view
 /// background color needs to be transparent, this should be disabled.
 ///
 /// Defaults to YES.
-@property (nonatomic, assign) BOOL drawsBackground;
+@property (assign) BOOL drawsBackground;
 
 #pragma mark - Information
 

JNWCollectionView/JNWCollectionViewFramework.m

@@ -75,7 +75,7 @@ @interface JNWCollectionView() {
 @property (nonatomic, strong) NSMutableDictionary *supplementaryViewClassMap; // { "kind/identifier" : class }
 @property (nonatomic, strong) NSMutableDictionary *supplementaryViewNibMap; // { "kind/identifier" : nib }
 
-@property (nonatomic, strong) NSView *documentView;
+@property (nonatomic, strong) NSView *collectionViewDocumentView;
 
 @end
 
@@ -102,7 +102,9 @@ static void JNWCollectionViewCommonInit(JNWCollectionView *collectionView) {
 	collectionView.wantsLayer = YES;
 
 	// Set the document view to a custom class that returns YES to -isFlipped.
-	collectionView.documentView = [[JNWCollectionViewDocumentView alloc] initWithFrame:CGRectZero];
+	JNWCollectionViewDocumentView *documentView = [[JNWCollectionViewDocumentView alloc] initWithFrame:CGRectZero];
+	collectionView.collectionViewDocumentView = documentView;
+	collectionView.documentView = documentView;
 
 	// We don't want to perform an initial layout pass until the user has called -reloadData.
 	collectionView->_collectionViewFlags.wantsLayout = NO;