Merge branch 'feature/up_2_0' into 'develop'

Makes a property public to allow for adding padding to the button accessory view

See merge request BPHV_MIPS/mvm_core_ui!35

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.h

@@ -24,6 +24,7 @@
 @property (nullable, weak, nonatomic) UIView *viewInScroll;
 @property (nullable, weak, nonatomic) UIView *viewOutOfScroll;
 @property (nullable, strong, nonatomic) UIView *safeAreaView;
+@property (nullable, weak, nonatomic) ViewConstrainingView *bottomAccessoryView;
 
 // Set to overwrite which view is the top edge and/or bottom edge of the between view. must be added to the ui and constrained before buildViewsBetweenLabelsAndButtons.
 // Use these to create views that are pinned near the labels or buttons and are separate from any centered content. Add and set in buildInAdditionalViewsBeforeCenteredContent.

MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m

@@ -30,7 +30,6 @@
 @property (nullable, weak, nonatomic) NSArray *middleViews;
 
 @property (nullable, weak, nonatomic) UIView *betweenView;
-@property (nullable, weak, nonatomic) ViewConstrainingView *bottomAccessoryView;
 
 // Adds the button view to the screen. Out of the scroll or in.
 - (void)addViewOutsideOfScrollView:(UIView *)bottomView;