mirror of
https://github.com/wnagrodzki/NGModalPresentation.git
synced 2025-04-04 19:42:15 +02:00
Adds SampleViewController and a button on main view controller to present it.
This commit is contained in:
parent
3bbad4be91
commit
43aa33c736
GPG key ID:
E9D0EB0302264569
5 changed files with 156 additions and 10 deletions
|
|
@ -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 = "<group>"; };
|
||||
2E4683C619DFE438001ECA2E /* ModalPresentationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ModalPresentationTests.m; sourceTree = "<group>"; };
|
||||
2E4683D019DFE60D001ECA2E /* SampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SampleViewController.h; sourceTree = "<group>"; };
|
||||
2E4683D119DFE60D001ECA2E /* SampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SampleViewController.m; sourceTree = "<group>"; };
|
||||
/* 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 = "<group>";
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
|
||||
<deployment defaultVersion="1792" identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--View Controller-->
|
||||
<scene sceneID="ufC-wZ-h7g">
|
||||
<objects>
|
||||
<viewController id="vXZ-lx-hvc" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
|
||||
<viewController id="vXZ-lx-hvc" customClass="ViewController" sceneMemberID="viewController">
|
||||
<layoutGuides>
|
||||
<viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/>
|
||||
<viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
|
||||
|
|
@ -15,7 +16,22 @@
|
|||
<view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ok9-dI-8dO">
|
||||
<rect key="frame" x="196" y="285" width="208" height="30"/>
|
||||
<state key="normal" title="Present Modal View Controller">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</state>
|
||||
<connections>
|
||||
<action selector="presentModalViewControllerButtonTapped:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="e9x-yb-lWU"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="centerY" secondItem="Ok9-dI-8dO" secondAttribute="centerY" id="Ikv-8c-xd3"/>
|
||||
<constraint firstAttribute="centerX" secondItem="Ok9-dI-8dO" secondAttribute="centerX" id="iLt-lf-dMg"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
|
||||
|
|
|
|||
26
ModalPresentation/SampleViewController.h
Normal file
26
ModalPresentation/SampleViewController.h
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
//
|
||||
// SampleViewController.h
|
||||
// ModalPresentation
|
||||
//
|
||||
// Created by Wojciech Nagrodzki on 04/10/2014.
|
||||
//
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
@class SampleViewController;
|
||||
|
||||
|
||||
@protocol SampleViewControllerDelegate <NSObject>
|
||||
|
||||
- (void)sampleViewControllerRequiredDismiss:(SampleViewController *)sampleViewController;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@interface SampleViewController : UIViewController
|
||||
|
||||
@property (strong, nonatomic) UIColor * viewBackgroundColor;
|
||||
@property (weak, nonatomic) id <SampleViewControllerDelegate> delegate;
|
||||
|
||||
@end
|
||||
89
ModalPresentation/SampleViewController.m
Normal file
89
ModalPresentation/SampleViewController.m
Normal file
|
|
@ -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
|
||||
|
|
@ -7,21 +7,30 @@
|
|||
//
|
||||
|
||||
#import "ViewController.h"
|
||||
#import "SampleViewController.h"
|
||||
|
||||
@interface ViewController ()
|
||||
|
||||
@interface ViewController () <SampleViewControllerDelegate>
|
||||
|
||||
@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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue