From 43aa33c736449bdd089e8e1b7e5c517cb9f46372 Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Sat, 4 Oct 2014 14:03:21 +0200 Subject: [PATCH] Adds SampleViewController and a button on main view controller to present it. --- ModalPresentation.xcodeproj/project.pbxproj | 6 ++ ModalPresentation/Base.lproj/Main.storyboard | 22 ++++- ModalPresentation/SampleViewController.h | 26 ++++++ ModalPresentation/SampleViewController.m | 89 ++++++++++++++++++++ ModalPresentation/ViewController.m | 23 +++-- 5 files changed, 156 insertions(+), 10 deletions(-) create mode 100644 ModalPresentation/SampleViewController.h create mode 100644 ModalPresentation/SampleViewController.m diff --git a/ModalPresentation.xcodeproj/project.pbxproj b/ModalPresentation.xcodeproj/project.pbxproj index e818d51..019466f 100644 --- a/ModalPresentation.xcodeproj/project.pbxproj +++ b/ModalPresentation.xcodeproj/project.pbxproj @@ -14,6 +14,7 @@ 2E4683B819DFE437001ECA2E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2E4683B719DFE437001ECA2E /* Images.xcassets */; }; 2E4683BB19DFE437001ECA2E /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2E4683B919DFE437001ECA2E /* LaunchScreen.xib */; }; 2E4683C719DFE438001ECA2E /* ModalPresentationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E4683C619DFE438001ECA2E /* ModalPresentationTests.m */; }; + 2E4683D219DFE60D001ECA2E /* SampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E4683D119DFE60D001ECA2E /* SampleViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -40,6 +41,8 @@ 2E4683C019DFE437001ECA2E /* ModalPresentationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ModalPresentationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 2E4683C519DFE438001ECA2E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 2E4683C619DFE438001ECA2E /* ModalPresentationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ModalPresentationTests.m; sourceTree = ""; }; + 2E4683D019DFE60D001ECA2E /* SampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SampleViewController.h; sourceTree = ""; }; + 2E4683D119DFE60D001ECA2E /* SampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SampleViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -89,6 +92,8 @@ 2E4683B719DFE437001ECA2E /* Images.xcassets */, 2E4683B919DFE437001ECA2E /* LaunchScreen.xib */, 2E4683AA19DFE437001ECA2E /* Supporting Files */, + 2E4683D019DFE60D001ECA2E /* SampleViewController.h */, + 2E4683D119DFE60D001ECA2E /* SampleViewController.m */, ); path = ModalPresentation; sourceTree = ""; @@ -220,6 +225,7 @@ files = ( 2E4683B319DFE437001ECA2E /* ViewController.m in Sources */, 2E4683B019DFE437001ECA2E /* AppDelegate.m in Sources */, + 2E4683D219DFE60D001ECA2E /* SampleViewController.m in Sources */, 2E4683AD19DFE437001ECA2E /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ModalPresentation/Base.lproj/Main.storyboard b/ModalPresentation/Base.lproj/Main.storyboard index d912f9d..1ee848c 100644 --- a/ModalPresentation/Base.lproj/Main.storyboard +++ b/ModalPresentation/Base.lproj/Main.storyboard @@ -1,13 +1,14 @@ - + - + + - + @@ -15,7 +16,22 @@ + + + + + + + diff --git a/ModalPresentation/SampleViewController.h b/ModalPresentation/SampleViewController.h new file mode 100644 index 0000000..aab1211 --- /dev/null +++ b/ModalPresentation/SampleViewController.h @@ -0,0 +1,26 @@ +// +// SampleViewController.h +// ModalPresentation +// +// Created by Wojciech Nagrodzki on 04/10/2014. +// +// + +#import + +@class SampleViewController; + + +@protocol SampleViewControllerDelegate + +- (void)sampleViewControllerRequiredDismiss:(SampleViewController *)sampleViewController; + +@end + + +@interface SampleViewController : UIViewController + +@property (strong, nonatomic) UIColor * viewBackgroundColor; +@property (weak, nonatomic) id delegate; + +@end diff --git a/ModalPresentation/SampleViewController.m b/ModalPresentation/SampleViewController.m new file mode 100644 index 0000000..2cdbe5b --- /dev/null +++ b/ModalPresentation/SampleViewController.m @@ -0,0 +1,89 @@ +// +// SampleViewController.m +// ModalPresentation +// +// Created by Wojciech Nagrodzki on 04/10/2014. +// +// + +#import "SampleViewController.h" + +@interface SampleViewController () + +@property (strong, nonatomic, readonly) UILabel * label; + +@end + +@implementation SampleViewController + +#pragma mark - Public Properties + +- (void)setViewBackgroundColor:(UIColor *)viewBackgroundColor +{ + _viewBackgroundColor = viewBackgroundColor; + self.view.backgroundColor = viewBackgroundColor; +} + +#pragma mark - Public Class Methods +#pragma mark - Public Instance Methods +#pragma mark - IBActions + +- (void)dismissButtonTapped:(UIButton *)sender +{ + [self.delegate sampleViewControllerRequiredDismiss:self]; +} + +#pragma mark - Overridden + +- (instancetype)init +{ + self = [super init]; + if (self) { + _viewBackgroundColor = [UIColor colorWithRed:0.1882 green:0.6431 blue:0.8667 alpha:1.0000]; + } + return self; +} + +- (void)loadView +{ + UIView * view = [[UIView alloc] init]; + + _label = [[UILabel alloc] init]; + _label.textAlignment = NSTextAlignmentCenter; + _label.numberOfLines = 0; + _label.translatesAutoresizingMaskIntoConstraints = NO; + [view addSubview:_label]; + + NSDictionary * views = NSDictionaryOfVariableBindings(_label); + [view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_label]|" options:0 metrics:nil views:views]]; + [view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_label]|" options:0 metrics:nil views:views]]; + + UIButton * button = [UIButton buttonWithType:UIButtonTypeSystem]; + [button setTitle:@"Dismiss" forState:UIControlStateNormal]; + [button addTarget:self action:@selector(dismissButtonTapped:) forControlEvents:UIControlEventTouchUpInside]; + button.translatesAutoresizingMaskIntoConstraints = NO; + [view addSubview:button]; + + views = NSDictionaryOfVariableBindings(button); + [view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:[button]-|" options:0 metrics:nil views:views]]; + [view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-32-[button]" options:0 metrics:nil views:views]]; + + self.view = view; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + + self.view.backgroundColor = self.viewBackgroundColor; + self.label.text = [NSString stringWithFormat:@"Sample View Controller\n" + @"Preferred Content Size: %@", NSStringFromCGSize(self.preferredContentSize)]; +} + +#pragma mark - Private Properties +#pragma mark - Private Class Methods +#pragma mark - Private Instance Methods +#pragma mark - Protocols +#pragma mark - Notifications + +@end diff --git a/ModalPresentation/ViewController.m b/ModalPresentation/ViewController.m index f38cd05..070b93a 100644 --- a/ModalPresentation/ViewController.m +++ b/ModalPresentation/ViewController.m @@ -7,21 +7,30 @@ // #import "ViewController.h" +#import "SampleViewController.h" -@interface ViewController () + +@interface ViewController () @end + @implementation ViewController -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. +#pragma mark - IBActions + +- (IBAction)presentModalViewControllerButtonTapped:(id)sender +{ + SampleViewController * sampleViewController = [[SampleViewController alloc] init]; + sampleViewController.delegate = self; + [self presentViewController:sampleViewController animated:YES completion:nil]; } -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. +#pragma mark - SampleViewControllerDelegate + +- (void)sampleViewControllerRequiredDismiss:(SampleViewController *)sampleViewController +{ + [self dismissViewControllerAnimated:YES completion:nil]; } @end