Merge branch 'feature/customeragreement_support' into 'develop'

Popup Widget

See merge request BPHV_MIPS/mvm_core_ui!109

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m

@@ -303,8 +303,9 @@
 }
 
 - (void)addViewToContentView:(UIView *)bottomView {
-    
-    self.bottomConstraint.active = YES;
+    if (![self bottomViewOutsideOfScroll]) {
+        self.bottomConstraint.active = YES;
+    }
     
     // Buttons will be at the bottom of the content view.
     [self.contentView addSubview:bottomView];

MVMCoreUI/SupportingFiles/Media.xcassets/closeXBlack.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "closeXBlack.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "closeXBlack@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "closeXBlack@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m

@@ -181,7 +181,7 @@ static const CGFloat VertialShadowOffset = 6;
 + (nonnull MFCustomButton *)addCloseButtonToView:(UIView *)view action:(ButtonTapBlock)actionBlock verticalCentered:(BOOL)verticalCentered {
     MFCustomButton *button = [[MFCustomButton alloc] initWithFrame:CGRectZero];
     button.translatesAutoresizingMaskIntoConstraints = NO;
-    [button setTitle:@"✕" forState:UIControlStateNormal];
+    [button setImage:[MVMCoreUIUtility imageNamed:@"closeXBlack"] forState:UIControlStateNormal];
     button.titleLabel.font = [MFStyler fontForHeadlineAlternative];
     
     //accessibility