Merge branch 'develop' into feature/checkbox_update

MVMCoreUI.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -21,6 +21,7 @@
 		0A1B4A96233BB18F005B3FB4 /* CheckboxWithLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAFA2232BE63400FB8E22 /* CheckboxWithLabelView.swift */; };
 		0A41BA6E2344FCD400D4C0BC /* CATransaction+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A41BA6D2344FCD400D4C0BC /* CATransaction+Extension.swift */; };
 		0A7BAFA1232BE61800FB8E22 /* Checkbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */; };
+		9455B19C234F8A0400A574DB /* MVMAnimationFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */; };
 		948DB67E2326DCD90011F916 /* MultiProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948DB67D2326DCD90011F916 /* MultiProgress.swift */; };
 		B8200E152280C4CF007245F4 /* ProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8200E142280C4CF007245F4 /* ProgressBar.swift */; };
 		B8200E192281DC1A007245F4 /* CornerLabels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8200E182281DC1A007245F4 /* CornerLabels.swift */; };
@@ -153,7 +154,6 @@
 		D29DF2CB21E7BFCC003B2FB9 /* MFSizeThreshold.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF14721E68728003B2FB9 /* MFSizeThreshold.m */; };
 		D29DF2CE21E7C104003B2FB9 /* MFLoadingViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF2CC21E7C104003B2FB9 /* MFLoadingViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29DF2CF21E7C104003B2FB9 /* MFLoadingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF2CD21E7C104003B2FB9 /* MFLoadingViewController.m */; };
-		D29DF2D121E7C1C8003B2FB9 /* MVMAnimationFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D29DF2D021E7C1C8003B2FB9 /* MVMAnimationFramework.framework */; };
 		D29DF2E121E9240B003B2FB9 /* MVMCoreUIPanelProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF2E021E9240B003B2FB9 /* MVMCoreUIPanelProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29DF2EE21ECEADF003B2FB9 /* MFFonts.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF14D21E693AD003B2FB9 /* MFFonts.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29DF2EF21ECEAE1003B2FB9 /* MFFonts.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF14C21E693AD003B2FB9 /* MFFonts.m */; };
@@ -209,6 +209,7 @@
 		0A41BA6D2344FCD400D4C0BC /* CATransaction+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CATransaction+Extension.swift"; sourceTree = "<group>"; };
 		0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Checkbox.swift; sourceTree = "<group>"; };
 		0A7BAFA2232BE63400FB8E22 /* CheckboxWithLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxWithLabelView.swift; sourceTree = "<group>"; };
+		9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MVMAnimationFramework.framework; path = ../SharedFrameworks/MVMAnimationFramework.framework; sourceTree = "<group>"; };
 		948DB67D2326DCD90011F916 /* MultiProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiProgress.swift; sourceTree = "<group>"; };
 		B8200E142280C4CF007245F4 /* ProgressBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressBar.swift; sourceTree = "<group>"; };
 		B8200E182281DC1A007245F4 /* CornerLabels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CornerLabels.swift; sourceTree = "<group>"; };
@@ -345,7 +346,6 @@
 		D29DF2C321E7BF57003B2FB9 /* MFTabBarInteractor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFTabBarInteractor.m; sourceTree = "<group>"; };
 		D29DF2CC21E7C104003B2FB9 /* MFLoadingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLoadingViewController.h; sourceTree = "<group>"; };
 		D29DF2CD21E7C104003B2FB9 /* MFLoadingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLoadingViewController.m; sourceTree = "<group>"; };
-		D29DF2D021E7C1C8003B2FB9 /* MVMAnimationFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MVMAnimationFramework.framework; path = ../SharedFrameworks/MVMAnimationFramework.framework; sourceTree = "<group>"; };
 		D29DF2E021E9240B003B2FB9 /* MVMCoreUIPanelProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIPanelProtocol.h; sourceTree = "<group>"; };
 		D29DF31621ECECC0003B2FB9 /* NHaasGroteskDSStd-45Lt.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NHaasGroteskDSStd-45Lt.otf"; sourceTree = "<group>"; };
 		D29DF31721ECECC0003B2FB9 /* OCRAExtended.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = OCRAExtended.ttf; sourceTree = "<group>"; };
@@ -393,7 +393,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D29DF0E621E4F3C7003B2FB9 /* MVMCore.framework in Frameworks */,
-				D29DF2D121E7C1C8003B2FB9 /* MVMAnimationFramework.framework in Frameworks */,
+				9455B19C234F8A0400A574DB /* MVMAnimationFramework.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -538,8 +538,8 @@
 		D29DF0E421E4F3C7003B2FB9 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				D29DF2D021E7C1C8003B2FB9 /* MVMAnimationFramework.framework */,
 				D29DF0E521E4F3C7003B2FB9 /* MVMCore.framework */,
+				9455B19B234F8A0400A574DB /* MVMAnimationFramework.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -962,11 +962,12 @@
 					D29DF0CB21E404D4003B2FB9 = {
 						CreatedOnToolsVersion = 10.1;
 						LastSwiftMigration = 1010;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = D29DF0C621E404D4003B2FB9 /* Build configuration list for PBXProject "MVMCoreUI" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -1185,7 +1186,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1244,12 +1245,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1271,12 +1271,8 @@
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../SharedFrameworks";
 				INFOPLIST_FILE = MVMCoreUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.vzw.MVMCoreUI;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -1301,12 +1297,8 @@
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../SharedFrameworks";
 				INFOPLIST_FILE = MVMCoreUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.vzw.MVMCoreUI;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

MVMCoreUI/Atoms/TextFields/MFTextField.m

@@ -83,11 +83,9 @@
         self.enabled = YES;
         
         // Disable SmartQuotes
-        if (@available(iOS 11.0, *)) {
+        self.textField.smartQuotesType = UITextSmartQuotesTypeNo;
-            self.textField.smartQuotesType = UITextSmartQuotesTypeNo;
+        self.textField.smartDashesType = UITextSmartDashesTypeNo;
-            self.textField.smartDashesType = UITextSmartDashesTypeNo;
+        self.textField.smartInsertDeleteType = UITextSmartInsertDeleteTypeNo;
-            self.textField.smartInsertDeleteType = UITextSmartInsertDeleteTypeNo;
-        }
     }
 }
 

MVMCoreUI/Atoms/Views/MFTextView.m

@@ -173,11 +173,10 @@
     view.placeHolderLabel.textColor = [UIColor mfLightGrayColor];
     
     // Disable SmartQuotes
-    if (@available(iOS 11.0, *)) {
+    view.textView.smartQuotesType = UITextSmartQuotesTypeNo;
-        view.textView.smartQuotesType = UITextSmartQuotesTypeNo;
+    view.textView.smartDashesType = UITextSmartDashesTypeNo;
-        view.textView.smartDashesType = UITextSmartDashesTypeNo;
+    view.textView.smartInsertDeleteType = UITextSmartInsertDeleteTypeNo;
-        view.textView.smartInsertDeleteType = UITextSmartInsertDeleteTypeNo;
+    
-    }
     [view didSetFont:view.textView.font];
     view.hideBorder = YES;
     return view;

MVMCoreUI/Atoms/Views/MFView.m

@@ -48,9 +48,7 @@
 
 - (void)setAsMolecule {
     self.translatesAutoresizingMaskIntoConstraints = NO;
-    if (@available(iOS 11.0, *)) {
+    self.insetsLayoutMarginsFromSafeArea = NO;
-        self.insetsLayoutMarginsFromSafeArea = NO;
-    }
 }
 
 - (void)reset {

MVMCoreUI/BaseControllers/MFProgrammaticTableViewController.m

@@ -61,12 +61,8 @@
     tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     tableView.delegate = self;
     tableView.dataSource = self;
-    if (@available(iOS 11.0, *)) {
+    tableView.insetsContentViewsToSafeArea = NO;
-        tableView.insetsContentViewsToSafeArea = NO;
+    tableView.cellLayoutMarginsFollowReadableWidth = NO;
-    }
-    if ([tableView respondsToSelector:@selector(setCellLayoutMarginsFollowReadableWidth:)]) {
-        tableView.cellLayoutMarginsFollowReadableWidth = NO;
-    }
     return tableView;
 }
 

MVMCoreUI/BaseControllers/MFScrollingViewController.m

@@ -91,10 +91,7 @@ static NSTimeInterval const HandScrollAnimationTiming = 7.f;
 - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
     
-    BOOL automaticInset = NO;
+    BOOL automaticInset = self.navigationController && self.scrollView.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentAutomatic;
-    if (@available(iOS 11.0, *)) {
-        automaticInset = self.navigationController && self.scrollView.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentAutomatic;
-    }
     
     // Takes into account the navigation bar.
     if (!automaticInset && (self.edgesForExtendedLayout & UIRectEdgeTop)) {

MVMCoreUI/BaseControllers/MFViewController.m

@@ -527,6 +527,13 @@
     }
 }
 
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    if (self.selectedField) {
+        [self.selectedField resignFirstResponder];
+    }
+}
+
 - (void)dealloc {
     [self stopObservingForResponseJSONUpdates];
     MVMCoreLog(@"%@ deallocated", [[self class] description]);

MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift

@@ -190,13 +190,9 @@ open class ThreeLayerTableViewController: MFProgrammaticTableViewController {
             footerView.topAnchor.constraint(equalTo: tableView.bottomAnchor).isActive = true
             footerView.leftAnchor.constraint(equalTo: view.leftAnchor).isActive = true
             view.rightAnchor.constraint(equalTo: footerView.rightAnchor).isActive = true
-            if #available(iOS 11.0, *) {
+            view.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: footerView.bottomAnchor).isActive = true
-                view.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: footerView.bottomAnchor).isActive = true
+            safeAreaView = MVMCoreUICommonViewsUtility.getAndSetupSafeAreaView(on: view)
-                safeAreaView = MVMCoreUICommonViewsUtility.getAndSetupSafeAreaView(on: view)
+            safeAreaView?.backgroundColor = bottomView?.backgroundColor
-                safeAreaView?.backgroundColor = bottomView?.backgroundColor
-            } else {
-                view.bottomAnchor.constraint(equalTo: footerView.bottomAnchor).isActive = true
-            }
         } else {
             bottomConstraint?.isActive = true
             var y: CGFloat?

MVMCoreUI/BaseControllers/ThreeLayerViewController.swift

@@ -45,7 +45,7 @@ open class ThreeLayerViewController: ProgrammaticScrollViewController {
             return
         }
         
-        if #available(iOS 11.0, *), scrollView.contentInsetAdjustmentBehavior == UIScrollView.ContentInsetAdjustmentBehavior.automatic {
+        if scrollView.contentInsetAdjustmentBehavior == UIScrollView.ContentInsetAdjustmentBehavior.automatic {
             heightConstraint?.constant = -scrollView.adjustedContentInset.top - scrollView.adjustedContentInset.bottom
         } else {
             heightConstraint?.constant = -scrollView.contentInset.top - scrollView.contentInset.bottom
@@ -233,14 +233,10 @@ extension ThreeLayerViewController {
             view.topAnchor.constraint(equalTo: scrollView.bottomAnchor).isActive = true
             NSLayoutConstraint.pinViewLeft(toSuperview: view, useMargins: useMargins, constant: 0).isActive = true
             NSLayoutConstraint.pinViewRight(toSuperview: view, useMargins: useMargins, constant: 0).isActive = true
-            if #available(iOS 11.0, *) {
+            parentView.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
-                parentView.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true
+            if let safeAreaView = MVMCoreUICommonViewsUtility.getAndSetupSafeAreaView(on: parentView) {
-                if let safeAreaView = MVMCoreUICommonViewsUtility.getAndSetupSafeAreaView(on: parentView) {
+                safeAreaView.backgroundColor = bottomView?.backgroundColor
-                    safeAreaView.backgroundColor = bottomView?.backgroundColor
+                self.safeAreaView = safeAreaView
-                    self.safeAreaView = safeAreaView
-                }
-            } else {
-                NSLayoutConstraint.pinViewBottom(toSuperview: view, useMargins: useMargins, constant: 0).isActive = true
             }
         }
     }

MVMCoreUI/Containers/TabBarController/MVMCoreUITabBarPageControlViewController.m

@@ -283,16 +283,6 @@
     
     // So we will update titles.
     [self newDataBuildScreen];
-    
-    // Fix for right bar button item with custom view which disappears when user navigates to top tabbar page controller
-    if (@available(iOS 11.0, *)) {
-    } else {
-        NSMutableArray *buttonItems = [[NSMutableArray alloc] init];
-        UIBarButtonItem *space = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:self action:nil];
-        [buttonItems addObject:space];
-        [buttonItems addObjectsFromArray:self.navigationItem.rightBarButtonItems];
-        self.navigationItem.rightBarButtonItems = buttonItems;
-    }
 }
 
 - (void)viewWillDisappear:(BOOL)animated {

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsTableViewController.m

@@ -325,19 +325,13 @@
 			NSLayoutConstraint *bottomViewTop = [NSLayoutConstraint constraintWithItem:footerView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:tableView attribute:NSLayoutAttributeBottom multiplier:1 constant:0];
 			bottomViewTop.active = YES;
 			
-            NSLayoutConstraint *bottomViewBot = nil;
+            NSLayoutConstraint *bottomViewBot = [self.view.safeAreaLayoutGuide.bottomAnchor constraintEqualToAnchor:footerView.bottomAnchor];
-            if (@available(iOS 11.0, *)) {
+            bottomViewBot.priority = 900;
-                bottomViewBot = [self.view.safeAreaLayoutGuide.bottomAnchor constraintEqualToAnchor:footerView.bottomAnchor];
+            bottomViewBot.active = YES;
-                
+            
-                UIView *safeAreaView = [MVMCoreUICommonViewsUtility getAndSetupSafeAreaViewOnView:self.view];
+            UIView *safeAreaView = [MVMCoreUICommonViewsUtility getAndSetupSafeAreaViewOnView:self.view];
-                safeAreaView.backgroundColor = footerView.backgroundColor;
+            safeAreaView.backgroundColor = footerView.backgroundColor;
-                self.safeAreaView = safeAreaView;
+            self.safeAreaView = safeAreaView;
-            } else {
-                // Fallback on earlier versions
-                bottomViewBot = [NSLayoutConstraint constraintWithItem:self.view attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:footerView attribute:NSLayoutAttributeBottom multiplier:1 constant:0];
-            }
-			bottomViewBot.priority = 900;
-			bottomViewBot.active = YES;
 			
 			[NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-0-[footerView]-0@900-|" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(footerView)]];
 		} else {

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m

@@ -272,13 +272,8 @@
 - (void)updateViewConstraints {
     [super updateViewConstraints];
     
-    // Updates for ios 11
+    if (self.scrollView.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentAutomatic) {
-    if (@available(iOS 11.0, *)) {
+        self.heightConstraint.constant = -self.scrollView.adjustedContentInset.top - self.scrollView.adjustedContentInset.bottom;
-        if (self.scrollView.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentAutomatic) {
-            self.heightConstraint.constant = -self.scrollView.adjustedContentInset.top - self.scrollView.adjustedContentInset.bottom;
-        } else {
-            self.heightConstraint.constant = -self.scrollView.contentInset.top - self.scrollView.contentInset.bottom;
-        }
     } else {
         self.heightConstraint.constant = -self.scrollView.contentInset.top - self.scrollView.contentInset.bottom;
     }
@@ -322,17 +317,13 @@
     [self.view addSubview:bottomView];
     
     UIScrollView *scrollview = self.scrollView;
-    if (@available(iOS 11.0, *)) {
+    [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[scrollview]-0-[bottomView]" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(scrollview,bottomView)]];
-        [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[scrollview]-0-[bottomView]" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(scrollview,bottomView)]];
+    [self.view.safeAreaLayoutGuide.bottomAnchor constraintEqualToAnchor:bottomView.bottomAnchor].active = YES;
-        [self.view.safeAreaLayoutGuide.bottomAnchor constraintEqualToAnchor:bottomView.bottomAnchor].active = YES;
+    
-        
+    UIView *safeAreaView = [MVMCoreUICommonViewsUtility getAndSetupSafeAreaViewOnView:self.view];
-        UIView *safeAreaView = [MVMCoreUICommonViewsUtility getAndSetupSafeAreaViewOnView:self.view];
+    safeAreaView.backgroundColor = bottomView.backgroundColor;
-        safeAreaView.backgroundColor = bottomView.backgroundColor;
+    self.safeAreaView = safeAreaView;
-        self.safeAreaView = safeAreaView;
+    
-    } else {
-        // Fallback on earlier versions
-        [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[scrollview]-0-[bottomView]-0-|" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(scrollview,bottomView)]];
-    }
     [NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-0-[bottomView]-0@900-|" options:NSLayoutFormatDirectionLeadingToTrailing metrics:nil views:NSDictionaryOfVariableBindings(bottomView)]];
 }
 

MVMCoreUI/Molecules/Items/MoleculeCollectionViewCell.swift

@@ -37,11 +37,9 @@ open class MoleculeCollectionViewCell: UICollectionViewCell, MVMCoreUIMoleculeVi
         }
         isAccessibilityElement = false
         contentView.isAccessibilityElement = false
-        if #available(iOS 11.0, *) {
+        insetsLayoutMarginsFromSafeArea = false
-            insetsLayoutMarginsFromSafeArea = false
+        contentView.insetsLayoutMarginsFromSafeArea = false
-            contentView.insetsLayoutMarginsFromSafeArea = false
+        contentView.preservesSuperviewLayoutMargins = false
-            contentView.preservesSuperviewLayoutMargins = false
-        }
         
         // Covers the card when peaking.
         peakingCover.backgroundColor = .white

MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift

@@ -87,29 +87,16 @@ import UIKit
     // MARK: - MFViewProtocol
     public func updateView(_ size: CGFloat) {
         MFStyler.setMarginsFor(self, size: size, defaultHorizontal: updateViewHorizontalDefaults, top: topMarginPadding, bottom: bottomMarginPadding)
-        if #available(iOS 11.0, *) {
+        if accessoryView != nil {
-            if accessoryView != nil {
+            // Smaller left margin if accessory view.
-                // Smaller left margin if accessory view.
+            var margin = directionalLayoutMargins
-                var margin = directionalLayoutMargins
+            margin.trailing = 16
-                margin.trailing = 16
+            contentView.directionalLayoutMargins = margin
-                contentView.directionalLayoutMargins = margin
-            } else {
-                contentView.directionalLayoutMargins = directionalLayoutMargins
-            }
-            topSeparatorView?.setLeftAndRightPinConstant(directionalLayoutMargins.leading)
-            bottomSeparatorView?.setLeftAndRightPinConstant(directionalLayoutMargins.leading)
         } else {
-            if accessoryView != nil {
+            contentView.directionalLayoutMargins = directionalLayoutMargins
-                // Smaller left margin if accessory view.
-                var margin = layoutMargins
-                margin.right = 16
-                contentView.layoutMargins = margin
-            } else {
-                contentView.layoutMargins = layoutMargins
-            }
-            topSeparatorView?.setLeftAndRightPinConstant(layoutMargins.left)
-            bottomSeparatorView?.setLeftAndRightPinConstant(layoutMargins.left)
         }
+        topSeparatorView?.setLeftAndRightPinConstant(directionalLayoutMargins.leading)
+        bottomSeparatorView?.setLeftAndRightPinConstant(directionalLayoutMargins.leading)
         
         molecule?.updateView(size)
         if let _ = accessoryView, let caretView = caretView, let widthObject = caretViewWidthSizeObject, let heightObject = caretViewHeightSizeObject {
@@ -121,11 +108,9 @@ import UIKit
     
     public func setupView() {
         selectionStyle = .none
-        if #available(iOS 11.0, *) {
+        insetsLayoutMarginsFromSafeArea = false
-            insetsLayoutMarginsFromSafeArea = false
+        contentView.insetsLayoutMarginsFromSafeArea = false
-            contentView.insetsLayoutMarginsFromSafeArea = false
+        contentView.preservesSuperviewLayoutMargins = false
-            contentView.preservesSuperviewLayoutMargins = false
-        }
     }
     
     // MARK: - MVMCoreUIMoleculeViewProtocol

MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m

@@ -198,13 +198,8 @@ static const CGFloat VertialShadowOffset = 6;
             [view.rightAnchor constraintEqualToAnchor:button.rightAnchor constant:PaddingTwo].active = YES;
             [view.centerYAnchor constraintEqualToAnchor:button.centerYAnchor].active = YES;
         } else {
-            if (@available(iOS 11.0, *)) {
+            [button.topAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.topAnchor constant:PaddingOne].active = YES;
-                [button.topAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.topAnchor constant:PaddingOne].active = YES;
+            [view.safeAreaLayoutGuide.trailingAnchor constraintEqualToAnchor:button.trailingAnchor constant:PaddingTwo].active = YES;
-                [view.safeAreaLayoutGuide.trailingAnchor constraintEqualToAnchor:button.trailingAnchor constant:PaddingTwo].active = YES;
-            } else {
-                [NSLayoutConstraint constraintPinSubview:button pinTop:YES topConstant:PaddingOne pinBottom:NO bottomConstant:0 pinLeft:NO leftConstant:0 pinRight:YES rightConstant:PaddingTwo];
-            }
-            
         }
     }
     return button;
@@ -249,16 +244,12 @@ static const CGFloat VertialShadowOffset = 6;
 }
 
 + (nullable UIView *)getAndSetupSafeAreaViewOnView:(nonnull UIView *)view {
-    if (@available(iOS 11.0, *)) {
+    UIView *safeAreaView = [MVMCoreUICommonViewsUtility commonView];
-        UIView *safeAreaView = [MVMCoreUICommonViewsUtility commonView];
+    [view addSubview:safeAreaView];
-        [view addSubview:safeAreaView];
+    [safeAreaView.topAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.bottomAnchor].active = YES;
-        [safeAreaView.topAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.bottomAnchor].active = YES;
+    [view.bottomAnchor constraintEqualToAnchor:safeAreaView.bottomAnchor].active = YES;
-        [view.bottomAnchor constraintEqualToAnchor:safeAreaView.bottomAnchor].active = YES;
+    [NSLayoutConstraint constraintPinSubview:safeAreaView pinTop:NO topConstant:0 pinBottom:NO bottomConstant:0 pinLeft:YES leftConstant:0 pinRight:YES rightConstant:0];
-        [NSLayoutConstraint constraintPinSubview:safeAreaView pinTop:NO topConstant:0 pinBottom:NO bottomConstant:0 pinLeft:YES leftConstant:0 pinRight:YES rightConstant:0];
+    return safeAreaView;
-        return safeAreaView;
-    } else {
-        return nil;
-    }
 }
 
 #pragma mark - shadows

MVMCoreUI/Utility/MVMCoreUIUtility.m

@@ -58,21 +58,13 @@
 }
 
 + (UIEdgeInsets)getMarginsForView:(nullable UIView *)view {
-    if (@available(iOS 11.0, *)) {
+    return UIEdgeInsetsMake(view.directionalLayoutMargins.top, view.directionalLayoutMargins.leading, view.directionalLayoutMargins.bottom, view.directionalLayoutMargins.trailing);
-        return UIEdgeInsetsMake(view.directionalLayoutMargins.top, view.directionalLayoutMargins.leading, view.directionalLayoutMargins.bottom, view.directionalLayoutMargins.trailing);
-    } else {
-        return view.layoutMargins;
-    }
 }
 
 #pragma mark - Setters
 
 + (void)setMarginsForView:(nullable UIView *)view leading:(CGFloat)leading top:(CGFloat)top trailing:(CGFloat)trailing bottom:(CGFloat)bottom {
-    if (@available(iOS 11.0, *)) {
+    view.directionalLayoutMargins = NSDirectionalEdgeInsetsMake(top, leading, bottom, trailing);
-        view.directionalLayoutMargins = NSDirectionalEdgeInsetsMake(top, leading, bottom, trailing);
-    } else {
-        view.layoutMargins = UIEdgeInsetsMake(top, leading, bottom, trailing);
-    }
 }
 
 #pragma mark - Formatting
@@ -152,12 +144,9 @@
     CGFloat topInset = scrollview.contentInset.top;
     CGFloat bottomInset = scrollview.contentInset.bottom;
     
-    // Updates for ios 11
+    if (scrollview.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentAutomatic) {
-    if (@available(iOS 11.0, *)) {
+        topInset = scrollview.adjustedContentInset.top;
-        if (scrollview.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentAutomatic) {
+        bottomInset = scrollview.adjustedContentInset.bottom;
-            topInset = scrollview.adjustedContentInset.top;
-            bottomInset = scrollview.adjustedContentInset.bottom;
-        }
     }
     
     CGFloat remainingSpace = frameHeight - contentSizeHeight - topInset - bottomInset;