Updated iOSSampleApp and related files.
Removed include guard in SkTime_Unix.cpp, which the iOSSampleApp now uses.
git-svn-id: http://skia.googlecode.com/svn/trunk@1820 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h b/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h
index 17b0647..5d1a853 100644
--- a/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h
+++ b/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h
@@ -1,15 +1,17 @@
#import <UIKit/UIKit.h>
#import "SkUINavigationController.h"
+
@interface AppDelegate_iPhone : NSObject <UITableViewDelegate, UIApplicationDelegate> {
+@private
UIWindow *window;
SkUINavigationController* fRoot;
SkUIDetailViewController* fDetail;
}
-
@property (nonatomic, retain) IBOutlet UIWindow *window;
@property (nonatomic, retain) IBOutlet SkUINavigationController* fRoot;
@property (nonatomic, retain) IBOutlet SkUIDetailViewController* fDetail;
- (IBAction)displaySampleList:(id)sender;
+
@end
diff --git a/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm b/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm
index d3ee5b4..abd5057 100644
--- a/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm
+++ b/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm
@@ -1,49 +1,18 @@
#import "AppDelegate_iPhone.h"
@implementation AppDelegate_iPhone
-
@synthesize window, fRoot, fDetail;
-#pragma mark -
-#pragma mark Application lifecycle
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
- [window addSubview:fRoot.view];
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
[window addSubview:fDetail.view];
+ [window addSubview:fRoot.view];
[fRoot loadData];
fDetail.view.hidden = YES;
[window makeKeyAndVisible];
-
+
return YES;
}
-#pragma mark -
-#pragma mark Table view delegate
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
- [fDetail goToItem:indexPath.row];
- [UIView transitionWithView:window
- duration:0.5
- options:UIViewAnimationOptionTransitionFlipFromRight
- animations:^{
- fRoot.view.hidden = YES;
- fDetail.view.hidden = NO;
- }
- completion:NULL];
-}
-
-- (IBAction)displaySampleList:(id)sender
-{
- [UIView transitionWithView:window
- duration:0.5
- options:UIViewAnimationOptionTransitionFlipFromLeft
- animations:^{
- fRoot.view.hidden = NO;
- fDetail.view.hidden = YES;
- }
- completion:NULL];
-}
-
- (void)dealloc {
[window release];
[fRoot release];
@@ -51,5 +20,28 @@
[super dealloc];
}
+//Table View Delegate Methods
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [fDetail goToItem:indexPath.row];
+ [UIView transitionWithView:window
+ duration:0.5
+ options:UIViewAnimationOptionTransitionFlipFromRight
+ animations:^{
+ fRoot.view.hidden = YES;
+ fDetail.view.hidden = NO;
+ }
+ completion:NULL];
+}
+
+- (IBAction)displaySampleList:(id)sender {
+ [UIView transitionWithView:window
+ duration:0.5
+ options:UIViewAnimationOptionTransitionFlipFromLeft
+ animations:^{
+ fRoot.view.hidden = NO;
+ fDetail.view.hidden = YES;
+ }
+ completion:NULL];
+}
@end
diff --git a/experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib b/experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib
index 9762efb..aacf6a8 100644
--- a/experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib
+++ b/experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="50"/>
+ <integer value="67"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -67,6 +67,7 @@
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview" ref="456730278"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIBarStyle">1</int>
<object class="NSArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUINavigationItem" id="891607485">
@@ -88,16 +89,83 @@
</object>
</object>
</object>
+ <object class="IBUIToolbar" id="548887586">
+ <reference key="NSNextResponder" ref="456730278"/>
+ <int key="NSvFlags">266</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUISwitch" id="565373618">
+ <reference key="NSNextResponder" ref="548887586"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{137, 9}, {94, 27}}</string>
+ <reference key="NSSuperview" ref="548887586"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ </object>
+ </object>
+ <string key="NSFrame">{{0, 436}, {320, 44}}</string>
+ <reference key="NSSuperview" ref="456730278"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIBarStyle">1</int>
+ <object class="NSMutableArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIBarButtonItem" id="819035899">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUIToolbar" ref="548887586"/>
+ <int key="IBUISystemItemIdentifier">5</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="572928196">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <float key="IBUIWidth">54</float>
+ <reference key="IBUIToolbar" ref="548887586"/>
+ <int key="IBUISystemItemIdentifier">6</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="11913858">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUICustomView" ref="565373618"/>
+ <reference key="IBUIToolbar" ref="548887586"/>
+ </object>
+ <object class="IBUIBarButtonItem" id="357864452">
+ <string key="IBUITitle">Server IP</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUIToolbar" ref="548887586"/>
+ </object>
+ </object>
+ </object>
+ <object class="IBUILabel" id="1033881221">
+ <reference key="NSNextResponder" ref="456730278"/>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{80, 443}, {59, 29}}</string>
+ <reference key="NSSuperview" ref="456730278"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Pipe</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">24</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor" id="535258798">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <reference key="IBUIHighlightedColor" ref="535258798"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
</object>
<string key="NSFrameSize">{320, 480}</string>
<reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- <object class="NSColorSpace" key="NSCustomColorSpace">
- <int key="NSID">2</int>
- </object>
- </object>
+ <reference key="IBUIBackgroundColor" ref="535258798"/>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIToolbarItems" ref="0"/>
@@ -133,10 +201,7 @@
<nil key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 416}</string>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
+ <reference key="IBUIBackgroundColor" ref="535258798"/>
<bool key="IBUIClipsSubviews">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIAlwaysBounceVertical">YES</bool>
@@ -261,6 +326,23 @@
</object>
<int key="connectionID">66</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">usePipe:</string>
+ <reference key="source" ref="565373618"/>
+ <reference key="destination" ref="386778494"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">74</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">enterServerIP:</string>
+ <reference key="source" ref="357864452"/>
+ <reference key="destination" ref="386778494"/>
+ </object>
+ <int key="connectionID">76</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -336,6 +418,8 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="48218410"/>
+ <reference ref="548887586"/>
+ <reference ref="1033881221"/>
</object>
<reference key="parent" ref="386778494"/>
</object>
@@ -381,6 +465,52 @@
<reference key="object" ref="108468174"/>
<reference key="parent" ref="891607485"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">67</int>
+ <reference key="object" ref="548887586"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="11913858"/>
+ <reference ref="819035899"/>
+ <reference ref="572928196"/>
+ <reference ref="357864452"/>
+ </object>
+ <reference key="parent" ref="456730278"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">70</int>
+ <reference key="object" ref="11913858"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="565373618"/>
+ </object>
+ <reference key="parent" ref="548887586"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">69</int>
+ <reference key="object" ref="565373618"/>
+ <reference key="parent" ref="11913858"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">71</int>
+ <reference key="object" ref="819035899"/>
+ <reference key="parent" ref="548887586"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">72</int>
+ <reference key="object" ref="572928196"/>
+ <reference key="parent" ref="548887586"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">73</int>
+ <reference key="object" ref="1033881221"/>
+ <reference key="parent" ref="456730278"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">75</int>
+ <reference key="object" ref="357864452"/>
+ <reference key="parent" ref="548887586"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -413,6 +543,14 @@
<string>51.IBPluginDependency</string>
<string>54.IBPluginDependency</string>
<string>62.IBPluginDependency</string>
+ <string>67.IBPluginDependency</string>
+ <string>67.IBViewBoundsToFrameTransform</string>
+ <string>69.IBPluginDependency</string>
+ <string>71.IBPluginDependency</string>
+ <string>72.IBPluginDependency</string>
+ <string>73.IBPluginDependency</string>
+ <string>73.IBViewBoundsToFrameTransform</string>
+ <string>75.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -422,7 +560,7 @@
<string>{{363, 1064}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>SkUIDetailViewController</string>
- <string>{{413, 1055}, {320, 480}}</string>
+ <string>{{454, 570}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSMutableDictionary">
@@ -450,6 +588,18 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw+8AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABC3gAAw+sAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -468,7 +618,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">66</int>
+ <int key="maxID">76</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -538,20 +688,14 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>handleDoubleTapGesture:</string>
- <string>handlePanGesture:</string>
- <string>handlePinchGesture:</string>
- <string>handleRotationGesture:</string>
- <string>handleSwipeGesture:</string>
+ <string>enterServerIP:</string>
<string>printContent:</string>
+ <string>usePipe:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>UIGestureRecognizer</string>
- <string>UIPanGestureRecognizer</string>
- <string>UIPinchGestureRecognizer</string>
- <string>UIRotationGestureRecognizer</string>
- <string>UISwipeGestureRecognizer</string>
+ <string>id</string>
+ <string>id</string>
<string>id</string>
</object>
</object>
@@ -559,39 +703,24 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>handleDoubleTapGesture:</string>
- <string>handlePanGesture:</string>
- <string>handlePinchGesture:</string>
- <string>handleRotationGesture:</string>
- <string>handleSwipeGesture:</string>
+ <string>enterServerIP:</string>
<string>printContent:</string>
+ <string>usePipe:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
- <string key="name">handleDoubleTapGesture:</string>
- <string key="candidateClassName">UIGestureRecognizer</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">handlePanGesture:</string>
- <string key="candidateClassName">UIPanGestureRecognizer</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">handlePinchGesture:</string>
- <string key="candidateClassName">UIPinchGestureRecognizer</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">handleRotationGesture:</string>
- <string key="candidateClassName">UIRotationGestureRecognizer</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">handleSwipeGesture:</string>
- <string key="candidateClassName">UISwipeGestureRecognizer</string>
+ <string key="name">enterServerIP:</string>
+ <string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">printContent:</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBActionInfo">
+ <string key="name">usePipe:</string>
+ <string key="candidateClassName">id</string>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -764,20 +893,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
</object>
</object>
@@ -820,18 +935,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIGestureRecognizer</string>
- <string key="superclassName">NSObject</string>
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIGestureRecognizer.h</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIGestureRecognizer</string>
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIGestureRecognizerSubclass.h</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -856,35 +972,11 @@
<reference key="sourceIdentifier" ref="443745583"/>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIPanGestureRecognizer</string>
- <string key="superclassName">UIGestureRecognizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPanGestureRecognizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIPinchGestureRecognizer</string>
- <string key="superclassName">UIGestureRecognizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIPinchGestureRecognizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">UIResponder</string>
<string key="superclassName">NSObject</string>
<reference key="sourceIdentifier" ref="565734826"/>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIRotationGestureRecognizer</string>
- <string key="superclassName">UIGestureRecognizer</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIRotationGestureRecognizer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">UIScrollView</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -909,11 +1001,11 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UISwipeGestureRecognizer</string>
- <string key="superclassName">UIGestureRecognizer</string>
+ <string key="className">UISwitch</string>
+ <string key="superclassName">UIControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UISwipeGestureRecognizer.h</string>
+ <string key="minorKey">UIKit.framework/Headers/UISwitch.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -933,6 +1025,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UIToolbar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIToolbar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
@@ -1008,7 +1108,7 @@
<integer value="3100" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../iOSShell.xcodeproj</string>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../iOSSampleApp.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">141</string>
</data>
diff --git a/experimental/iOSSampleApp/iPhone/SkUINavigationController.h b/experimental/iOSSampleApp/iPhone/SkUINavigationController.h
index aa6697b..c119ee4 100644
--- a/experimental/iOSSampleApp/iPhone/SkUINavigationController.h
+++ b/experimental/iOSSampleApp/iPhone/SkUINavigationController.h
@@ -2,8 +2,8 @@
#import "SkUIRootViewController.h"
#import "SkUIDetailViewController.h"
-
@interface SkUINavigationController : UINavigationController {
+@private
SkUIRootViewController* fRoot;
SkUIDetailViewController* fDetail;
}
@@ -11,4 +11,5 @@
@property (nonatomic, retain) IBOutlet SkUIDetailViewController* fDetail;
- (void)loadData;
+
@end
diff --git a/experimental/iOSSampleApp/iPhone/SkUINavigationController.mm b/experimental/iOSSampleApp/iPhone/SkUINavigationController.mm
index d39cc48..179eed7 100644
--- a/experimental/iOSSampleApp/iPhone/SkUINavigationController.mm
+++ b/experimental/iOSSampleApp/iPhone/SkUINavigationController.mm
@@ -4,7 +4,7 @@
@synthesize fRoot, fDetail;
- (void)loadData {
- [fRoot initList];
+ [fRoot initSamples];
[fDetail populateRoot:fRoot];
}