From 1abc3e19af5922cde8e758bcc602fddefdffc354 Mon Sep 17 00:00:00 2001 From: doertydoerk Date: Sat, 10 Jan 2015 12:47:11 +0100 Subject: [PATCH] Minor changes to imporve conziseness and readebility - replace UI related code with storyboard capabilities to reduce amount of code - introduces IBAction to launch popup view - move code out of viewDidLoad: and into showPopupView:(UIButton *)sender for lazy instantiation - alted method and ivar naming - accessing ivars via self. as I figured it's pointless to have getter/setter for non-public ivars and then bypassing them --- Demo/.DS_Store | Bin 6148 -> 6148 bytes Demo/AFPopup-Demo.xcodeproj/project.pbxproj | 66 +++++------ .../xcshareddata/AFPopup-Demo.xccheckout | 41 +++++++ .../UserInterfaceState.xcuserstate | Bin 0 -> 13118 bytes .../WorkspaceSettings.xcsettings | 10 ++ .../xcschemes/AFPopup-Demo.xcscheme | 112 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 27 +++++ Demo/AFPopup-Demo/AFPopupView.h | 0 Demo/AFPopup-Demo/AFPopupView.m | 6 +- ...ewController.h => AFPopupViewController.h} | 2 +- ...ewController.m => AFPopupViewController.m} | 6 +- .../{Base.lproj => }/Main.storyboard | 19 ++- Demo/AFPopup-Demo/ViewController.h | 0 Demo/AFPopup-Demo/ViewController.m | 39 +++--- 14 files changed, 257 insertions(+), 71 deletions(-) create mode 100644 Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcshareddata/AFPopup-Demo.xccheckout create mode 100644 Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/WorkspaceSettings.xcsettings create mode 100644 Demo/AFPopup-Demo.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/AFPopup-Demo.xcscheme create mode 100644 Demo/AFPopup-Demo.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/xcschememanagement.plist mode change 100644 => 100755 Demo/AFPopup-Demo/AFPopupView.h mode change 100644 => 100755 Demo/AFPopup-Demo/AFPopupView.m rename Demo/AFPopup-Demo/{ModalTestViewController.h => AFPopupViewController.h} (80%) mode change 100644 => 100755 rename Demo/AFPopup-Demo/{ModalTestViewController.m => AFPopupViewController.m} (89%) mode change 100644 => 100755 rename Demo/AFPopup-Demo/{Base.lproj => }/Main.storyboard (87%) mode change 100644 => 100755 mode change 100644 => 100755 Demo/AFPopup-Demo/ViewController.h mode change 100644 => 100755 Demo/AFPopup-Demo/ViewController.m diff --git a/Demo/.DS_Store b/Demo/.DS_Store index 34e22ddc9da215765fa56cd2653c623792fbdcae..4df78a4ad54702af4dd3adf8a369532e42ea581c 100644 GIT binary patch delta 181 zcmZoMXfc=|#>B!ku~2NHo+2aH#(>?7iv?Ji7`Zm{FzsMu6q_8#EHQZ^vxrDex?yl~ zer^E+82mX3q!5z1`7SOgr6tJ>3>U5)=m4ugmQ2AZ$zPCxWGrLB<^#;`jGNgx_&I=% a+RVuEoq009h$9Ch0|OJt)XfnhYnTDfGA%g( delta 67 zcmZoMXfc=|#>B)qu~2NHo+2aL#(>?7jBJ~ESavXOKEmeAxUhkFGdl-A2T;joL5}at Vlles)IT(O|k%56_bA-qmW&lq>5552Z diff --git a/Demo/AFPopup-Demo.xcodeproj/project.pbxproj b/Demo/AFPopup-Demo.xcodeproj/project.pbxproj index 3b4798d..9059bd7 100644 --- a/Demo/AFPopup-Demo.xcodeproj/project.pbxproj +++ b/Demo/AFPopup-Demo.xcodeproj/project.pbxproj @@ -7,22 +7,22 @@ objects = { /* Begin PBXBuildFile section */ + 4370D3E21A614736003347A0 /* AFPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4370D3DC1A614736003347A0 /* AFPopupView.m */; }; + 4370D3E31A614736003347A0 /* AFPopupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4370D3DE1A614736003347A0 /* AFPopupViewController.m */; }; + 4370D3E41A614736003347A0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4370D3DF1A614736003347A0 /* Main.storyboard */; }; + 4370D3E51A614736003347A0 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4370D3E11A614736003347A0 /* ViewController.m */; }; A716C7C318CA28EF008FE0CA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A716C7C218CA28EF008FE0CA /* Foundation.framework */; }; A716C7C518CA28EF008FE0CA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A716C7C418CA28EF008FE0CA /* CoreGraphics.framework */; }; A716C7C718CA28EF008FE0CA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A716C7C618CA28EF008FE0CA /* UIKit.framework */; }; A716C7CD18CA28EF008FE0CA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A716C7CB18CA28EF008FE0CA /* InfoPlist.strings */; }; A716C7CF18CA28EF008FE0CA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A716C7CE18CA28EF008FE0CA /* main.m */; }; A716C7D318CA28EF008FE0CA /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A716C7D218CA28EF008FE0CA /* AppDelegate.m */; }; - A716C7D618CA28EF008FE0CA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A716C7D418CA28EF008FE0CA /* Main.storyboard */; }; - A716C7D918CA28EF008FE0CA /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A716C7D818CA28EF008FE0CA /* ViewController.m */; }; A716C7DB18CA28EF008FE0CA /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A716C7DA18CA28EF008FE0CA /* Images.xcassets */; }; A716C7E218CA28EF008FE0CA /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A716C7E118CA28EF008FE0CA /* XCTest.framework */; }; A716C7E318CA28EF008FE0CA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A716C7C218CA28EF008FE0CA /* Foundation.framework */; }; A716C7E418CA28EF008FE0CA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A716C7C618CA28EF008FE0CA /* UIKit.framework */; }; A716C7EC18CA28EF008FE0CA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A716C7EA18CA28EF008FE0CA /* InfoPlist.strings */; }; A716C7EE18CA28EF008FE0CA /* AFPopup_DemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A716C7ED18CA28EF008FE0CA /* AFPopup_DemoTests.m */; }; - A716C7F918CA290C008FE0CA /* AFPopupView.m in Sources */ = {isa = PBXBuildFile; fileRef = A716C7F818CA290C008FE0CA /* AFPopupView.m */; }; - A716C7FC18CA2E0B008FE0CA /* ModalTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A716C7FB18CA2E0B008FE0CA /* ModalTestViewController.m */; }; A716C7FE18CA30DD008FE0CA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A716C7FD18CA30DD008FE0CA /* QuartzCore.framework */; }; /* End PBXBuildFile section */ @@ -37,6 +37,13 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 4370D3DB1A614736003347A0 /* AFPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPopupView.h; sourceTree = ""; }; + 4370D3DC1A614736003347A0 /* AFPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFPopupView.m; sourceTree = ""; }; + 4370D3DD1A614736003347A0 /* AFPopupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPopupViewController.h; sourceTree = ""; }; + 4370D3DE1A614736003347A0 /* AFPopupViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFPopupViewController.m; sourceTree = ""; }; + 4370D3DF1A614736003347A0 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; + 4370D3E01A614736003347A0 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + 4370D3E11A614736003347A0 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; A716C7BF18CA28EF008FE0CA /* AFPopup-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "AFPopup-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; A716C7C218CA28EF008FE0CA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; A716C7C418CA28EF008FE0CA /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -47,19 +54,12 @@ A716C7D018CA28EF008FE0CA /* AFPopup-Demo-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AFPopup-Demo-Prefix.pch"; sourceTree = ""; }; A716C7D118CA28EF008FE0CA /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; A716C7D218CA28EF008FE0CA /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - A716C7D518CA28EF008FE0CA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - A716C7D718CA28EF008FE0CA /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - A716C7D818CA28EF008FE0CA /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; A716C7DA18CA28EF008FE0CA /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; A716C7E018CA28EF008FE0CA /* AFPopup-DemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AFPopup-DemoTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; A716C7E118CA28EF008FE0CA /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; A716C7E918CA28EF008FE0CA /* AFPopup-DemoTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "AFPopup-DemoTests-Info.plist"; sourceTree = ""; }; A716C7EB18CA28EF008FE0CA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; A716C7ED18CA28EF008FE0CA /* AFPopup_DemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AFPopup_DemoTests.m; sourceTree = ""; }; - A716C7F718CA290C008FE0CA /* AFPopupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPopupView.h; sourceTree = ""; }; - A716C7F818CA290C008FE0CA /* AFPopupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFPopupView.m; sourceTree = ""; }; - A716C7FA18CA2E0B008FE0CA /* ModalTestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModalTestViewController.h; sourceTree = ""; }; - A716C7FB18CA2E0B008FE0CA /* ModalTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModalTestViewController.m; sourceTree = ""; }; A716C7FD18CA30DD008FE0CA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -88,6 +88,17 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 4370D3E61A61473E003347A0 /* AFPopupView */ = { + isa = PBXGroup; + children = ( + 4370D3DB1A614736003347A0 /* AFPopupView.h */, + 4370D3DC1A614736003347A0 /* AFPopupView.m */, + 4370D3DD1A614736003347A0 /* AFPopupViewController.h */, + 4370D3DE1A614736003347A0 /* AFPopupViewController.m */, + ); + name = AFPopupView; + sourceTree = ""; + }; A716C7B618CA28EF008FE0CA = { isa = PBXGroup; children = ( @@ -122,16 +133,13 @@ A716C7C818CA28EF008FE0CA /* AFPopup-Demo */ = { isa = PBXGroup; children = ( + 4370D3E61A61473E003347A0 /* AFPopupView */, A716C7D118CA28EF008FE0CA /* AppDelegate.h */, A716C7D218CA28EF008FE0CA /* AppDelegate.m */, - A716C7D418CA28EF008FE0CA /* Main.storyboard */, - A716C7D718CA28EF008FE0CA /* ViewController.h */, - A716C7D818CA28EF008FE0CA /* ViewController.m */, - A716C7FA18CA2E0B008FE0CA /* ModalTestViewController.h */, - A716C7FB18CA2E0B008FE0CA /* ModalTestViewController.m */, - A716C7F718CA290C008FE0CA /* AFPopupView.h */, - A716C7F818CA290C008FE0CA /* AFPopupView.m */, + 4370D3E01A614736003347A0 /* ViewController.h */, + 4370D3E11A614736003347A0 /* ViewController.m */, A716C7DA18CA28EF008FE0CA /* Images.xcassets */, + 4370D3DF1A614736003347A0 /* Main.storyboard */, A716C7C918CA28EF008FE0CA /* Supporting Files */, ); path = "AFPopup-Demo"; @@ -210,7 +218,7 @@ A716C7B718CA28EF008FE0CA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0620; ORGANIZATIONNAME = AlvaroFranco; TargetAttributes = { A716C7DF18CA28EF008FE0CA = { @@ -242,9 +250,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 4370D3E41A614736003347A0 /* Main.storyboard in Resources */, A716C7DB18CA28EF008FE0CA /* Images.xcassets in Resources */, A716C7CD18CA28EF008FE0CA /* InfoPlist.strings in Resources */, - A716C7D618CA28EF008FE0CA /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -263,11 +271,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A716C7FC18CA2E0B008FE0CA /* ModalTestViewController.m in Sources */, - A716C7D918CA28EF008FE0CA /* ViewController.m in Sources */, + 4370D3E31A614736003347A0 /* AFPopupViewController.m in Sources */, A716C7D318CA28EF008FE0CA /* AppDelegate.m in Sources */, + 4370D3E21A614736003347A0 /* AFPopupView.m in Sources */, A716C7CF18CA28EF008FE0CA /* main.m in Sources */, - A716C7F918CA290C008FE0CA /* AFPopupView.m in Sources */, + 4370D3E51A614736003347A0 /* ViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -298,14 +306,6 @@ name = InfoPlist.strings; sourceTree = ""; }; - A716C7D418CA28EF008FE0CA /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - A716C7D518CA28EF008FE0CA /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; A716C7EA18CA28EF008FE0CA /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -321,7 +321,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -360,7 +359,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -418,7 +416,6 @@ A716C7F518CA28EF008FE0CA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/AFPopup-Demo.app/AFPopup-Demo"; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", @@ -441,7 +438,6 @@ A716C7F618CA28EF008FE0CA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/AFPopup-Demo.app/AFPopup-Demo"; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", diff --git a/Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcshareddata/AFPopup-Demo.xccheckout b/Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcshareddata/AFPopup-Demo.xccheckout new file mode 100644 index 0000000..cd4de2f --- /dev/null +++ b/Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcshareddata/AFPopup-Demo.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 5BC05E16-5BE9-4919-9C32-BE92FE4580FC + IDESourceControlProjectName + AFPopup-Demo + IDESourceControlProjectOriginsDictionary + + 1745EBB1907C464FC0B6A49705791565E07DD29D + https://github.com/doertydoerk/AFPopupView.git + + IDESourceControlProjectPath + Demo/AFPopup-Demo.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 1745EBB1907C464FC0B6A49705791565E07DD29D + ../../.. + + IDESourceControlProjectURL + https://github.com/doertydoerk/AFPopupView.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + 1745EBB1907C464FC0B6A49705791565E07DD29D + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 1745EBB1907C464FC0B6A49705791565E07DD29D + IDESourceControlWCCName + AFPopupView + + + + diff --git a/Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/UserInterfaceState.xcuserstate b/Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..a7fe97520d534886f5c6fb6091fd0529eca1b5a1 GIT binary patch literal 13118 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 C>N1G{ literal 0 HcmV?d00001 diff --git a/Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/WorkspaceSettings.xcsettings b/Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..659c876 --- /dev/null +++ b/Demo/AFPopup-Demo.xcodeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + + + diff --git a/Demo/AFPopup-Demo.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/AFPopup-Demo.xcscheme b/Demo/AFPopup-Demo.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/AFPopup-Demo.xcscheme new file mode 100644 index 0000000..6336e26 --- /dev/null +++ b/Demo/AFPopup-Demo.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/AFPopup-Demo.xcscheme @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Demo/AFPopup-Demo.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/xcschememanagement.plist b/Demo/AFPopup-Demo.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..0ab6f4b --- /dev/null +++ b/Demo/AFPopup-Demo.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + AFPopup-Demo.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + A716C7BE18CA28EF008FE0CA + + primary + + + A716C7DF18CA28EF008FE0CA + + primary + + + + + diff --git a/Demo/AFPopup-Demo/AFPopupView.h b/Demo/AFPopup-Demo/AFPopupView.h old mode 100644 new mode 100755 diff --git a/Demo/AFPopup-Demo/AFPopupView.m b/Demo/AFPopup-Demo/AFPopupView.m old mode 100644 new mode 100755 index 5701cf9..a526dad --- a/Demo/AFPopup-Demo/AFPopupView.m +++ b/Demo/AFPopup-Demo/AFPopupView.m @@ -92,7 +92,7 @@ -(void)show { _backgroundShadowView.alpha = 0.0; [rootView addSubview:self]; - _modalView.center = CGPointMake(self.frame.size.width/2.0, _modalView.frame.size.height * 1.5); + self.modalView.center = CGPointMake(self.frame.size.width/2.0, self.modalView.frame.size.height * 1.5); [UIView animateWithDuration:0.2 delay:0 @@ -120,7 +120,7 @@ -(void)show { [UIView animateWithDuration:0.4 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - _modalView.center = self.center; + self.modalView.center = self.center; } completion:^(BOOL finished) { @@ -134,7 +134,7 @@ -(void)hide { delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - _modalView.center = CGPointMake(self.frame.size.width/2.0, _modalView.frame.size.height * 1.5); + self.modalView.center = CGPointMake(self.frame.size.width/2.0, self.modalView.frame.size.height * 1.5); } completion:^(BOOL finished) { diff --git a/Demo/AFPopup-Demo/ModalTestViewController.h b/Demo/AFPopup-Demo/AFPopupViewController.h old mode 100644 new mode 100755 similarity index 80% rename from Demo/AFPopup-Demo/ModalTestViewController.h rename to Demo/AFPopup-Demo/AFPopupViewController.h index 58d5d07..67ea2da --- a/Demo/AFPopup-Demo/ModalTestViewController.h +++ b/Demo/AFPopup-Demo/AFPopupViewController.h @@ -8,7 +8,7 @@ #import -@interface ModalTestViewController : UIViewController +@interface AFPopupViewController : UIViewController -(IBAction)close:(id)sender; diff --git a/Demo/AFPopup-Demo/ModalTestViewController.m b/Demo/AFPopup-Demo/AFPopupViewController.m old mode 100644 new mode 100755 similarity index 89% rename from Demo/AFPopup-Demo/ModalTestViewController.m rename to Demo/AFPopup-Demo/AFPopupViewController.m index 9bffd12..5430384 --- a/Demo/AFPopup-Demo/ModalTestViewController.m +++ b/Demo/AFPopup-Demo/AFPopupViewController.m @@ -6,13 +6,13 @@ // Copyright (c) 2014 AlvaroFranco. All rights reserved. // -#import "ModalTestViewController.h" +#import "AFPopupViewController.h" -@interface ModalTestViewController () +@interface AFPopupViewController () @end -@implementation ModalTestViewController +@implementation AFPopupViewController - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { diff --git a/Demo/AFPopup-Demo/Base.lproj/Main.storyboard b/Demo/AFPopup-Demo/Main.storyboard old mode 100644 new mode 100755 similarity index 87% rename from Demo/AFPopup-Demo/Base.lproj/Main.storyboard rename to Demo/AFPopup-Demo/Main.storyboard index c1af01d..afdf185 --- a/Demo/AFPopup-Demo/Base.lproj/Main.storyboard +++ b/Demo/AFPopup-Demo/Main.storyboard @@ -1,7 +1,7 @@ - + - + @@ -18,16 +18,17 @@ \ No newline at end of file + diff --git a/Demo/AFPopup-Demo/ViewController.h b/Demo/AFPopup-Demo/ViewController.h old mode 100644 new mode 100755 diff --git a/Demo/AFPopup-Demo/ViewController.m b/Demo/AFPopup-Demo/ViewController.m old mode 100644 new mode 100755 index 15ba7d2..b677f23 --- a/Demo/AFPopup-Demo/ViewController.m +++ b/Demo/AFPopup-Demo/ViewController.m @@ -7,47 +7,48 @@ // #import "ViewController.h" -#import "ModalTestViewController.h" +#import "AFPopupViewController.h" #import "AFPopupView.h" @interface ViewController () -@property (nonatomic, strong) IBOutlet UIButton *toggleButton; -@property (nonatomic, strong) ModalTestViewController *modalTest; -@property (nonatomic, strong) AFPopupView *popup; +@property (nonatomic, strong) IBOutlet UIButton *showModalViewButton; +@property (nonatomic, strong) AFPopupViewController *modalVC; +@property (nonatomic, strong) AFPopupView *modalView; @end @implementation ViewController -(UIStatusBarStyle)preferredStatusBarStyle{ + return UIStatusBarStyleLightContent; } -(void)viewDidLoad { [super viewDidLoad]; - - UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:Nil]; - _modalTest = [storyboard instantiateViewControllerWithIdentifier:@"ModalTest"]; - - [_toggleButton addTarget:self action:@selector(go) forControlEvents:UIControlEventTouchUpInside]; - + [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(hide) name:@"HideAFPopup" object:nil]; } --(void)go { - - _popup = [AFPopupView popupWithView:_modalTest.view]; - [_popup show]; -} +- (IBAction)showPopupView:(UIButton *)sender { + // get reference to storyboard + UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:Nil]; --(void)hide { + // get instance of AFPopupViewController + self.modalVC = [storyboard instantiateViewControllerWithIdentifier:@"ModalTest"]; - [_popup hide]; + // get instance of AFPopupView and attach it to AFPopupViewController + self.modalView = [AFPopupView popupWithView:self.modalVC.view]; + + // present popup view + [self.modalView show]; } --(void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; +-(void)hide { + + // hide popup view + [self.modalView hide]; } @end