Merge branch 'develop' into feature/standardlistitemwithimage

MVMCoreUI/Atoms/Views/MFRadioButton.h

@@ -30,7 +30,6 @@ typedef void (^PerformActionForRadioButton)(void);
 @property (nullable, copy, nonatomic) PerformActionForRadioButton performActionForCheck;
 typedef void (^CircleSelectedClosure)(_Nonnull id sender);
 
-
 @property (nonatomic, strong, nullable)  UIColor*            fillColor;
 @property (nonatomic, strong, nullable)  UIColor*            borderColor;
 @property (nonatomic) CGFloat                                circleBorderWidth;
@@ -38,11 +37,16 @@ typedef void (^CircleSelectedClosure)(_Nonnull id sender);
 @property (nonatomic, copy, nullable)    CircleSelectedClosure handleSelectionBlock;
 @property (nonatomic) CGFloat circleDiameter;
 @property (nonatomic, nullable, strong, readonly) CAShapeLayer * myCircle;
-
+@property (nullable, weak, nonatomic) UIView *outerCircleView;
+@property (nullable, weak, nonatomic) UIView *innerCircleView;
 @property (nonatomic, strong, nullable) NSLayoutConstraint *heightConstraint;
 @property (nonatomic, strong, nullable) NSLayoutConstraint *widthConstraint;
 @property (nonatomic) BOOL respondsToTapGesture;
 @property (nonatomic, getter = isSelected) BOOL selected;
+@property (strong, nonatomic) NSLayoutConstraint *innerHeightConstarint;
+@property (strong, nonatomic) NSLayoutConstraint *innerWidthConstarint;
+@property (strong, nonatomic) NSLayoutConstraint *outerHeightConstarint;
+@property (strong, nonatomic) NSLayoutConstraint *outerWidthConstarint;
 
 // Set line width manually
 - (void)setCheckMarkLineWidth:(CGFloat)lineWidth;

MVMCoreUI/Atoms/Views/MFRadioButton.m

@@ -12,11 +12,6 @@
 static CGFloat const DefaultOuterCircleSize = 31;
 static CGFloat const DefaultInnerCircleSize = 19;
 
-@interface MFRadioButton ()
-@property (nullable, weak, nonatomic) UIView *outerCircleView;
-@property (nullable, weak, nonatomic) UIView *innerCircleView;
-@end
-
 
 @implementation MFRadioButton
 
@@ -64,9 +59,11 @@ static CGFloat const DefaultInnerCircleSize = 19;
         [outerCircleView.leftAnchor constraintEqualToAnchor:self.leftAnchor].active = YES;
         [outerCircleView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
         [outerCircleView.rightAnchor constraintEqualToAnchor:self.rightAnchor].active = YES;
-        
-        [outerCircleView.widthAnchor constraintEqualToConstant:DefaultOuterCircleSize].active = YES;
-        [outerCircleView.heightAnchor constraintEqualToConstant:DefaultOuterCircleSize].active = YES;
+
+        self.outerHeightConstarint = [outerCircleView.widthAnchor constraintEqualToConstant:DefaultOuterCircleSize];
+        self.outerHeightConstarint.active = YES;
+        self.outerWidthConstarint = [outerCircleView.heightAnchor constraintEqualToConstant:DefaultOuterCircleSize];
+        self.outerWidthConstarint.active = YES;
         
         UIView *innerCircleView = [[UIView alloc] init];
         [outerCircleView addSubview:innerCircleView];
@@ -76,8 +73,11 @@ static CGFloat const DefaultInnerCircleSize = 19;
         
         [innerCircleView.centerXAnchor constraintEqualToAnchor:outerCircleView.centerXAnchor].active = YES;
         [innerCircleView.centerYAnchor constraintEqualToAnchor:outerCircleView.centerYAnchor].active = YES;
-        [innerCircleView.widthAnchor constraintEqualToConstant:DefaultInnerCircleSize].active = YES;
-        [innerCircleView.heightAnchor constraintEqualToConstant:DefaultInnerCircleSize].active = YES;
+        
+        self.innerHeightConstarint = [innerCircleView.heightAnchor constraintEqualToConstant:DefaultInnerCircleSize];
+        self.innerHeightConstarint.active = YES;
+        self.innerWidthConstarint = [innerCircleView.widthAnchor constraintEqualToConstant:DefaultInnerCircleSize];
+        self.innerWidthConstarint.active = YES;
         
         outerCircleView.userInteractionEnabled = NO;
         innerCircleView.userInteractionEnabled = NO;

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