Merge branch 'release/7_1_0' into 'develop'

Release/7 1 0

See merge request BPHV_MIPS/mvm_core_ui!179

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.h

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

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m

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

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.h

@@ -38,6 +38,8 @@
 
 #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
 - (void)buildInAdditionalViewsBeforeCenteredContent;
 // For subclassing. Should return all the views that will be in between labels and buttons. Override standardSpaceAroundUIObject to handle spacing.

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m

@@ -31,6 +31,8 @@
 
 @property (nullable, weak, nonatomic) UIView *betweenView;
 
+@property (strong, nonatomic) UIView *topAccessoryView;
+
 // Adds the button view to the screen. Out of the scroll or in.
 - (void)addViewOutsideOfScrollView:(UIView *)bottomView;
 - (void)addViewToContentView:(UIView *)bottomView;
@@ -101,7 +103,7 @@
     // Removes the bottom view out of scroll if it is there.
     [self.viewOutOfScroll removeFromSuperview];
     [StackableViewController removeUIViews:[self.contentView subviews]];
-    
+
     // Checks if we are using a different object than top labels.
     UIView *topView = [self useCustomViewInsteadOfLabels];
     self.topView = topView;
@@ -115,9 +117,19 @@
     }
     [self.contentView addSubview: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;
-    
     // Checks if we are using a different object than the bottom buttons.
     UIView *bottomView = [self useCustomViewInsteadOfButtons];
     self.customBottemView = (bottomView != nil);
@@ -266,7 +278,10 @@
     if (self.topLabelsView) {
         [self.topLabelsView setHeadlineString:[[self mapForTopLabels] stringForKey:KeyTitle] messageString:[[self mapForTopLabels] stringForKey:KeyMessage]];
     }
-    
+}
+
+- (nullable UIView *)topAccessoryView {
+    return nil;
 }
 
 - (void)updateViewConstraints {
@@ -409,6 +424,11 @@
 
 #pragma mark - Animations
 -(void)setupIntroAnimations {
+    
+    if (self.topAccessoryView.subviews.count) {
+        [self.introAnimationManager addAnimationWithAnimation:[MVMAnimations fadeUpAnimationWithView:self.topAccessoryView]];
+    }
+    
     if (self.topView.subviews) {
         [self.introAnimationManager addAnimationWithAnimation:[MVMAnimations fadeUpAnimationWithView:self.topView]];
     }