From 7445362c65e2e1cfce821745161d72dce75754fc Mon Sep 17 00:00:00 2001 From: Krishna Achugatla Date: Tue, 25 Feb 2014 13:43:26 -0800 Subject: [PATCH 1/2] Fixed : When a side drawer is open, it should also be refreshed in addition to center drawer #225 --- .../MMDrawerControllerKitchenSink.xccheckout | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 KitchenSink/MMDrawerControllerKitchenSink.xcodeproj/project.xcworkspace/xcshareddata/MMDrawerControllerKitchenSink.xccheckout diff --git a/KitchenSink/MMDrawerControllerKitchenSink.xcodeproj/project.xcworkspace/xcshareddata/MMDrawerControllerKitchenSink.xccheckout b/KitchenSink/MMDrawerControllerKitchenSink.xcodeproj/project.xcworkspace/xcshareddata/MMDrawerControllerKitchenSink.xccheckout deleted file mode 100644 index 2bf4fcb5..00000000 --- a/KitchenSink/MMDrawerControllerKitchenSink.xcodeproj/project.xcworkspace/xcshareddata/MMDrawerControllerKitchenSink.xccheckout +++ /dev/null @@ -1,41 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - 88813EDE-C4BC-4EAD-BA3F-F5FC71109468 - IDESourceControlProjectName - MMDrawerControllerKitchenSink - IDESourceControlProjectOriginsDictionary - - C486FB0C-7803-4607-BCA9-799E743ECFBA - https://github.com/mutualmobile/MMDrawerController.git - - IDESourceControlProjectPath - KitchenSink/MMDrawerControllerKitchenSink.xcodeproj/project.xcworkspace - IDESourceControlProjectRelativeInstallPathDictionary - - C486FB0C-7803-4607-BCA9-799E743ECFBA - ../../.. - - IDESourceControlProjectURL - https://github.com/mutualmobile/MMDrawerController.git - IDESourceControlProjectVersion - 110 - IDESourceControlProjectWCCIdentifier - C486FB0C-7803-4607-BCA9-799E743ECFBA - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - C486FB0C-7803-4607-BCA9-799E743ECFBA - IDESourceControlWCCName - MMDrawerController-GitHub - - - - From 8bd82ecf6ef65495bf3e3c8bcb4407874f67e9c6 Mon Sep 17 00:00:00 2001 From: Krishna Achugatla Date: Tue, 25 Feb 2014 14:11:11 -0800 Subject: [PATCH 2/2] Fixed : When a side drawer is open, it should also be refreshed in addition to center drawer #225 --- MMDrawerController/MMDrawerController.m | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/MMDrawerController/MMDrawerController.m b/MMDrawerController/MMDrawerController.m index a516bf46..a1d3c527 100644 --- a/MMDrawerController/MMDrawerController.m +++ b/MMDrawerController/MMDrawerController.m @@ -674,22 +674,44 @@ - (void)viewDidLoad { -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; [self.centerViewController beginAppearanceTransition:YES animated:animated]; + + if(self.openSide == MMDrawerSideLeft) + { + [self.leftDrawerViewController beginAppearanceTransition:YES animated:animated]; + } + else if(self.openSide == MMDrawerSideRight) + { + [self.rightDrawerViewController beginAppearanceTransition:YES animated:animated]; + } } -(void)viewDidAppear:(BOOL)animated{ [super viewDidAppear:animated]; [self updateShadowForCenterView]; [self.centerViewController endAppearanceTransition]; + + if(self.openSide == MMDrawerSideLeft) + { + [self.leftDrawerViewController endAppearanceTransition]; + } + else if(self.openSide == MMDrawerSideRight) + { + [self.rightDrawerViewController endAppearanceTransition]; + } } -(void)viewWillDisappear:(BOOL)animated{ [super viewWillDisappear:animated]; [self.centerViewController beginAppearanceTransition:NO animated:animated]; + [self.leftDrawerViewController beginAppearanceTransition:NO animated:animated]; + [self.rightDrawerViewController beginAppearanceTransition:NO animated:animated]; } -(void)viewDidDisappear:(BOOL)animated{ [super viewDidDisappear:animated]; [self.centerViewController endAppearanceTransition]; + [self.leftDrawerViewController endAppearanceTransition]; + [self.rightDrawerViewController endAppearanceTransition]; } #pragma mark Rotation