diff --git a/MVMCoreUI/BaseControllers/MFViewController.h b/MVMCoreUI/BaseControllers/MFViewController.h index 2653f172..5714125d 100644 --- a/MVMCoreUI/BaseControllers/MFViewController.h +++ b/MVMCoreUI/BaseControllers/MFViewController.h @@ -68,9 +68,6 @@ /* The bottom progress view that is shown in the shop flow */ @property (nullable, nonatomic, strong) UIProgressView *progressView; -// a flag that tells the view controller's view will appear not trying to load specaill support icon -@property (assign, nonatomic) BOOL DontChangeSpecialSupportIcon; - // The size of the previous screen configuration. Updates each rotate. @property (nonatomic) CGSize previousScreenSize; diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h index f57ac191..1cc1ec36 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h @@ -73,7 +73,7 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) { // reset drawers - (void)resetDrawers; -// contains speicaly logic to set the support icon color +// contains speicaly logic to set the icon color - (void)setNavigationIconColor:(nullable UIColor *)color; #pragma mark - Bottom Progress Bar @@ -97,9 +97,6 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) { // Provides the height of the detail view. + (CGFloat)getDetailViewHeight; -// Provides the width of the support view -+ (CGFloat)getSupportWidth; - // Provides the width of the main application view. + (CGFloat)getApplicationViewWidth; + (CGFloat)getApplicationViewMaxSize; diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m index 745330f3..617d1836 100644 --- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m +++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m @@ -284,7 +284,7 @@ CGFloat const PanelAnimationDuration = 0.2; self.mainViewCoverView.alpha = 0; self.mainViewLeading.constant = 0; - // If the support drawer should be extended, make sure it's extended. + // If the right drawer should be extended, make sure it's extended. if (checkingForOtherExtendedDrawers && self.rightPanelIsAccessible && [self shouldExtendRightPanel]) { void (^showRightPanel)(void) = [self getRightPanelShowAnimationBlock]; showRightPanel(); @@ -394,7 +394,7 @@ CGFloat const PanelAnimationDuration = 0.2; // No drawer is extended. return NO; } else { - // Extend support if the master panel isn't prioritized. + // Extend right if the left panel isn't prioritized. return self.prioritizedExtendedPanel != self.leftPanel; } } @@ -881,10 +881,6 @@ CGFloat const PanelAnimationDuration = 0.2; return CGRectGetHeight([self getBounds:[MVMCoreUISession sharedGlobal].splitViewController.mainView]); } -+ (CGFloat)getSupportWidth { - return CGRectGetWidth([MVMCoreUISession sharedGlobal].splitViewController.rightView.bounds); -} - + (CGFloat)getApplicationViewWidth { return CGRectGetWidth([self getBounds:[MVMCoreUISession sharedGlobal].splitViewController.view.superview]); }