From ddae6bfd7ae9b3fe1c2a79ddba512a09ffe7f21f Mon Sep 17 00:00:00 2001 From: German Viscuso Date: Wed, 28 Aug 2019 00:14:33 +0100 Subject: [PATCH 1/2] Updated demo to APL v1.1 --- lambda/custom/documents/helpIntent.json | 8 +++--- lambda/custom/documents/launchRequest.json | 8 +++--- lambda/custom/documents/recipeIntent.json | 32 ++++++++++++++++------ lambda/custom/index.js | 6 ++-- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/lambda/custom/documents/helpIntent.json b/lambda/custom/documents/helpIntent.json index b2b4fbc..b8799c1 100644 --- a/lambda/custom/documents/helpIntent.json +++ b/lambda/custom/documents/helpIntent.json @@ -1,19 +1,19 @@ { "type": "APL", - "version": "1.0", + "version": "1.1", "theme": "dark", "import": [ { "name": "alexa-viewport-profiles", - "version": "1.0.0" + "version": "1.1.0" }, { "name": "alexa-layouts", - "version": "1.0.0" + "version": "1.1.0" }, { "name": "alexa-styles", - "version": "1.0.0" + "version": "1.1.0" } ], "resources": [ diff --git a/lambda/custom/documents/launchRequest.json b/lambda/custom/documents/launchRequest.json index 67812b6..69f9dd4 100644 --- a/lambda/custom/documents/launchRequest.json +++ b/lambda/custom/documents/launchRequest.json @@ -1,19 +1,19 @@ { "type": "APL", - "version": "1.0", + "version": "1.1", "theme": "dark", "import": [ { "name": "alexa-viewport-profiles", - "version": "1.0.0" + "version": "1.1.0" }, { "name": "alexa-layouts", - "version": "1.0.0" + "version": "1.1.0" }, { "name": "alexa-styles", - "version": "1.0.0" + "version": "1.1.0" } ], "resources": [ diff --git a/lambda/custom/documents/recipeIntent.json b/lambda/custom/documents/recipeIntent.json index ed3ba6c..f31a3d7 100644 --- a/lambda/custom/documents/recipeIntent.json +++ b/lambda/custom/documents/recipeIntent.json @@ -1,21 +1,35 @@ { "type": "APL", - "version": "1.0", + "version": "1.1", "theme": "dark", "import": [ { "name": "alexa-viewport-profiles", - "version": "1.0.0" + "version": "1.1.0" }, { "name": "alexa-layouts", - "version": "1.0.0" + "version": "1.1.0" }, { "name": "alexa-styles", - "version": "1.0.0" + "version": "1.1.0" } ], + "styles": { + "karaokeText": { + "values": [ + { + "when": "${state.karaoke}", + "color": "white" + }, + { + "when": "${state.karaokeTarget}", + "color": "aqua" + } + ] + } + }, "resources": [ { "description": "Sauce boss background image assets", @@ -107,7 +121,7 @@ "width": "100vw", "height": "80vh", "position": "relative", - "top": "25vh", + "top": "0vh", "direction": "column", "items": [ { @@ -125,12 +139,12 @@ { "type": "Text", "id": "recipeText", - "style": "textStyleKaraoke", + "style": "karaokeText", "text": "${payload.sauceBossData.properties.selectedSauceText}", "speech": "${payload.sauceBossData.properties.selectedSauceSpeech}", - "width": "75vw", + "width": "70vw", "textAlign": "center", - "fontSize": "7vh", + "fontSize": "6vh", "fontWeight": 300 } ] @@ -165,7 +179,7 @@ { "type": "Text", "id": "recipeText", - "style": "textStyleKaraoke", + "style": "karaokeText", "text": "${payload.sauceBossData.properties.selectedSauceText}", "speech": "${payload.sauceBossData.properties.selectedSauceSpeech}", "fontSize": "6vh", diff --git a/lambda/custom/index.js b/lambda/custom/index.js index 6d31fef..e562d65 100644 --- a/lambda/custom/index.js +++ b/lambda/custom/index.js @@ -78,7 +78,7 @@ const LaunchRequestHandler = { if (supportsAPL(handlerInput)) { responseBuilder.addDirective({ type: 'Alexa.Presentation.APL.RenderDocument', - version: '1.0', + version: '1.1', document: APLDocs.launch, datasources: { sauceBossData: { @@ -148,7 +148,7 @@ const HelpHandler = { if (supportsAPL(handlerInput)) { responseBuilder.addDirective({ type: 'Alexa.Presentation.APL.RenderDocument', - version: '1.0', + version: '1.1', datasources: recipes, document: APLDocs.help, }); @@ -407,7 +407,7 @@ function generateRecipeOutput(handlerInput, itemName) { return responseBuilder.addDirective({ type: 'Alexa.Presentation.APL.RenderDocument', token: 'sauce-boss', - version: '1.0', + version: '1.1', document: APLDocs.recipe, datasources: constructRecipeDataSource(itemName, recipe, requestAttributes.t('HINT_TEMPLATE', itemName)), }) From 04904ccffe52f322775567f1e30ee970a68ab87c Mon Sep 17 00:00:00 2001 From: German Viscuso Date: Sat, 31 Aug 2019 01:13:46 +0200 Subject: [PATCH 2/2] Reverted alexa-layouts to 1.0.0 otherwise the footer is not visible --- lambda/custom/documents/helpIntent.json | 2 +- lambda/custom/documents/launchRequest.json | 2 +- lambda/custom/documents/recipeIntent.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lambda/custom/documents/helpIntent.json b/lambda/custom/documents/helpIntent.json index b8799c1..1ba3c12 100644 --- a/lambda/custom/documents/helpIntent.json +++ b/lambda/custom/documents/helpIntent.json @@ -9,7 +9,7 @@ }, { "name": "alexa-layouts", - "version": "1.1.0" + "version": "1.0.0" }, { "name": "alexa-styles", diff --git a/lambda/custom/documents/launchRequest.json b/lambda/custom/documents/launchRequest.json index 69f9dd4..aac8ad5 100644 --- a/lambda/custom/documents/launchRequest.json +++ b/lambda/custom/documents/launchRequest.json @@ -9,7 +9,7 @@ }, { "name": "alexa-layouts", - "version": "1.1.0" + "version": "1.0.0" }, { "name": "alexa-styles", diff --git a/lambda/custom/documents/recipeIntent.json b/lambda/custom/documents/recipeIntent.json index f31a3d7..ce04cc7 100644 --- a/lambda/custom/documents/recipeIntent.json +++ b/lambda/custom/documents/recipeIntent.json @@ -9,7 +9,7 @@ }, { "name": "alexa-layouts", - "version": "1.1.0" + "version": "1.0.0" }, { "name": "alexa-styles",