mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/legacy_survival_timer' into 'develop'

Browse Source 
expose collapse time for survival mode

See merge request BPHV_MIPS/mvm_core_ui!567
This commit is contained in:
Hedden, Kyle Matthew 2020-08-20 15:59:17 -04:00
commit bbf6abf070
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/TopAlert/MVMCoreUITopAlertExpandableView.h
View File

@ -26,6 +26,8 @@
// A flag for if the top alert expandable view should collapse automatically after being expanded // A flag for if the top alert expandable view should collapse automatically after being expanded
@property (nonatomic) BOOL collapseAutomaticallyAfterExpanded; @property (nonatomic) BOOL collapseAutomaticallyAfterExpanded;
@property (nonatomic) NSInteger collapseTime;
// Standard // Standard
- (nullable instancetype)initWithTopAlertObject:(nonnull MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nullable id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate viewToLayout:(nonnull UIView *)viewTolayout; - (nullable instancetype)initWithTopAlertObject:(nonnull MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nullable id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate viewToLayout:(nonnull UIView *)viewTolayout;

2
MVMCoreUI/TopAlert/MVMCoreUITopAlertExpandableView.m
View File

@ -32,8 +32,6 @@
@property (nullable, strong, nonatomic) NSLayoutConstraint *topConstraint; @property (nullable, strong, nonatomic) NSLayoutConstraint *topConstraint;
@property (nullable, strong, nonatomic) NSLayoutConstraint *shortViewHeight; @property (nullable, strong, nonatomic) NSLayoutConstraint *shortViewHeight;
@property (nonatomic) NSInteger collapseTime;
// Sets up the short view. // Sets up the short view.
- (void)setupTopMessage:(nullable NSString *)topMessage; - (void)setupTopMessage:(nullable NSString *)topMessage;