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

Merge pull request #42 in BPHVB/mvm_core from feature/vzup_top_alert to develop

Browse Source 
* commit '90f849397d56f34aa2367a4b9bf7e0aaffa331e6':
  top alert above text image
This commit is contained in:
Sommer, Patrick 2018-12-12 11:36:32 -05:00
commit 34b589e481
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.h
View File

@ -38,8 +38,9 @@ extern NSUInteger const TopAlertDismissTime;
// The page type used for the top alert // The page type used for the top alert
@property (nullable, strong, nonatomic) NSString *pageType; @property (nullable, strong, nonatomic) NSString *pageType;
// image name or url used when iconView is an image // image name or url used imageviews
@property (nullable, strong, nonatomic) NSString *imageNameOrURL; @property (nullable, strong, nonatomic) NSString *imageNameOrURL;
@property (nullable, strong, nonatomic) NSString *aboveTextImageString;
// If 0, uses default 5 seconds. // If 0, uses default 5 seconds.
@property (nonatomic) NSInteger topAlertDismissTime; @property (nonatomic) NSInteger topAlertDismissTime;

1
MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.m
View File

@ -28,6 +28,7 @@ NSUInteger const TopAlertDismissTime = 5;
self.buttonMap = [responseInfo dict:KeyButtonMap]; self.buttonMap = [responseInfo dict:KeyButtonMap];
self.topMessage = [responseInfo string:KeyTopMessage]; self.topMessage = [responseInfo string:KeyTopMessage];
self.imageNameOrURL = [responseInfo string:@"topAlertImageUrl"]; self.imageNameOrURL = [responseInfo string:@"topAlertImageUrl"];
self.aboveTextImageString = [responseInfo string:@"topAlertImageURLAboveText"];
NSString *color = [responseInfo string:@"topAlertColor"]; NSString *color = [responseInfo string:@"topAlertColor"];
if (color) { if (color) {