Skip to content

Commit e700de7

Browse files
InferisInferis
committed
Merge branch 'develop'
2 parents 6472f1a + 10332e6 commit e700de7

File tree

19 files changed

+171
-105
lines changed

19 files changed

+171
-105
lines changed

‎[email protected]

2.98 KB
Loading

‎FeaturesExample.xcodeproj/project.pbxproj

-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
E2C8E5A41497F62B00560D23 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E2C8E5A31497F62B00560D23 /* AppDelegate.m */; };
2424
E2C8E5B81497F9CA00560D23 /* ChoiceController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2C8E5B61497F9CA00560D23 /* ChoiceController.m */; };
2525
E2C8E5B91497F9CA00560D23 /* ChoiceController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2C8E5B71497F9CA00560D23 /* ChoiceController.xib */; };
26-
E2C8E5C11497FC6400560D23 /* PathlikeSliderController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2C8E5C01497FC6400560D23 /* PathlikeSliderController.m */; };
2726
E2C8E5C61497FDC600560D23 /* PhotosController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2C8E5C41497FDC600560D23 /* PhotosController.m */; };
2827
E2C8E5C71497FDC600560D23 /* PhotosController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2C8E5C51497FDC600560D23 /* PhotosController.xib */; };
2928
E2C8E5CB1497FDDB00560D23 /* SelectionController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2C8E5C91497FDDB00560D23 /* SelectionController.m */; };
@@ -59,8 +58,6 @@
5958
E2C8E5B51497F9CA00560D23 /* ChoiceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChoiceController.h; sourceTree = "<group>"; };
6059
E2C8E5B61497F9CA00560D23 /* ChoiceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChoiceController.m; sourceTree = "<group>"; };
6160
E2C8E5B71497F9CA00560D23 /* ChoiceController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ChoiceController.xib; sourceTree = "<group>"; };
62-
E2C8E5BF1497FC6400560D23 /* PathlikeSliderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PathlikeSliderController.h; sourceTree = "<group>"; };
63-
E2C8E5C01497FC6400560D23 /* PathlikeSliderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PathlikeSliderController.m; sourceTree = "<group>"; };
6461
E2C8E5C31497FDC600560D23 /* PhotosController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhotosController.h; sourceTree = "<group>"; };
6562
E2C8E5C41497FDC600560D23 /* PhotosController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotosController.m; sourceTree = "<group>"; };
6663
E2C8E5C51497FDC600560D23 /* PhotosController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PhotosController.xib; sourceTree = "<group>"; };
@@ -138,8 +135,6 @@
138135
E2C8E5B51497F9CA00560D23 /* ChoiceController.h */,
139136
E2C8E5B61497F9CA00560D23 /* ChoiceController.m */,
140137
E2C8E5B71497F9CA00560D23 /* ChoiceController.xib */,
141-
E2C8E5BF1497FC6400560D23 /* PathlikeSliderController.h */,
142-
E2C8E5C01497FC6400560D23 /* PathlikeSliderController.m */,
143138
E2C8E5C21497FDAE00560D23 /* Content */,
144139
);
145140
path = FeaturesExample;
@@ -255,7 +250,6 @@
255250
E2C8E5A01497F62B00560D23 /* main.m in Sources */,
256251
E2C8E5A41497F62B00560D23 /* AppDelegate.m in Sources */,
257252
E2C8E5B81497F9CA00560D23 /* ChoiceController.m in Sources */,
258-
E2C8E5C11497FC6400560D23 /* PathlikeSliderController.m in Sources */,
259253
E2C8E5C61497FDC600560D23 /* PhotosController.m in Sources */,
260254
E2C8E5CB1497FDDB00560D23 /* SelectionController.m in Sources */,
261255
E2955F7014B728E4003DDB4E /* IIViewDeckController.m in Sources */,

‎FeaturesExample/ChoiceController.m

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
//
55

66
#import "ChoiceController.h"
7-
#import "PathlikeSliderController.h"
7+
#import "PhotosController.h"
8+
#import "SelectionController.h"
9+
#import "IIViewDeckController.h"
810

911
@interface ChoiceController () <IIViewDeckControllerDelegate> {
1012
IIViewDeckPanningMode _panning;
@@ -54,7 +56,10 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
5456

5557

5658
- (IBAction)pressedNavigate:(id)sender {
57-
PathlikeSliderController* controller = [[PathlikeSliderController alloc] init];
59+
PhotosController* photosController = [[PhotosController alloc] initWithNibName:@"PhotosController" bundle:nil];
60+
SelectionController* selectionController = [[SelectionController alloc] initWithNibName:@"SelectionController" bundle:nil];
61+
62+
IIViewDeckController* controller = [[IIViewDeckController alloc] initWithCenterViewController:photosController leftViewController:selectionController];
5863
controller.panningMode = _panning;
5964
controller.centerhiddenInteractivity = _centerHidden;
6065
controller.navigationControllerBehavior = _navBehavior;
@@ -64,6 +69,7 @@ - (IBAction)pressedNavigate:(id)sender {
6469
controller.elastic = _elastic;
6570
controller.leftSize = 320;
6671
controller.delegate = self;
72+
[controller openLeftView];
6773

6874
[self.navigationController pushViewController:controller animated:YES];
6975
}

‎FeaturesExample/PathlikeSliderController.h

-11
This file was deleted.

‎FeaturesExample/PathlikeSliderController.m

-59
This file was deleted.

‎FeaturesExample/SelectionController.m

+17
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,25 @@ - (void)viewDidLoad
1919

2020
self.tableView.backgroundColor = [UIColor colorWithWhite:0.2 alpha:1];
2121
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
22+
23+
self.navigationItem.leftBarButtonItems = [NSArray arrayWithObjects:
24+
[[UIBarButtonItem alloc] initWithTitle:@"Back" style:UIBarButtonItemStyleBordered target:self action:@selector(back)],
25+
[[UIBarButtonItem alloc] initWithTitle:@"Select" style:UIBarButtonItemStyleBordered target:self action:@selector(showSelector)],
26+
nil];
27+
28+
self.navigationItem.title = @"Slide away";
29+
}
30+
31+
- (void)back {
32+
[self.viewDeckController closeLeftView];
33+
[self.navigationController popViewControllerAnimated:YES];
2234
}
2335

36+
- (void)showSelector {
37+
[self.viewDeckController toggleLeftViewAnimated:YES];
38+
}
39+
40+
2441

2542
#pragma mark - Table view data source
2643

‎FoursExample/FoursExample.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
E22355191600B9D900A3EEFC /* CenterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E22355171600B9D900A3EEFC /* CenterViewController.xib */; };
2020
E223551D1600B9E900A3EEFC /* SideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E223551B1600B9E900A3EEFC /* SideViewController.m */; };
2121
E223551E1600B9E900A3EEFC /* SideViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E223551C1600B9E900A3EEFC /* SideViewController.xib */; };
22+
E2DAC33A16E7C0E8002BD487 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = E2DAC33916E7C0E8002BD487 /* [email protected] */; };
2223
/* End PBXBuildFile section */
2324

2425
/* Begin PBXFileReference section */
@@ -43,6 +44,7 @@
4344
E223551A1600B9E900A3EEFC /* SideViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SideViewController.h; sourceTree = "<group>"; };
4445
E223551B1600B9E900A3EEFC /* SideViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SideViewController.m; sourceTree = "<group>"; };
4546
E223551C1600B9E900A3EEFC /* SideViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SideViewController.xib; sourceTree = "<group>"; };
47+
E2DAC33916E7C0E8002BD487 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "../[email protected]"; sourceTree = "<group>"; };
4648
/* End PBXFileReference section */
4749

4850
/* Begin PBXFrameworksBuildPhase section */
@@ -63,6 +65,7 @@
6365
E22354E31600B65E00A3EEFC = {
6466
isa = PBXGroup;
6567
children = (
68+
E2DAC33916E7C0E8002BD487 /* [email protected] */,
6669
E20F7C0C16866367001BF2C3 /* QuartzCore.framework */,
6770
E22354F81600B65E00A3EEFC /* FoursExample */,
6871
E22354F11600B65E00A3EEFC /* Frameworks */,
@@ -190,6 +193,7 @@
190193
E22354FD1600B65E00A3EEFC /* InfoPlist.strings in Resources */,
191194
E22355191600B9D900A3EEFC /* CenterViewController.xib in Resources */,
192195
E223551E1600B9E900A3EEFC /* SideViewController.xib in Resources */,
196+
E2DAC33A16E7C0E8002BD487 /* [email protected] in Resources */,
193197
);
194198
runOnlyForDeploymentPostprocessing = 0;
195199
};

‎MultiViewDeckExample/MultiViewDeckExample.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
E267169A15569BA100E0C3C0 /* UITableViewCell+AutoDequeue.m in Sources */ = {isa = PBXBuildFile; fileRef = E267169915569BA100E0C3C0 /* UITableViewCell+AutoDequeue.m */; };
2626
E2B01A33155BE2D400E05FB9 /* ModalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2B01A31155BE2D300E05FB9 /* ModalViewController.m */; };
2727
E2B01A34155BE2D400E05FB9 /* ModalViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2B01A32155BE2D300E05FB9 /* ModalViewController.xib */; };
28+
E2DAC33C16E7C22D002BD487 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = E2DAC33B16E7C22D002BD487 /* [email protected] */; };
2829
/* End PBXBuildFile section */
2930

3031
/* Begin PBXFileReference section */
@@ -57,6 +58,7 @@
5758
E2B01A30155BE2D300E05FB9 /* ModalViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModalViewController.h; sourceTree = "<group>"; };
5859
E2B01A31155BE2D300E05FB9 /* ModalViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModalViewController.m; sourceTree = "<group>"; };
5960
E2B01A32155BE2D300E05FB9 /* ModalViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ModalViewController.xib; sourceTree = "<group>"; };
61+
E2DAC33B16E7C22D002BD487 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "../[email protected]"; sourceTree = "<group>"; };
6062
/* End PBXFileReference section */
6163

6264
/* Begin PBXFrameworksBuildPhase section */
@@ -77,6 +79,7 @@
7779
E26716561556946B00E0C3C0 = {
7880
isa = PBXGroup;
7981
children = (
82+
E2DAC33B16E7C22D002BD487 /* [email protected] */,
8083
E20F7C0A16862161001BF2C3 /* QuartzCore.framework */,
8184
E267166B1556946C00E0C3C0 /* MultiViewDeckExample */,
8285
E26716641556946C00E0C3C0 /* Frameworks */,
@@ -222,6 +225,7 @@
222225
E2671691155699AF00E0C3C0 /* CenterViewController.xib in Resources */,
223226
E267169615569A3800E0C3C0 /* BottomViewController.xib in Resources */,
224227
E2B01A34155BE2D400E05FB9 /* ModalViewController.xib in Resources */,
228+
E2DAC33C16E7C22D002BD487 /* [email protected] in Resources */,
225229
);
226230
runOnlyForDeploymentPostprocessing = 0;
227231
};

‎MultiViewDeckExample/MultiViewDeckExample/AppDelegate.m

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
2626
bottomController = [[UINavigationController alloc] initWithRootViewController:bottomController];
2727

2828
UIViewController *centerController = [[CenterViewController alloc] initWithNibName:@"CenterViewController" bundle:nil];
29-
centerController = [[UINavigationController alloc] initWithRootViewController:centerController];
29+
//centerController = [[UINavigationController alloc] initWithRootViewController:centerController];
3030

3131
IIViewDeckController* secondDeckController = [[IIViewDeckController alloc] initWithCenterViewController:leftController
3232
leftViewController:bottomController];
@@ -37,7 +37,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
3737
leftViewController:secondDeckController];
3838
deckController.delegateMode = IIViewDeckDelegateAndSubControllers;
3939

40-
self.window.rootViewController = deckController;
40+
UINavigationController* navController = [[UINavigationController alloc] initWithRootViewController:deckController];
41+
deckController.navigationControllerBehavior = IIViewDeckNavigationControllerIntegrated;
42+
self.window.rootViewController = navController;
4143
[self.window makeKeyAndVisible];
4244
return YES;
4345
}

‎MultiViewDeckExample/MultiViewDeckExample/ModalViewController.xib

+23-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
33
<data>
4-
<int key="IBDocument.SystemTarget">1296</int>
5-
<string key="IBDocument.SystemVersion">11D50b</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
7-
<string key="IBDocument.AppKitVersion">1138.32</string>
8-
<string key="IBDocument.HIToolboxVersion">568.00</string>
4+
<int key="IBDocument.SystemTarget">1552</int>
5+
<string key="IBDocument.SystemVersion">12C3006</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
7+
<string key="IBDocument.AppKitVersion">1187.34</string>
8+
<string key="IBDocument.HIToolboxVersion">625.00</string>
99
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1010
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
11-
<string key="NS.object.0">1181</string>
11+
<string key="NS.object.0">2083</string>
1212
</object>
1313
<array key="IBDocument.IntegratedClassDependencies">
14+
<string>IBProxyObject</string>
1415
<string>IBUIButton</string>
15-
<string>IBUIView</string>
1616
<string>IBUILabel</string>
17-
<string>IBProxyObject</string>
17+
<string>IBUIView</string>
1818
</array>
1919
<array key="IBDocument.PluginDependencies">
2020
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -42,6 +42,7 @@
4242
<string key="NSFrame">{{84, 271}, {152, 104}}</string>
4343
<reference key="NSSuperview" ref="191373211"/>
4444
<reference key="NSWindow"/>
45+
<reference key="NSNextKeyView"/>
4546
<string key="NSReuseIdentifierKey">_NS:9</string>
4647
<bool key="IBUIOpaque">NO</bool>
4748
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -88,6 +89,7 @@
8889
<object class="NSColor" key="IBUITextColor">
8990
<int key="NSColorSpace">1</int>
9091
<bytes key="NSRGB">MCAwIDAAA</bytes>
92+
<string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
9193
</object>
9294
<nil key="IBUIHighlightedColor"/>
9395
<int key="IBUIBaselineAdjustment">0</int>
@@ -199,6 +201,17 @@
199201
<object class="IBPartialClassDescription">
200202
<string key="className">ModalViewController</string>
201203
<string key="superclassName">UIViewController</string>
204+
<object class="NSMutableDictionary" key="actions">
205+
<string key="NS.key.0">closeMe:</string>
206+
<string key="NS.object.0">id</string>
207+
</object>
208+
<object class="NSMutableDictionary" key="actionInfosByName">
209+
<string key="NS.key.0">closeMe:</string>
210+
<object class="IBActionInfo" key="NS.object.0">
211+
<string key="name">closeMe:</string>
212+
<string key="candidateClassName">id</string>
213+
</object>
214+
</object>
202215
<object class="IBClassDescriptionSource" key="sourceIdentifier">
203216
<string key="majorKey">IBProjectSource</string>
204217
<string key="minorKey">./Classes/ModalViewController.h</string>
@@ -210,10 +223,10 @@
210223
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
211224
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
212225
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
213-
<real value="1296" key="NS.object.0"/>
226+
<real value="1552" key="NS.object.0"/>
214227
</object>
215228
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
216229
<int key="IBDocument.defaultPropertyAccessControl">3</int>
217-
<string key="IBCocoaTouchPluginVersion">1181</string>
230+
<string key="IBCocoaTouchPluginVersion">2083</string>
218231
</data>
219232
</archive>

‎NavigationExample/NavigationExample.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
E2CA7FB61576CCCE00408061 /* DeeperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2CA7FB41576CCCE00408061 /* DeeperViewController.m */; };
2828
E2CA7FB71576CCCE00408061 /* DeeperViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2CA7FB51576CCCE00408061 /* DeeperViewController.xib */; };
2929
E2CA7FBF1576DEFD00408061 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2CA7FBE1576DEFD00408061 /* MessageUI.framework */; };
30+
E2DAC32E16E7BF91002BD487 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = E2DAC32D16E7BF91002BD487 /* [email protected] */; };
3031
/* End PBXBuildFile section */
3132

3233
/* Begin PBXFileReference section */
@@ -61,6 +62,7 @@
6162
E2CA7FB41576CCCE00408061 /* DeeperViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeeperViewController.m; sourceTree = "<group>"; };
6263
E2CA7FB51576CCCE00408061 /* DeeperViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DeeperViewController.xib; sourceTree = "<group>"; };
6364
E2CA7FBE1576DEFD00408061 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
65+
E2DAC32D16E7BF91002BD487 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "../[email protected]"; sourceTree = "<group>"; };
6466
/* End PBXFileReference section */
6567

6668
/* Begin PBXFrameworksBuildPhase section */
@@ -82,6 +84,7 @@
8284
E27E513B15726C9F009D90EB = {
8385
isa = PBXGroup;
8486
children = (
87+
E2DAC32D16E7BF91002BD487 /* [email protected] */,
8588
E20F7C0E16866DF6001BF2C3 /* QuartzCore.framework */,
8689
E27E515015726C9F009D90EB /* NavigationExample */,
8790
E27E514915726C9F009D90EB /* Frameworks */,
@@ -223,6 +226,7 @@
223226
E2CA7FA71576C4E300408061 /* LeftViewController.xib in Resources */,
224227
E2CA7FB11576C50B00408061 /* RightViewController.xib in Resources */,
225228
E2CA7FB71576CCCE00408061 /* DeeperViewController.xib in Resources */,
229+
E2DAC32E16E7BF91002BD487 /* [email protected] in Resources */,
226230
);
227231
runOnlyForDeploymentPostprocessing = 0;
228232
};

‎NavigationExample/NavigationExample/CenterViewController.m

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ - (IBAction)goOnPressed:(id)sender {
5151
leftViewController:leftController
5252
rightViewController:rightController];
5353
deckController.navigationControllerBehavior = self.behavior;
54+
deckController.delegateMode = IIViewDeckDelegateAndSubControllers;
5455
controller = deckController;
5556
}
5657

0 commit comments

Comments
 (0)