Skip to content

Commit ddef47b

Browse files
committed
an initial commit for UICollectionView feature
make a new waterflowlayout based on UICollectionView
1 parent d6bcd63 commit ddef47b

File tree

14 files changed

+510
-30
lines changed

14 files changed

+510
-30
lines changed

.DS_Store

-6 KB
Binary file not shown.

WaterFlowDisplay.xcodeproj/project.pbxproj

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,49 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
04B6567D15E52AF300EFACFE /* libxml2.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 04B6567C15E52AF300EFACFE /* libxml2.2.dylib */; };
11+
04B6568A15E52B7F00EFACFE /* CollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04B6568515E52B7F00EFACFE /* CollectionViewController.m */; };
12+
04B6568B15E52B7F00EFACFE /* ColllectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 04B6568715E52B7F00EFACFE /* ColllectionViewCell.m */; };
13+
04B6568C15E52B7F00EFACFE /* WaterFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 04B6568915E52B7F00EFACFE /* WaterFlowLayout.m */; };
1014
806B44DF152401EC00E59412 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 806B44DE152401EC00E59412 /* UIKit.framework */; };
1115
806B44E1152401EC00E59412 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 806B44E0152401EC00E59412 /* Foundation.framework */; };
1216
806B44E3152401EC00E59412 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 806B44E2152401EC00E59412 /* CoreGraphics.framework */; };
1317
806B44E9152401EC00E59412 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 806B44E7152401EC00E59412 /* InfoPlist.strings */; };
1418
806B44EB152401EC00E59412 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 806B44EA152401EC00E59412 /* main.m */; };
1519
806B44EF152401EC00E59412 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 806B44EE152401EC00E59412 /* AppDelegate.m */; };
16-
806B44F2152401EC00E59412 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 806B44F1152401EC00E59412 /* ViewController.m */; };
20+
806B44F2152401EC00E59412 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 806B44F1152401EC00E59412 /* ViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
1721
806B44F5152401EC00E59412 /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 806B44F3152401EC00E59412 /* ViewController.xib */; };
18-
806B44FD1524048D00E59412 /* WaterflowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 806B44FC1524048D00E59412 /* WaterflowView.m */; };
22+
806B44FD1524048D00E59412 /* WaterflowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 806B44FC1524048D00E59412 /* WaterflowView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
1923
806B4514152463DF00E59412 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 806B4513152463DF00E59412 /* QuartzCore.framework */; };
20-
8083BC981532B194008D4DF5 /* LoadingMoreFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8083BC971532B194008D4DF5 /* LoadingMoreFooterView.m */; };
21-
8083BCA11532BF11008D4DF5 /* EGORefreshTableHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8083BCA01532BF11008D4DF5 /* EGORefreshTableHeaderView.m */; };
24+
8083BC981532B194008D4DF5 /* LoadingMoreFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8083BC971532B194008D4DF5 /* LoadingMoreFooterView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
25+
8083BCA11532BF11008D4DF5 /* EGORefreshTableHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8083BCA01532BF11008D4DF5 /* EGORefreshTableHeaderView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
2226
8083BCA31532C299008D4DF5 /* blueArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 8083BCA21532C299008D4DF5 /* blueArrow.png */; };
23-
80DE39A31525636B002EFAE3 /* ASIAuthenticationDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39861525636B002EFAE3 /* ASIAuthenticationDialog.m */; };
24-
80DE39A41525636B002EFAE3 /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39891525636B002EFAE3 /* ASIDataCompressor.m */; };
25-
80DE39A51525636B002EFAE3 /* ASIDataDecompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE398B1525636B002EFAE3 /* ASIDataDecompressor.m */; };
26-
80DE39A61525636B002EFAE3 /* ASIDownloadCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE398D1525636B002EFAE3 /* ASIDownloadCache.m */; };
27-
80DE39A71525636B002EFAE3 /* ASIFormDataRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE398F1525636B002EFAE3 /* ASIFormDataRequest.m */; };
28-
80DE39A81525636B002EFAE3 /* ASIHTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39911525636B002EFAE3 /* ASIHTTPRequest.m */; };
29-
80DE39A91525636B002EFAE3 /* ASIInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39951525636B002EFAE3 /* ASIInputStream.m */; };
30-
80DE39AA1525636B002EFAE3 /* ASINetworkQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39971525636B002EFAE3 /* ASINetworkQueue.m */; };
31-
80DE39AB1525636B002EFAE3 /* ASIWebPageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE399A1525636B002EFAE3 /* ASIWebPageRequest.m */; };
32-
80DE39AC1525636B002EFAE3 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE399D1525636B002EFAE3 /* Reachability.m */; };
33-
80DE39AD1525636B002EFAE3 /* AsyncImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39A01525636B002EFAE3 /* AsyncImageView.m */; };
34-
80DE39AE1525636B002EFAE3 /* FullyLoaded.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39A21525636B002EFAE3 /* FullyLoaded.m */; };
27+
80DE39A31525636B002EFAE3 /* ASIAuthenticationDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39861525636B002EFAE3 /* ASIAuthenticationDialog.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
28+
80DE39A41525636B002EFAE3 /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39891525636B002EFAE3 /* ASIDataCompressor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
29+
80DE39A51525636B002EFAE3 /* ASIDataDecompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE398B1525636B002EFAE3 /* ASIDataDecompressor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
30+
80DE39A61525636B002EFAE3 /* ASIDownloadCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE398D1525636B002EFAE3 /* ASIDownloadCache.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
31+
80DE39A71525636B002EFAE3 /* ASIFormDataRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE398F1525636B002EFAE3 /* ASIFormDataRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
32+
80DE39A81525636B002EFAE3 /* ASIHTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39911525636B002EFAE3 /* ASIHTTPRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
33+
80DE39A91525636B002EFAE3 /* ASIInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39951525636B002EFAE3 /* ASIInputStream.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
34+
80DE39AA1525636B002EFAE3 /* ASINetworkQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39971525636B002EFAE3 /* ASINetworkQueue.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
35+
80DE39AB1525636B002EFAE3 /* ASIWebPageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE399A1525636B002EFAE3 /* ASIWebPageRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
36+
80DE39AC1525636B002EFAE3 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE399D1525636B002EFAE3 /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
37+
80DE39AD1525636B002EFAE3 /* AsyncImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39A01525636B002EFAE3 /* AsyncImageView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
38+
80DE39AE1525636B002EFAE3 /* FullyLoaded.m in Sources */ = {isa = PBXBuildFile; fileRef = 80DE39A21525636B002EFAE3 /* FullyLoaded.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
3539
80DE39B115256374002EFAE3 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80DE39B015256374002EFAE3 /* CFNetwork.framework */; };
3640
80DE39B315256379002EFAE3 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80DE39B215256379002EFAE3 /* SystemConfiguration.framework */; };
3741
80DE39B51525637E002EFAE3 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80DE39B41525637E002EFAE3 /* MobileCoreServices.framework */; };
3842
80DE39B71525638A002EFAE3 /* libz.1.2.5.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 80DE39B61525638A002EFAE3 /* libz.1.2.5.dylib */; };
39-
80DE39B915256390002EFAE3 /* libxml2.2.7.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 80DE39B815256390002EFAE3 /* libxml2.2.7.3.dylib */; };
4043
/* End PBXBuildFile section */
4144

4245
/* Begin PBXFileReference section */
46+
04B6567C15E52AF300EFACFE /* libxml2.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.2.dylib; path = usr/lib/libxml2.2.dylib; sourceTree = SDKROOT; };
47+
04B6568415E52B7F00EFACFE /* CollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionViewController.h; sourceTree = "<group>"; };
48+
04B6568515E52B7F00EFACFE /* CollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectionViewController.m; sourceTree = "<group>"; };
49+
04B6568615E52B7F00EFACFE /* ColllectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColllectionViewCell.h; sourceTree = "<group>"; };
50+
04B6568715E52B7F00EFACFE /* ColllectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ColllectionViewCell.m; sourceTree = "<group>"; };
51+
04B6568815E52B7F00EFACFE /* WaterFlowLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaterFlowLayout.h; sourceTree = "<group>"; };
52+
04B6568915E52B7F00EFACFE /* WaterFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WaterFlowLayout.m; sourceTree = "<group>"; };
4353
806B44DA152401EC00E59412 /* WaterFlowDisplay.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WaterFlowDisplay.app; sourceTree = BUILT_PRODUCTS_DIR; };
4454
806B44DE152401EC00E59412 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
4555
806B44E0152401EC00E59412 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -95,7 +105,6 @@
95105
80DE39B215256379002EFAE3 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
96106
80DE39B41525637E002EFAE3 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
97107
80DE39B61525638A002EFAE3 /* libz.1.2.5.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.2.5.dylib; path = usr/lib/libz.1.2.5.dylib; sourceTree = SDKROOT; };
98-
80DE39B815256390002EFAE3 /* libxml2.2.7.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.2.7.3.dylib; path = usr/lib/libxml2.2.7.3.dylib; sourceTree = SDKROOT; };
99108
80DE39BE1525641D002EFAE3 /* SynthesizeSingleton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SynthesizeSingleton.h; sourceTree = "<group>"; };
100109
/* End PBXFileReference section */
101110

@@ -104,7 +113,7 @@
104113
isa = PBXFrameworksBuildPhase;
105114
buildActionMask = 2147483647;
106115
files = (
107-
80DE39B915256390002EFAE3 /* libxml2.2.7.3.dylib in Frameworks */,
116+
04B6567D15E52AF300EFACFE /* libxml2.2.dylib in Frameworks */,
108117
80DE39B71525638A002EFAE3 /* libz.1.2.5.dylib in Frameworks */,
109118
80DE39B51525637E002EFAE3 /* MobileCoreServices.framework in Frameworks */,
110119
80DE39B315256379002EFAE3 /* SystemConfiguration.framework in Frameworks */,
@@ -143,7 +152,7 @@
143152
806B44DD152401EC00E59412 /* Frameworks */ = {
144153
isa = PBXGroup;
145154
children = (
146-
80DE39B815256390002EFAE3 /* libxml2.2.7.3.dylib */,
155+
04B6567C15E52AF300EFACFE /* libxml2.2.dylib */,
147156
80DE39B61525638A002EFAE3 /* libz.1.2.5.dylib */,
148157
80DE39B41525637E002EFAE3 /* MobileCoreServices.framework */,
149158
80DE39B215256379002EFAE3 /* SystemConfiguration.framework */,
@@ -159,6 +168,12 @@
159168
806B44E4152401EC00E59412 /* WaterFlowDisplay */ = {
160169
isa = PBXGroup;
161170
children = (
171+
04B6568415E52B7F00EFACFE /* CollectionViewController.h */,
172+
04B6568515E52B7F00EFACFE /* CollectionViewController.m */,
173+
04B6568615E52B7F00EFACFE /* ColllectionViewCell.h */,
174+
04B6568715E52B7F00EFACFE /* ColllectionViewCell.m */,
175+
04B6568815E52B7F00EFACFE /* WaterFlowLayout.h */,
176+
04B6568915E52B7F00EFACFE /* WaterFlowLayout.m */,
162177
806B44ED152401EC00E59412 /* AppDelegate.h */,
163178
806B44EE152401EC00E59412 /* AppDelegate.m */,
164179
806B44F0152401EC00E59412 /* ViewController.h */,
@@ -340,6 +355,9 @@
340355
80DE39AE1525636B002EFAE3 /* FullyLoaded.m in Sources */,
341356
8083BC981532B194008D4DF5 /* LoadingMoreFooterView.m in Sources */,
342357
8083BCA11532BF11008D4DF5 /* EGORefreshTableHeaderView.m in Sources */,
358+
04B6568A15E52B7F00EFACFE /* CollectionViewController.m in Sources */,
359+
04B6568B15E52B7F00EFACFE /* ColllectionViewCell.m in Sources */,
360+
04B6568C15E52B7F00EFACFE /* WaterFlowLayout.m in Sources */,
343361
);
344362
runOnlyForDeploymentPostprocessing = 0;
345363
};
@@ -411,6 +429,7 @@
411429
806B44F9152401EC00E59412 /* Debug */ = {
412430
isa = XCBuildConfiguration;
413431
buildSettings = {
432+
CLANG_ENABLE_OBJC_ARC = YES;
414433
GCC_PRECOMPILE_PREFIX_HEADER = YES;
415434
GCC_PREFIX_HEADER = "WaterFlowDisplay/WaterFlowDisplay-Prefix.pch";
416435
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
@@ -423,6 +442,7 @@
423442
806B44FA152401EC00E59412 /* Release */ = {
424443
isa = XCBuildConfiguration;
425444
buildSettings = {
445+
CLANG_ENABLE_OBJC_ARC = YES;
426446
GCC_PRECOMPILE_PREFIX_HEADER = YES;
427447
GCC_PREFIX_HEADER = "WaterFlowDisplay/WaterFlowDisplay-Prefix.pch";
428448
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0450"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "806B44D9152401EC00E59412"
18+
BuildableName = "WaterFlowDisplay.app"
19+
BlueprintName = "WaterFlowDisplay"
20+
ReferencedContainer = "container:WaterFlowDisplay.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
27+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28+
shouldUseLaunchSchemeArgsEnv = "YES"
29+
buildConfiguration = "Debug">
30+
<Testables>
31+
</Testables>
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "806B44D9152401EC00E59412"
36+
BuildableName = "WaterFlowDisplay.app"
37+
BlueprintName = "WaterFlowDisplay"
38+
ReferencedContainer = "container:WaterFlowDisplay.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
</TestAction>
42+
<LaunchAction
43+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
44+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
45+
launchStyle = "0"
46+
useCustomWorkingDirectory = "NO"
47+
buildConfiguration = "Debug"
48+
ignoresPersistentStateOnLaunch = "NO"
49+
debugDocumentVersioning = "YES"
50+
allowLocationSimulation = "YES">
51+
<BuildableProductRunnable>
52+
<BuildableReference
53+
BuildableIdentifier = "primary"
54+
BlueprintIdentifier = "806B44D9152401EC00E59412"
55+
BuildableName = "WaterFlowDisplay.app"
56+
BlueprintName = "WaterFlowDisplay"
57+
ReferencedContainer = "container:WaterFlowDisplay.xcodeproj">
58+
</BuildableReference>
59+
</BuildableProductRunnable>
60+
<AdditionalOptions>
61+
</AdditionalOptions>
62+
</LaunchAction>
63+
<ProfileAction
64+
shouldUseLaunchSchemeArgsEnv = "YES"
65+
savedToolIdentifier = ""
66+
useCustomWorkingDirectory = "NO"
67+
buildConfiguration = "Release"
68+
debugDocumentVersioning = "YES">
69+
<BuildableProductRunnable>
70+
<BuildableReference
71+
BuildableIdentifier = "primary"
72+
BlueprintIdentifier = "806B44D9152401EC00E59412"
73+
BuildableName = "WaterFlowDisplay.app"
74+
BlueprintName = "WaterFlowDisplay"
75+
ReferencedContainer = "container:WaterFlowDisplay.xcodeproj">
76+
</BuildableReference>
77+
</BuildableProductRunnable>
78+
</ProfileAction>
79+
<AnalyzeAction
80+
buildConfiguration = "Debug">
81+
</AnalyzeAction>
82+
<ArchiveAction
83+
buildConfiguration = "Release"
84+
revealArchiveInOrganizer = "YES">
85+
</ArchiveAction>
86+
</Scheme>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>WaterFlowDisplay.xcscheme</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
</dict>
13+
<key>SuppressBuildableAutocreation</key>
14+
<dict>
15+
<key>806B44D9152401EC00E59412</key>
16+
<dict>
17+
<key>primary</key>
18+
<true/>
19+
</dict>
20+
</dict>
21+
</dict>
22+
</plist>

WaterFlowDisplay/.DS_Store

0 Bytes
Binary file not shown.

WaterFlowDisplay/AppDelegate.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import <UIKit/UIKit.h>
10+
#import "CollectionViewController.h"
1011

1112
@class ViewController;
1213

@@ -16,4 +17,6 @@
1617

1718
@property (strong, nonatomic) ViewController *viewController;
1819

20+
@property (strong, nonatomic) WaterflowCollectionViewController *vc;
21+
1922
@end

WaterFlowDisplay/AppDelegate.m

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@ @implementation AppDelegate
1515
@synthesize window = _window;
1616
@synthesize viewController = _viewController;
1717

18-
- (void)dealloc
19-
{
20-
[_window release];
21-
[_viewController release];
22-
[super dealloc];
23-
}
24-
2518
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
2619
{
27-
self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
20+
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] ;
2821
// Override point for customization after application launch.
29-
self.viewController = [[[ViewController alloc] initWithNibName:@"ViewController" bundle:nil] autorelease];
30-
self.window.rootViewController = self.viewController;
22+
23+
// self.viewController = [[[ViewController alloc] initWithNibName:@"ViewController" bundle:nil] autorelease];
24+
// self.window.rootViewController = self.viewController;
25+
26+
WaterFlowLayout *layout = [[WaterFlowLayout alloc]init];
27+
self.vc = [[WaterflowCollectionViewController alloc]initWithCollectionViewLayout:layout];
28+
self.window.rootViewController = self.vc;
29+
3130
[self.window makeKeyAndVisible];
3231
return YES;
3332
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//
2+
// CollectionViewController.h
3+
// WaterFlowDisplay
4+
//
5+
// Created by B.H.Liu on 12-8-22.
6+
// Copyright (c) 2012年 Appublisher. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
#import "WaterFlowLayout.h"
11+
12+
@interface WaterflowCollectionViewController : UICollectionViewController <UICollectionViewDataSource,UICollectionViewDelegate,UICollecitonViewDelegateWaterFlowLayout,UICollectionViewDataSourceWaterFlowLayout>
13+
14+
@end

0 commit comments

Comments
 (0)