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

Merge branch 'revert-0ed49c65' into 'develop'

Browse Source 
Revert "Merge branch 'feature/top_accessory' into 'develop'"

See merge request BPHV_MIPS/mvm_core_ui!177
This commit is contained in:
Pan, Xinlei (Ryan) 2019-11-15 16:54:13 -05:00
commit 9f8681f12f
4 changed files with 16 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.h
View File

@ -71,6 +71,4 @@
- (BOOL)bottomViewOutsideOfScroll; - (BOOL)bottomViewOutsideOfScroll;
//override for setting attributed headline and message //override for setting attributed headline and message
-(void)setHeadlineAndMessage; -(void)setHeadlineAndMessage;
- (nullable UIView *)topAccessoryView;
@end @end

43
MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m
View File

@ -31,7 +31,6 @@
@property (strong, nonatomic) UIView *footerViewOutsideOfScroll; @property (strong, nonatomic) UIView *footerViewOutsideOfScroll;
@property (strong, nonatomic) NSLayoutConstraint *bottomViewTopConstraint; @property (strong, nonatomic) NSLayoutConstraint *bottomViewTopConstraint;
@property (strong, nonatomic) UIView *headerAccessoryView; @property (strong, nonatomic) UIView *headerAccessoryView;
@property (strong, nonatomic) UIView *topAccessoryView;
@end @end
@ -71,9 +70,6 @@
} }
} }
- (nullable UIView *)topAccessoryView {
return nil;
}
- (void)newDataBuildScreen { - (void)newDataBuildScreen {
[super newDataBuildScreen]; [super newDataBuildScreen];
@ -96,10 +92,10 @@
[self setHeadlineAndMessage]; [self setHeadlineAndMessage];
self.topView = topLabelsView; self.topView = topLabelsView;
} }
// Setup accessory view. // Setup accessory view.
[self setUpHeaderAccessoryView]; [self setUpHeaderAccessoryView];
// add top view to table header // add top view to table header
if (self.topView) { if (self.topView) {
self.topView.translatesAutoresizingMaskIntoConstraints = NO; self.topView.translatesAutoresizingMaskIntoConstraints = NO;
@ -257,26 +253,16 @@
UIView *headerAccessoryView = self.headerAccessoryView; UIView *headerAccessoryView = self.headerAccessoryView;
[header addSubview:topView]; [header addSubview:topView];
[header addSubview:headerAccessoryView]; [header addSubview:headerAccessoryView];
UIView *topAccessoryView = [self topAccessoryView]; // Sets up the constraints
self.topAccessoryView = topAccessoryView; if (headerAccessoryView) {
if (topAccessoryView) { [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[topView]-0-[headerAccessoryView]" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(topView,headerAccessoryView)]];
[header addSubview:topAccessoryView]; [NSLayoutConstraint constraintPinSubview:topView pinTop:YES topConstant:0 pinBottom:NO bottomConstant:0 pinLeft:YES leftConstant:0 pinRight:YES rightConstant:0];
[NSLayoutConstraint constraintPinSubview:topAccessoryView pinTop:YES pinBottom:NO pinLeft:YES pinRight:YES]; self.topViewBottomConstraint = [[NSLayoutConstraint constraintPinSubview:headerAccessoryView pinTop:NO topConstant:0 pinBottom:YES bottomConstant:[[self spaceAboveBetweenView] floatValue] pinLeft:YES leftConstant:0 pinRight:YES rightConstant:0] objectForKey:ConstraintBot ofType:[NSLayoutConstraint class]];
[topAccessoryView.bottomAnchor constraintEqualToAnchor:topView.topAnchor constant:0].active = YES; }
} else {
self.topViewBottomConstraint = [[NSLayoutConstraint constraintPinSubview:topView pinTop:YES topConstant:0 pinBottom:YES bottomConstant:[[self spaceAboveBetweenView] floatValue] pinLeft:YES leftConstant:0 pinRight:YES rightConstant:0] objectForKey:ConstraintBot ofType:[NSLayoutConstraint class]];
BOOL topPin = topAccessoryView ? NO : YES; }
// Sets up the constraints
if (headerAccessoryView) {
[NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[topView]-0-[headerAccessoryView]" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(topView,headerAccessoryView)]];
[NSLayoutConstraint constraintPinSubview:topView pinTop:topPin topConstant:0 pinBottom:NO bottomConstant:0 pinLeft:YES leftConstant:0 pinRight:YES rightConstant:0];
self.topViewBottomConstraint = [[NSLayoutConstraint constraintPinSubview:headerAccessoryView pinTop:NO topConstant:0 pinBottom:YES bottomConstant:[[self spaceAboveBetweenView] floatValue] pinLeft:YES leftConstant:0 pinRight:YES rightConstant:0] objectForKey:ConstraintBot ofType:[NSLayoutConstraint class]];
}
else {
self.topViewBottomConstraint = [[NSLayoutConstraint constraintPinSubview:topView pinTop:topPin topConstant:0 pinBottom:YES bottomConstant:[[self spaceAboveBetweenView] floatValue] pinLeft:YES leftConstant:0 pinRight:YES rightConstant:0] objectForKey:ConstraintBot ofType:[NSLayoutConstraint class]];
}
self.headerView = header; self.headerView = header;
} }
@ -295,7 +281,6 @@
self.footerView = footer; self.footerView = footer;
} }
- (void)showHeader { - (void)showHeader {
if (self.headerView) { if (self.headerView) {
@ -474,10 +459,6 @@
#pragma mark - Animation #pragma mark - Animation
-(void)setupIntroAnimations { -(void)setupIntroAnimations {
if (self.topAccessoryView.subviews.count) {
[self.introAnimationManager addAnimationWithAnimation:[MVMAnimations fadeUpAnimationWithView:self.topAccessoryView]];
}
if (self.topView.subviews.count) { if (self.topView.subviews.count) {
[self.introAnimationManager addAnimationWithAnimation:[MVMAnimations fadeUpAnimationWithView:self.topView]]; [self.introAnimationManager addAnimationWithAnimation:[MVMAnimations fadeUpAnimationWithView:self.topView]];
} }

2
MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.h
View File

@ -38,8 +38,6 @@
#pragma mark - Subclass #pragma mark - Subclass
- (nullable UIView *)topAccessoryView;
// Allow you to add any additional ui before buildViewsBetweenLabelsAndButtons gets called. Can use this to set the topBetweenEdgeView or bottomBetweenEdgeView // Allow you to add any additional ui before buildViewsBetweenLabelsAndButtons gets called. Can use this to set the topBetweenEdgeView or bottomBetweenEdgeView
- (void)buildInAdditionalViewsBeforeCenteredContent; - (void)buildInAdditionalViewsBeforeCenteredContent;
// For subclassing. Should return all the views that will be in between labels and buttons. Override standardSpaceAroundUIObject to handle spacing. // For subclassing. Should return all the views that will be in between labels and buttons. Override standardSpaceAroundUIObject to handle spacing.

28
MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m
View File

@ -31,8 +31,6 @@
@property (nullable, weak, nonatomic) UIView *betweenView; @property (nullable, weak, nonatomic) UIView *betweenView;
@property (strong, nonatomic) UIView *topAccessoryView;
// Adds the button view to the screen. Out of the scroll or in. // Adds the button view to the screen. Out of the scroll or in.
- (void)addViewOutsideOfScrollView:(UIView *)bottomView; - (void)addViewOutsideOfScrollView:(UIView *)bottomView;
- (void)addViewToContentView:(UIView *)bottomView; - (void)addViewToContentView:(UIView *)bottomView;
@ -103,7 +101,7 @@
// Removes the bottom view out of scroll if it is there. // Removes the bottom view out of scroll if it is there.
[self.viewOutOfScroll removeFromSuperview]; [self.viewOutOfScroll removeFromSuperview];
[StackableViewController removeUIViews:[self.contentView subviews]]; [StackableViewController removeUIViews:[self.contentView subviews]];
// Checks if we are using a different object than top labels. // Checks if we are using a different object than top labels.
UIView *topView = [self useCustomViewInsteadOfLabels]; UIView *topView = [self useCustomViewInsteadOfLabels];
self.topView = topView; self.topView = topView;
@ -117,19 +115,9 @@
} }
[self.contentView addSubview:topView]; [self.contentView addSubview:topView];
[NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-0-[topView]-0-|" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(topView)]]; [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-0-[topView]-0-|" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(topView)]];
self.topConstraintForTopView = [NSLayoutConstraint constraintWithItem:topView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeTop multiplier:1.0 constant:0];
UIView *topAccessoryView = [self topAccessoryView];
self.topAccessoryView = topAccessoryView;
if (topAccessoryView) {
[self.contentView addSubview:topAccessoryView];
[NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-0-[topAccessoryView]-0-|" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(topAccessoryView)]];
self.topConstraintForTopView = [NSLayoutConstraint constraintWithItem:topAccessoryView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeTop multiplier:1.0 constant:0];
[topAccessoryView.bottomAnchor constraintEqualToAnchor:topView.topAnchor constant:0].active = YES;
} else {
self.topConstraintForTopView = [NSLayoutConstraint constraintWithItem:topView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeTop multiplier:1.0 constant:0];
}
self.topConstraintForTopView.active = YES; self.topConstraintForTopView.active = YES;
// Checks if we are using a different object than the bottom buttons. // Checks if we are using a different object than the bottom buttons.
UIView *bottomView = [self useCustomViewInsteadOfButtons]; UIView *bottomView = [self useCustomViewInsteadOfButtons];
self.customBottemView = (bottomView != nil); self.customBottemView = (bottomView != nil);
@ -278,10 +266,7 @@
if (self.topLabelsView) { if (self.topLabelsView) {
[self.topLabelsView setHeadlineString:[[self mapForTopLabels] stringForKey:KeyTitle] messageString:[[self mapForTopLabels] stringForKey:KeyMessage]]; [self.topLabelsView setHeadlineString:[[self mapForTopLabels] stringForKey:KeyTitle] messageString:[[self mapForTopLabels] stringForKey:KeyMessage]];
} }
}
- (nullable UIView *)topAccessoryView {
return nil;
} }
- (void)updateViewConstraints { - (void)updateViewConstraints {
@ -424,11 +409,6 @@
#pragma mark - Animations #pragma mark - Animations
-(void)setupIntroAnimations { -(void)setupIntroAnimations {
if (self.topAccessoryView.subviews.count) {
[self.introAnimationManager addAnimationWithAnimation:[MVMAnimations fadeUpAnimationWithView:self.topAccessoryView]];
}
if (self.topView.subviews) { if (self.topView.subviews) {
[self.introAnimationManager addAnimationWithAnimation:[MVMAnimations fadeUpAnimationWithView:self.topView]]; [self.introAnimationManager addAnimationWithAnimation:[MVMAnimations fadeUpAnimationWithView:self.topView]];
} }