mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

review comment update

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-06-02 15:59:26 -04:00
parent b95cb758c8
commit 31331ead2c
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationHandler.h
View File

@ -26,7 +26,7 @@
@property (nullable, weak, nonatomic) UINavigationController *navigationController; @property (nullable, weak, nonatomic) UINavigationController *navigationController;
/// A list of possible delegates looking for information. /// A list of possible delegates looking for information.
@property (nonnull, strong, nonatomic) NSHashTable <MVMCorePresentationDelegateProtocol>*delegates; @property (nonnull, strong, nonatomic) NSHashTable<MVMCorePresentationDelegateProtocol> *delegates;
// Will navigate appropriately based on the load style // Will navigate appropriately based on the load style
- (void)navigateWithLoadObject:(nullable MVMCoreLoadObject *)loadObject viewController:(nonnull UIViewController *)viewController delegate:(nullable NSObject<MVMCorePresentationDelegateProtocol>*)delegate completionHandler:(nullable void (^)(void))completionBlock; - (void)navigateWithLoadObject:(nullable MVMCoreLoadObject *)loadObject viewController:(nonnull UIViewController *)viewController delegate:(nullable NSObject<MVMCorePresentationDelegateProtocol>*)delegate completionHandler:(nullable void (^)(void))completionBlock;

6
MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationHandler.m
View File

@ -60,11 +60,7 @@
} }
- (void)removeDelegate:(nullable id <MVMCorePresentationDelegateProtocol>)delegate { - (void)removeDelegate:(nullable id <MVMCorePresentationDelegateProtocol>)delegate {
for (id currentDelegate in [self.delegates allObjects]) { [self.delegates removeObject:delegate];
if (currentDelegate == delegate) {
[self.delegates removeObject:delegate];
}
}
} }
#pragma mark - Navigation Helpers #pragma mark - Navigation Helpers

4
MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
View File

@ -237,7 +237,7 @@
if (self.delegate && [self.delegate respondsToSelector:@selector(navigationController:willDisplayViewController:)]) { if (self.delegate && [self.delegate respondsToSelector:@selector(navigationController:willDisplayViewController:)]) {
[self.delegate navigationController:navigationController willDisplayViewController:viewController]; [self.delegate navigationController:navigationController willDisplayViewController:viewController];
} }
for (NSObject <MVMCorePresentationDelegateProtocol>*delegate in [MVMCoreNavigationHandler sharedNavigationHandler].delegates.allObjects) { for (NSObject<MVMCorePresentationDelegateProtocol> *delegate in [MVMCoreNavigationHandler sharedNavigationHandler].delegates.allObjects) {
if (delegate && [delegate respondsToSelector:@selector(navigationController:willDisplayViewController:)]) { if (delegate && [delegate respondsToSelector:@selector(navigationController:willDisplayViewController:)]) {
[delegate navigationController:navigationController willDisplayViewController:viewController]; [delegate navigationController:navigationController willDisplayViewController:viewController];
} }
@ -249,7 +249,7 @@
if (self.delegate && [self.delegate respondsToSelector:@selector(navigationController:displayedViewController:)]) { if (self.delegate && [self.delegate respondsToSelector:@selector(navigationController:displayedViewController:)]) {
[self.delegate navigationController:navigationController displayedViewController:viewController]; [self.delegate navigationController:navigationController displayedViewController:viewController];
} }
for (NSObject <MVMCorePresentationDelegateProtocol>*delegate in [MVMCoreNavigationHandler sharedNavigationHandler].delegates.allObjects) { for (NSObject<MVMCorePresentationDelegateProtocol> *delegate in [MVMCoreNavigationHandler sharedNavigationHandler].delegates.allObjects) {
if (delegate && [delegate respondsToSelector:@selector(navigationController:displayedViewController:)]) { if (delegate && [delegate respondsToSelector:@selector(navigationController:displayedViewController:)]) {
[delegate navigationController:navigationController displayedViewController:viewController]; [delegate navigationController:navigationController displayedViewController:viewController];
} }

4
MVMCore/MVMCore/PresentationHandling/MVMCorePresentAnimationOperation.m
View File

@ -40,7 +40,7 @@
if (self.delegate && [self.delegate respondsToSelector:@selector(viewController:willPresentViewController:)]) { if (self.delegate && [self.delegate respondsToSelector:@selector(viewController:willPresentViewController:)]) {
[self.delegate viewController:self.presentingViewController willPresentViewController:self.presentedViewController]; [self.delegate viewController:self.presentingViewController willPresentViewController:self.presentedViewController];
} }
for (NSObject <MVMCorePresentationDelegateProtocol>*delegate in [MVMCoreNavigationHandler sharedNavigationHandler].delegates.allObjects) { for (NSObject<MVMCorePresentationDelegateProtocol> *delegate in [MVMCoreNavigationHandler sharedNavigationHandler].delegates.allObjects) {
if (delegate && [delegate respondsToSelector:@selector(viewController:willPresentViewController:)]) { if (delegate && [delegate respondsToSelector:@selector(viewController:willPresentViewController:)]) {
[delegate viewController:self.presentingViewController willPresentViewController:self.presentedViewController]; [delegate viewController:self.presentingViewController willPresentViewController:self.presentedViewController];
} }
@ -51,7 +51,7 @@
if (self.delegate && [self.delegate respondsToSelector:@selector(viewController:didPresentViewController:)]) { if (self.delegate && [self.delegate respondsToSelector:@selector(viewController:didPresentViewController:)]) {
[self.delegate viewController:self.presentingViewController didPresentViewController:self.presentedViewController]; [self.delegate viewController:self.presentingViewController didPresentViewController:self.presentedViewController];
} }
for (NSObject <MVMCorePresentationDelegateProtocol>*delegate in [MVMCoreNavigationHandler sharedNavigationHandler].delegates.allObjects) { for (NSObject<MVMCorePresentationDelegateProtocol> *delegate in [MVMCoreNavigationHandler sharedNavigationHandler].delegates.allObjects) {
if (delegate && [delegate respondsToSelector:@selector(viewController:didPresentViewController:)]) { if (delegate && [delegate respondsToSelector:@selector(viewController:didPresentViewController:)]) {
[delegate viewController:self.presentingViewController didPresentViewController:self.presentedViewController]; [delegate viewController:self.presentingViewController didPresentViewController:self.presentedViewController];
} }

6
MVMCore/MVMCore/PresentationHandling/MVMCorePresentationDelegateProtocol.h
View File

@ -37,10 +37,4 @@
// Called when a view controller did be present on another // Called when a view controller did be present on another
- (void)viewController:(nonnull UIViewController *)presentingViewController didPresentViewController:(nonnull UIViewController *)presentedViewController; - (void)viewController:(nonnull UIViewController *)presentingViewController didPresentViewController:(nonnull UIViewController *)presentedViewController;
// Called when a view controller will be dismissed off another view controller
- (void)willDismissViewController:(nonnull UIViewController *)viewController;
// Called when a view controller did dismiss
- (void)didDismissViewController:(nonnull UIViewController *)viewController;
@end @end