Skip to content

Commit c03607a

Browse files
nephilimnephilim
committed
ncfz finished
1 parent d434c7a commit c03607a

File tree

8 files changed

+124
-122
lines changed

8 files changed

+124
-122
lines changed

‎nephilim/NavigationControllerFromZero/Classes/AppDelegate/NavigationControllerFromZeroAppDelegate.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
1919

2020
// Override point for customization after application launch.
2121
[[UIApplication sharedApplication] setStatusBarStyle: UIStatusBarStyleBlackTranslucent];
22-
rootViewController.wantsFullScreenLayout = YES;
22+
//rootViewController.wantsFullScreenLayout = YES;
2323

2424
/*
2525
CGRect frame = [[UIScreen mainScreen] applicationFrame];
2626
NSLog(@"(%f, %f) - w:%f, h:%f", frame.origin.x, frame.origin.y, frame.size.width, frame.size.width);
2727
[rootViewController.view setFrame:frame];
2828
*/
2929
[window addSubview: navigationController.view];
30-
[window makeKeyAndVisible];
30+
[window makeKeyAndVisible];
3131

3232
return YES;
3333
}

‎nephilim/NavigationControllerFromZero/Classes/Controllers/ViewController1.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@
1010

1111

1212
@interface ViewController1 : UIViewController {
13-
1413
}
1514

15+
16+
#pragma mark -
17+
#pragma mark 네비게이션 관련 flow처리 메서드
18+
19+
-(IBAction) pushNextViewController:(id)sender;
20+
1621
@end

‎nephilim/NavigationControllerFromZero/Classes/Controllers/ViewController1.m

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

99
#import "ViewController1.h"
10-
10+
#import "ViewController2.h"
1111

1212
@implementation ViewController1
1313

14+
#pragma mark -
15+
#pragma mark 네비게이션 관련 flow처리 메서드
16+
17+
-(IBAction) pushNextViewController:(id)sender
18+
{
19+
UIViewController* viewCtrller = [[ViewController2 alloc] initWithNibName:@"ViewController2"
20+
bundle:nil];
21+
[self.navigationController pushViewController:viewCtrller animated:YES];
22+
[viewCtrller release];
23+
}
24+
25+
1426
// The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
1527
/*
1628
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
@@ -22,12 +34,20 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
2234
}
2335
*/
2436

25-
/*
37+
2638
// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
2739
- (void)viewDidLoad {
2840
[super viewDidLoad];
41+
42+
UIBarButtonItem* nextBarBtn = [[UIBarButtonItem alloc]
43+
initWithTitle:@"to VC2"
44+
style:UIBarButtonItemStylePlain
45+
target:self
46+
action:@selector(pushNextViewController:)];
47+
self.navigationItem.rightBarButtonItem = nextBarBtn;
48+
[nextBarBtn release];
2949
}
30-
*/
50+
3151

3252
/*
3353
// Override to allow orientations other than the default portrait orientation.

‎nephilim/NavigationControllerFromZero/NavigationControllerFromZero.xcodeproj/project.pbxproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
1414
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
1515
28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; };
16+
392BC26513500BD2009AB99B /* ViewController2.m in Sources */ = {isa = PBXBuildFile; fileRef = 392BC26313500BD2009AB99B /* ViewController2.m */; };
17+
392BC26813500BE4009AB99B /* ViewController2.xib in Resources */ = {isa = PBXBuildFile; fileRef = 392BC26713500BE4009AB99B /* ViewController2.xib */; };
1618
39B90677134FF6D300ABADFD /* ViewController1.m in Sources */ = {isa = PBXBuildFile; fileRef = 39B90675134FF6D300ABADFD /* ViewController1.m */; };
1719
39B9067B134FF8BA00ABADFD /* ViewController1.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39B9067A134FF8BA00ABADFD /* ViewController1.xib */; };
1820
/* End PBXBuildFile section */
@@ -27,6 +29,9 @@
2729
28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
2830
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
2931
32CA4F630368D1EE00C91783 /* NavigationControllerFromZero_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationControllerFromZero_Prefix.pch; sourceTree = "<group>"; };
32+
392BC26213500BD2009AB99B /* ViewController2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController2.h; sourceTree = "<group>"; };
33+
392BC26313500BD2009AB99B /* ViewController2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController2.m; sourceTree = "<group>"; };
34+
392BC26713500BE4009AB99B /* ViewController2.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ViewController2.xib; sourceTree = "<group>"; };
3035
39B90674134FF6D300ABADFD /* ViewController1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController1.h; sourceTree = "<group>"; };
3136
39B90675134FF6D300ABADFD /* ViewController1.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController1.m; sourceTree = "<group>"; };
3237
39B9067A134FF8BA00ABADFD /* ViewController1.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ViewController1.xib; sourceTree = "<group>"; };
@@ -111,6 +116,7 @@
111116
3960877412A8D0470010120F /* NIBs */ = {
112117
isa = PBXGroup;
113118
children = (
119+
392BC26713500BE4009AB99B /* ViewController2.xib */,
114120
39B9067A134FF8BA00ABADFD /* ViewController1.xib */,
115121
28AD733E0D9D9553002E5188 /* MainWindow.xib */,
116122
);
@@ -159,6 +165,8 @@
159165
children = (
160166
39B90674134FF6D300ABADFD /* ViewController1.h */,
161167
39B90675134FF6D300ABADFD /* ViewController1.m */,
168+
392BC26213500BD2009AB99B /* ViewController2.h */,
169+
392BC26313500BD2009AB99B /* ViewController2.m */,
162170
);
163171
path = Controllers;
164172
sourceTree = "<group>";
@@ -214,6 +222,7 @@
214222
files = (
215223
28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */,
216224
39B9067B134FF8BA00ABADFD /* ViewController1.xib in Resources */,
225+
392BC26813500BE4009AB99B /* ViewController2.xib in Resources */,
217226
);
218227
runOnlyForDeploymentPostprocessing = 0;
219228
};
@@ -227,6 +236,7 @@
227236
1D60589B0D05DD56006BFB54 /* main.m in Sources */,
228237
1D3623260D0F684500981E51 /* NavigationControllerFromZeroAppDelegate.m in Sources */,
229238
39B90677134FF6D300ABADFD /* ViewController1.m in Sources */,
239+
392BC26513500BD2009AB99B /* ViewController2.m in Sources */,
230240
);
231241
runOnlyForDeploymentPostprocessing = 0;
232242
};

‎nephilim/NavigationControllerFromZero/Resources/NIBs/MainWindow.xib

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
</object>
1313
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
1414
<bool key="EncodedWithXMLCoder">YES</bool>
15-
<integer value="2"/>
1615
<integer value="12"/>
17-
<integer value="10"/>
1816
</object>
1917
<object class="NSArray" key="IBDocument.PluginDependencies">
2018
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -48,6 +46,7 @@
4846
<object class="NSPSMatrix" key="NSFrameMatrix"/>
4947
<string key="NSFrameSize">{320, 480}</string>
5048
<reference key="NSSuperview"/>
49+
<reference key="NSWindow"/>
5150
<object class="NSColor" key="IBUIBackgroundColor">
5251
<int key="NSColorSpace">1</int>
5352
<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -218,6 +217,7 @@
218217
<string>10.IBPluginDependency</string>
219218
<string>12.IBEditorWindowLastContentRect</string>
220219
<string>12.IBPluginDependency</string>
220+
<string>13.CustomClassName</string>
221221
<string>13.IBPluginDependency</string>
222222
<string>14.IBPluginDependency</string>
223223
<string>15.IBPluginDependency</string>
@@ -232,10 +232,11 @@
232232
<string>UIApplication</string>
233233
<string>UIResponder</string>
234234
<string>ViewController1</string>
235-
<string>{{53, 254}, {320, 480}}</string>
235+
<string>{{498, 64}, {320, 480}}</string>
236236
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
237237
<string>{{95, 114}, {320, 480}}</string>
238238
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
239+
<string>ViewController1</string>
239240
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
240241
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
241242
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -331,6 +332,17 @@
331332
<object class="IBPartialClassDescription">
332333
<string key="className">ViewController1</string>
333334
<string key="superclassName">UIViewController</string>
335+
<object class="NSMutableDictionary" key="actions">
336+
<string key="NS.key.0">pushNextViewController:</string>
337+
<string key="NS.object.0">id</string>
338+
</object>
339+
<object class="NSMutableDictionary" key="actionInfosByName">
340+
<string key="NS.key.0">pushNextViewController:</string>
341+
<object class="IBActionInfo" key="NS.object.0">
342+
<string key="name">pushNextViewController:</string>
343+
<string key="candidateClassName">id</string>
344+
</object>
345+
</object>
334346
<object class="IBClassDescriptionSource" key="sourceIdentifier">
335347
<string key="majorKey">IBProjectSource</string>
336348
<string key="minorKey">Classes/Controllers/ViewController1.h</string>

‎nephilim/NavigationControllerFromZero/Resources/NIBs/ViewController1.xib

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
<bool key="EncodedWithXMLCoder">YES</bool>
199199
<string>ViewController1</string>
200200
<string>UIResponder</string>
201-
<string>{{368, 163}, {314, 477}}</string>
201+
<string>{{461, 49}, {314, 477}}</string>
202202
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
203203
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
204204
<object class="NSAffineTransform">
@@ -230,14 +230,25 @@
230230
</object>
231231
</object>
232232
<nil key="sourceID"/>
233-
<int key="maxID">7</int>
233+
<int key="maxID">11</int>
234234
</object>
235235
<object class="IBClassDescriber" key="IBDocument.Classes">
236236
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
237237
<bool key="EncodedWithXMLCoder">YES</bool>
238238
<object class="IBPartialClassDescription">
239239
<string key="className">ViewController1</string>
240240
<string key="superclassName">UIViewController</string>
241+
<object class="NSMutableDictionary" key="actions">
242+
<string key="NS.key.0">pushNextViewController:</string>
243+
<string key="NS.object.0">id</string>
244+
</object>
245+
<object class="NSMutableDictionary" key="actionInfosByName">
246+
<string key="NS.key.0">pushNextViewController:</string>
247+
<object class="IBActionInfo" key="NS.object.0">
248+
<string key="name">pushNextViewController:</string>
249+
<string key="candidateClassName">id</string>
250+
</object>
251+
</object>
241252
<object class="IBClassDescriptionSource" key="sourceIdentifier">
242253
<string key="majorKey">IBProjectSource</string>
243254
<string key="minorKey">Classes/Controllers/ViewController1.h</string>

‎nephilim/ToDoolDo/ToDoolDo.xcodeproj/i015005.pbxuser

Lines changed: 33 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
7979
PBXFileTableDataSourceColumnWidthsKey = (
8080
20,
81-
938,
81+
773,
8282
20,
8383
48,
8484
43,
@@ -117,10 +117,12 @@
117117
PBXFileDataSource_Warnings_ColumnID,
118118
);
119119
};
120-
PBXPerProjectTemplateStateSaveDate = 323884338;
121-
PBXWorkspaceStateSaveDate = 323884338;
120+
PBXPerProjectTemplateStateSaveDate = 324031191;
121+
PBXWorkspaceStateSaveDate = 324031191;
122122
};
123123
perUserProjectItems = {
124+
392BC38A1351579A009AB99B /* PBXTextBookmark */ = 392BC38A1351579A009AB99B /* PBXTextBookmark */;
125+
392BC38B1351579A009AB99B /* PBXTextBookmark */ = 392BC38B1351579A009AB99B /* PBXTextBookmark */;
124126
39B48E731333BB7200CF1FA3 /* PlistBookmark */ = 39B48E731333BB7200CF1FA3 /* PlistBookmark */;
125127
39B48ED51333C76600CF1FA3 /* PBXBookmark */ = 39B48ED51333C76600CF1FA3 /* PBXBookmark */;
126128
39B48ED61333C76600CF1FA3 /* PBXBookmark */ = 39B48ED61333C76600CF1FA3 /* PBXBookmark */;
@@ -133,14 +135,10 @@
133135
39B49109133507AB00CF1FA3 /* PBXTextBookmark */ = 39B49109133507AB00CF1FA3 /* PBXTextBookmark */;
134136
39B491321335AE8100CF1FA3 /* PBXTextBookmark */ = 39B491321335AE8100CF1FA3 /* PBXTextBookmark */;
135137
39B491341335AE8100CF1FA3 /* PBXTextBookmark */ = 39B491341335AE8100CF1FA3 /* PBXTextBookmark */;
136-
39B905A0134E172E00ABADFD /* PBXBookmark */ = 39B905A0134E172E00ABADFD /* PBXBookmark */;
137138
39B905D4134F47EE00ABADFD /* PBXTextBookmark */ = 39B905D4134F47EE00ABADFD /* PBXTextBookmark */;
138139
39B905D5134F47EE00ABADFD /* PBXTextBookmark */ = 39B905D5134F47EE00ABADFD /* PBXTextBookmark */;
139140
39B905D6134F47EE00ABADFD /* PBXTextBookmark */ = 39B905D6134F47EE00ABADFD /* PBXTextBookmark */;
140141
39B905D7134F47EE00ABADFD /* PBXTextBookmark */ = 39B905D7134F47EE00ABADFD /* PBXTextBookmark */;
141-
39B905D8134F47EE00ABADFD /* PBXTextBookmark */ = 39B905D8134F47EE00ABADFD /* PBXTextBookmark */;
142-
39B905D9134F47EE00ABADFD /* PBXTextBookmark */ = 39B905D9134F47EE00ABADFD /* PBXTextBookmark */;
143-
39B905DC134F47EE00ABADFD /* PBXTextBookmark */ = 39B905DC134F47EE00ABADFD /* PBXTextBookmark */;
144142
};
145143
sourceControlManager = 396086CE12A8C7F30010120F /* Source Control */;
146144
userBuildSettings = {
@@ -161,6 +159,26 @@
161159
sepNavVisRange = "{0, 185}";
162160
};
163161
};
162+
392BC38A1351579A009AB99B /* PBXTextBookmark */ = {
163+
isa = PBXTextBookmark;
164+
fRef = 39B415A61333AE1400264E95 /* TodoTableView.m */;
165+
name = "TodoTableView.m: 167";
166+
rLen = 0;
167+
rLoc = 4991;
168+
rType = 0;
169+
vrLen = 539;
170+
vrLoc = 4863;
171+
};
172+
392BC38B1351579A009AB99B /* PBXTextBookmark */ = {
173+
isa = PBXTextBookmark;
174+
fRef = 39B415A61333AE1400264E95 /* TodoTableView.m */;
175+
name = "TodoTableView.m: 167";
176+
rLen = 0;
177+
rLoc = 4991;
178+
rType = 0;
179+
vrLen = 539;
180+
vrLoc = 4863;
181+
};
164182
396086C612A8C7D50010120F /* ToDoolDo */ = {
165183
isa = PBXExecutable;
166184
activeArgIndices = (
@@ -214,10 +232,10 @@
214232
39B415A61333AE1400264E95 /* TodoTableView.m */ = {
215233
uiCtxt = {
216234
sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{4664, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{4715, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{4765, 12}\";\n s = 1;\n }\n );\n r = \"{0, 5496}\";\n s = 0;\n}";
217-
sepNavIntBoundsRect = "{{0, 0}, {1178, 3618}}";
218-
sepNavSelRange = "{3035, 0}";
219-
sepNavVisRange = "{1348, 1422}";
220-
sepNavWindowFrame = "{{810, -69}, {1237, 778}}";
235+
sepNavIntBoundsRect = "{{0, 0}, {1640, 5427}}";
236+
sepNavSelRange = "{4934, 0}";
237+
sepNavVisRange = "{4806, 539}";
238+
sepNavWindowFrame = "{{43, 0}, {1237, 778}}";
221239
};
222240
};
223241
39B48E731333BB7200CF1FA3 /* PlistBookmark */ = {
@@ -277,10 +295,10 @@
277295
};
278296
39B48F201334498700CF1FA3 /* TodoItemRegistry.m */ = {
279297
uiCtxt = {
280-
sepNavIntBoundsRect = "{{0, 0}, {1116, 1422}}";
281-
sepNavSelRange = "{1784, 0}";
282-
sepNavVisRange = "{640, 1513}";
283-
sepNavWindowFrame = "{{0, 0}, {1237, 778}}";
298+
sepNavIntBoundsRect = "{{0, 0}, {1178, 2291}}";
299+
sepNavSelRange = "{1880, 0}";
300+
sepNavVisRange = "{1298, 847}";
301+
sepNavWindowFrame = "{{43, 0}, {1237, 778}}";
284302
};
285303
};
286304
39B48F701334688A00CF1FA3 /* PBXTextBookmark */ = {
@@ -350,10 +368,6 @@
350368
vrLen = 455;
351369
vrLoc = 0;
352370
};
353-
39B905A0134E172E00ABADFD /* PBXBookmark */ = {
354-
isa = PBXBookmark;
355-
fRef = 39B415A61333AE1400264E95 /* TodoTableView.m */;
356-
};
357371
39B905D4134F47EE00ABADFD /* PBXTextBookmark */ = {
358372
isa = PBXTextBookmark;
359373
fRef = 39B48F201334498700CF1FA3 /* TodoItemRegistry.m */;
@@ -394,36 +408,6 @@
394408
vrLen = 455;
395409
vrLoc = 34;
396410
};
397-
39B905D8134F47EE00ABADFD /* PBXTextBookmark */ = {
398-
isa = PBXTextBookmark;
399-
fRef = 39B415A61333AE1400264E95 /* TodoTableView.m */;
400-
name = "TodoTableView.m: 11";
401-
rLen = 0;
402-
rLoc = 216;
403-
rType = 0;
404-
vrLen = 871;
405-
vrLoc = 1051;
406-
};
407-
39B905D9134F47EE00ABADFD /* PBXTextBookmark */ = {
408-
isa = PBXTextBookmark;
409-
fRef = 39B415A61333AE1400264E95 /* TodoTableView.m */;
410-
name = "TodoTableView.m: 73";
411-
rLen = 5;
412-
rLoc = 1756;
413-
rType = 0;
414-
vrLen = 691;
415-
vrLoc = 654;
416-
};
417-
39B905DC134F47EE00ABADFD /* PBXTextBookmark */ = {
418-
isa = PBXTextBookmark;
419-
fRef = 39B415A61333AE1400264E95 /* TodoTableView.m */;
420-
name = "TodoTableView.m: 108";
421-
rLen = 0;
422-
rLoc = 3035;
423-
rType = 0;
424-
vrLen = 1422;
425-
vrLoc = 1348;
426-
};
427411
8D1107310486CEB800E47090 /* ToDoolDo-Info.plist */ = {
428412
uiCtxt = {
429413
sepNavWindowFrame = "{{15, 43}, {1203, 735}}";

0 commit comments

Comments
 (0)