Modication of the sample to match the new integration

ArtFaks · Nov 2, 2011 · a990e8f · a990e8f
1 parent 3daaca5
commit a990e8f
Show file tree

Hide file tree

Showing 9 changed files with 237 additions and 60 deletions.
diff --git a/Examples/Cascade/Cascade.xcodeproj/project.pbxproj b/Examples/Cascade/Cascade.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
 		20AB8423141FA51400C11F72 /* detached_image.png in Resources */ = {isa = PBXBuildFile; fileRef = 20AB8422141FA51400C11F72 /* detached_image.png */; };
 		20AB8427141FA55B00C11F72 /* ExampleNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 20AB8426141FA55B00C11F72 /* ExampleNavigationController.m */; };
 		B68075131458204B008035DC /* libCascade.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B680751214582041008035DC /* libCascade.a */; };
+		E06EEEE6146160A30095F933 /* ExampleUITableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E06EEEE5146160A20095F933 /* ExampleUITableViewController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -103,6 +104,8 @@
 		20AB8425141FA55B00C11F72 /* ExampleNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExampleNavigationController.h; sourceTree = "<group>"; };
 		20AB8426141FA55B00C11F72 /* ExampleNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExampleNavigationController.m; sourceTree = "<group>"; };
 		B680750A14582041008035DC /* Cascade.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Cascade.xcodeproj; path = ../../src/Cascade/Cascade.xcodeproj; sourceTree = SOURCE_ROOT; };
+		E06EEEE4146160A20095F933 /* ExampleUITableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExampleUITableViewController.h; sourceTree = "<group>"; };
+		E06EEEE5146160A20095F933 /* ExampleUITableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExampleUITableViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -188,6 +191,8 @@
 				209BC87214587B77005160AE /* ExampleXIBViewController.h */,
 				209BC87314587B77005160AE /* ExampleXIBViewController.m */,
 				209BC87414587B77005160AE /* ExampleXIBViewController.xib */,
+				E06EEEE4146160A20095F933 /* ExampleUITableViewController.h */,
+				E06EEEE5146160A20095F933 /* ExampleUITableViewController.m */,
 				207EA49A13992C0400A8200F /* Supporting Files */,
 			);
 			path = Cascade;
@@ -323,6 +328,7 @@
 				209E099013C8F95400BCFFD0 /* ExampleWebViewController.m in Sources */,
 				20AB8427141FA55B00C11F72 /* ExampleNavigationController.m in Sources */,
 				209BC87514587B77005160AE /* ExampleXIBViewController.m in Sources */,
+				E06EEEE6146160A30095F933 /* ExampleUITableViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Examples/Cascade/Cascade/ExampleCategoriesViewController.m b/Examples/Cascade/Cascade/ExampleCategoriesViewController.m
@@ -108,7 +108,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     // if you select row, then create and push custom UIViewController
-    ExampleTableViewController* rootTableViewController = [[ExampleTableViewController alloc] initWithTableViewStyle: UITableViewStylePlain];
+    ExampleTableViewController* rootTableViewController = [[ExampleTableViewController alloc] initWithTableViewStyle:UITableViewStylePlain size:CLViewSizeNormal];
     [self.cascadeNavigationController setRootViewController:rootTableViewController animated:YES];
 
 }

diff --git a/Examples/Cascade/Cascade/ExampleCategoriesViewController.xib b/Examples/Cascade/Cascade/ExampleCategoriesViewController.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
 	<data>
-		<int key="IBDocument.SystemTarget">1056</int>
-		<string key="IBDocument.SystemVersion">11A511</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
-		<string key="IBDocument.AppKitVersion">1138</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<int key="IBDocument.SystemTarget">1280</int>
+		<string key="IBDocument.SystemVersion">11C74</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">534</string>
+			<string key="NS.object.0">933</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -23,11 +23,8 @@
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<reference key="dict.values" ref="0"/>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -96,9 +93,9 @@
 						<reference key="NSSuperview" ref="942394161"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="622239563"/>
-						<object class="NSColor" key="IBUIBackgroundColor" id="64150975">
+						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
+							<bytes key="NSWhite">MSAwAA</bytes>
 						</object>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -137,12 +134,10 @@
 								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
 								<int key="IBUIContentVerticalAlignment">0</int>
-								<object class="NSFont" key="IBUIFont" id="613598267">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
+								<object class="NSColor" key="IBUIHighlightedTitleColor" id="64150975">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
 								</object>
-								<reference key="IBUIHighlightedTitleColor" ref="64150975"/>
 								<object class="NSColor" key="IBUINormalTitleColor">
 									<int key="NSColorSpace">1</int>
 									<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
@@ -160,18 +155,29 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">refresh.png</string>
 								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="808033599">
+									<string key="name">Helvetica-Bold</string>
+									<string key="family">Helvetica</string>
+									<int key="traits">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="613598267">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
 							</object>
 							<object class="IBUIButton" id="683854917">
 								<reference key="NSNextResponder" ref="622239563"/>
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{721, 9}, {40, 25}}</string>
 								<reference key="NSSuperview" ref="622239563"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
 								<int key="IBUIContentVerticalAlignment">0</int>
-								<reference key="IBUIFont" ref="613598267"/>
 								<reference key="IBUIHighlightedTitleColor" ref="64150975"/>
 								<object class="NSColor" key="IBUINormalTitleColor">
 									<int key="NSColorSpace">1</int>
@@ -187,6 +193,8 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">preferences.png</string>
 								</object>
+								<reference key="IBUIFontDescription" ref="808033599"/>
+								<reference key="IBUIFont" ref="613598267"/>
 							</object>
 						</object>
 						<string key="NSFrame">{{0, 964}, {768, 40}}</string>
@@ -260,7 +268,9 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
@@ -393,7 +403,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">42</int>
+			<int key="maxID">43</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -416,7 +426,18 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">CLCategoriesViewController</string>
-					<string key="superclassName">CLTableViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">tableView</string>
+						<string key="NS.object.0">UITableView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">tableView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">tableView</string>
+							<string key="candidateClassName">UITableView</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/CLCategoriesViewController.h</string>
@@ -470,16 +491,15 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">CLTableViewController</string>
-					<string key="superclassName">CLViewController</string>
+					<string key="className">ExampleCategoriesViewController</string>
+					<string key="superclassName">CLCategoriesViewController</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/CLTableViewController.h</string>
+						<string key="minorKey">./Classes/ExampleCategoriesViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">CLViewController</string>
-					<string key="superclassName">UIViewController</string>
+					<string key="className">UIViewController</string>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">cascadeNavigationController</string>
 						<string key="NS.object.0">CLCascadeNavigationController</string>
@@ -493,15 +513,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/CLViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ExampleCategoriesViewController</string>
-					<string key="superclassName">CLCategoriesViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ExampleCategoriesViewController.h</string>
+						<string key="minorKey">./Classes/UIViewController.h</string>
 					</object>
 				</object>
 			</object>
@@ -535,6 +547,6 @@
 				<string>{20, 24}</string>
 			</object>
 		</object>
-		<string key="IBCocoaTouchPluginVersion">534</string>
+		<string key="IBCocoaTouchPluginVersion">933</string>
 	</data>
 </archive>
diff --git a/Examples/Cascade/Cascade/ExampleNavigationController.m b/Examples/Cascade/Cascade/ExampleNavigationController.m
@@ -104,7 +104,7 @@ - (void) cascadeViewDidCancelPullToDetachPages:(CLCascadeView*)cascadeView {
 - (void) cascadeViewDidPullToDetachPages:(CLCascadeView*)cascadeView {
     [super cascadeViewDidPullToDetachPages:cascadeView];
 
-    id view = [[(CLViewController*)self.rootViewController segmentedView] contentView];
+    id view = [[self.rootViewController segmentedView] contentView];
     if ([view isKindOfClass:[UITableView class]]) {
         UITableView* tableView = (UITableView*)view;
         NSIndexPath* indexPath = [tableView indexPathForSelectedRow];
@@ -137,7 +137,7 @@ - (void) cascadeViewDidPullToDetachPages:(CLCascadeView*)cascadeView {
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-- (void) cascadeView:(CLCascadeView*)cascadeView didAddPage:(UIView*)page animated:(BOOL)animated {
+- (void) cascadeView:(CLCascadeView*)cascadeView didAddPage:(UIViewController*)page animated:(BOOL)animated {
     _dynamicDetachImage.hidden = ([self.viewControllers count] < 2) ? YES : NO;    
     _staticDetachImage.hidden = ([self.viewControllers count] < 2) ? YES : NO;    
 }

diff --git a/Examples/Cascade/Cascade/ExampleTableViewController.h b/Examples/Cascade/Cascade/ExampleTableViewController.h
@@ -9,8 +9,15 @@
 #import <Foundation/Foundation.h>
 #import <Cascade/Cascade.h>
 
-@interface ExampleTableViewController : CLTableViewController {
-
+// We could also inherits from CLTableViewController
+// This is just to show how to use a standard UIViewController and place a content view !
+
+@interface ExampleTableViewController : UIViewController <UITableViewDataSource, UITableViewDelegate> {
+    UITableViewStyle _tableViewStyle;
 }
 
+@property (nonatomic, strong) UITableView *tableView;
+
+- (id) initWithTableViewStyle:(UITableViewStyle)style size:(CLViewSize)size;
+
 @end
diff --git a/Examples/Cascade/Cascade/ExampleTableViewController.m b/Examples/Cascade/Cascade/ExampleTableViewController.m
@@ -9,11 +9,32 @@
 #import "ExampleTableViewController.h"
 #import "ExampleWebViewController.h"
 #import "ExampleXIBViewController.h"
+#import "ExampleUITableViewController.h"
 
 @implementation ExampleTableViewController
+@synthesize tableView = _tableView;
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void) loadView {
+    CLSegmentedView *view_ = [[CLSegmentedView alloc] initWithSize:CLViewSizeWider];
+    self.view = view_;
+
+    self.tableView = [[UITableView alloc] initWithFrame:CGRectZero
+                                                   style:_tableViewStyle];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    [view_ setContentView:_tableView];
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+- (id) initWithTableViewStyle:(UITableViewStyle)style size:(CLViewSize)size;
+{
+    self = [super initWithSize: size];
+    if (self) {
+        _tableViewStyle = style;
+    }
+    return self;
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (void)didReceiveMemoryWarning
@@ -75,7 +96,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
     // Return the number of rows in the section.
-    return 6;
+    return 8;
 }
 
 
@@ -90,16 +111,20 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     }
 
     // Configure the cell...
-
-    if (indexPath.row%3 == 0) {
-        cell.textLabel.text = @"New Table View";
-    } else
-    if (indexPath.row%3 == 1)  {
-        cell.textLabel.text = @"New Web View";
+
+    if (indexPath.row%4 == 0) {
+        cell.textLabel.text = @"New Table View with CLSegmentedView";
     } else
-    {
-        cell.textLabel.text = @"New View from XIB";
-    }
+        if (indexPath.row%4 == 1)  {
+            cell.textLabel.text = @"New Web View";
+        } else
+            if (indexPath.row%4 == 2)  {
+                cell.textLabel.text = @"New UITableViewController";
+            }
+            else
+            {
+                cell.textLabel.text = @"New View from XIB";
+            }
     return cell;
 }
 
@@ -109,17 +134,19 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    CLViewController* viewController = nil;
+    UIViewController* viewController = nil;
 
-    if (indexPath.row%3 == 0) {
-        viewController = [[ExampleTableViewController alloc] initWithTableViewStyle: UITableViewStylePlain];
+    if (indexPath.row%4 == 0) {
+        viewController = [[ExampleTableViewController alloc] initWithTableViewStyle:UITableViewStylePlain size:CLViewSizeNormal];
     } else 
-    if (indexPath.row%3 == 1) {
+    if (indexPath.row%4 == 1) {
         viewController = [[ExampleWebViewController alloc] init];
     } else 
-    {
-        viewController = [[ExampleXIBViewController alloc] initWithNibName:@"ExampleXIBViewController" bundle:nil size:CLViewSizeNormal];
-    }
+        if (indexPath.row%4 == 2) {
+            viewController = [[ExampleUITableViewController alloc] initWithStyle:UITableViewStylePlain];
+        } else
+            viewController = [[ExampleXIBViewController alloc] initWithNibName:@"ExampleXIBViewController" bundle:nil size:CLViewSizeNormal];
+
 
     [self pushDetailViewController:viewController animated:YES];
 }

diff --git a/Examples/Cascade/Cascade/ExampleUITableViewController.h b/Examples/Cascade/Cascade/ExampleUITableViewController.h
@@ -0,0 +1,13 @@
+//
+//  ExampleUITableViewController.h
+//  Cascade
+//
+//  Created by Marian PAUL on 02/11/11.
+//  Copyright (c) 2011 iPuP SARL. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ExampleUITableViewController : UITableViewController
+
+@end