summaryrefslogtreecommitdiff
path: root/Example Apps
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2018-10-22 10:55:32 -0400
committerJoel Fischer <joeljfischer@gmail.com>2018-10-22 10:55:32 -0400
commit5fb11d6491de4444978518f43e3554ac6b1c812d (patch)
tree61648fa000c698a89866f2b6a296ee19ec39995e /Example Apps
parentb2c93017a2e4a31da668e63e4baf883a9abe5d97 (diff)
downloadsdl_ios-5fb11d6491de4444978518f43e3554ac6b1c812d.tar.gz
Add menu handling for icon artwork
* Many fixes to artwork uploads
Diffstat (limited to 'Example Apps')
-rw-r--r--Example Apps/Example ObjC/ButtonManager.m2
-rw-r--r--Example Apps/Example ObjC/PerformInteractionManager.m2
2 files changed, 2 insertions, 2 deletions
diff --git a/Example Apps/Example ObjC/ButtonManager.m b/Example Apps/Example ObjC/ButtonManager.m
index 9c7a0779f..786d5027b 100644
--- a/Example Apps/Example ObjC/ButtonManager.m
+++ b/Example Apps/Example ObjC/ButtonManager.m
@@ -73,7 +73,7 @@ NS_ASSUME_NONNULL_BEGIN
}
- (SDLSoftButtonObject *)sdlex_softButtonAlertWithManager:(SDLManager *)manager {
- SDLSoftButtonState *alertImageAndTextState = [[SDLSoftButtonState alloc] initWithStateName:AlertSoftButtonImageState text:AlertSoftButtonText image:[[UIImage imageNamed:AlertBWIconName] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]];
+ SDLSoftButtonState *alertImageAndTextState = [[SDLSoftButtonState alloc] initWithStateName:AlertSoftButtonImageState text:AlertSoftButtonText artwork:[SDLArtwork artworkWithImage:[[UIImage imageNamed:CarBWIconImageName] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] asImageFormat:SDLArtworkImageFormatPNG]];
SDLSoftButtonState *alertTextState = [[SDLSoftButtonState alloc] initWithStateName:AlertSoftButtonTextState text:AlertSoftButtonText image:nil];
__weak typeof(self) weakself = self;
diff --git a/Example Apps/Example ObjC/PerformInteractionManager.m b/Example Apps/Example ObjC/PerformInteractionManager.m
index 82c8a6535..ea4c42503 100644
--- a/Example Apps/Example ObjC/PerformInteractionManager.m
+++ b/Example Apps/Example ObjC/PerformInteractionManager.m
@@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
}
- (NSArray<SDLChoiceCell *> *)cells {
- SDLChoiceCell *firstChoice = [[SDLChoiceCell alloc] initWithText:PICSFirstChoice];
+ SDLChoiceCell *firstChoice = [[SDLChoiceCell alloc] initWithText:PICSFirstChoice artwork:[SDLArtwork artworkWithStaticIcon:SDLStaticIconNameKey] voiceCommands:nil];
SDLChoiceCell *secondChoice = [[SDLChoiceCell alloc] initWithText:PICSSecondChoice];
SDLChoiceCell *thirdChoice = [[SDLChoiceCell alloc] initWithText:PICSThirdChoice];