From a9d3337a0c4d9f0d4a1d26c62bdbbbde554b72fb Mon Sep 17 00:00:00 2001 From: franklin-lobb Date: Thu, 24 Oct 2019 02:30:51 -0700 Subject: [PATCH 1/3] update footerHint to hintText --- lambda/custom/devices.json | 8 ++++---- lambda/custom/karaoke.json | 2 +- lambda/custom/pager.json | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lambda/custom/devices.json b/lambda/custom/devices.json index 06cbd03..f5f592d 100644 --- a/lambda/custom/devices.json +++ b/lambda/custom/devices.json @@ -68,7 +68,7 @@ }, { "type": "AlexaFooter", - "footerHint": "${payload.deviceTemplateData.properties.hintString}" + "hintText": "${payload.deviceTemplateData.properties.hintString}" } ] }, @@ -105,7 +105,7 @@ }, { "type": "AlexaFooter", - "footerHint": "${payload.deviceTemplateData.properties.hintString}" + "hintText": "${payload.deviceTemplateData.properties.hintString}" } ] }, @@ -142,7 +142,7 @@ }, { "type": "AlexaFooter", - "footerHint": "${payload.deviceTemplateData.properties.hintString}" + "hintText": "${payload.deviceTemplateData.properties.hintString}" } ] }, @@ -178,7 +178,7 @@ }, { "type": "AlexaFooter", - "footerHint": "${payload.deviceTemplateData.properties.hintString}" + "hintText": "${payload.deviceTemplateData.properties.hintString}" } ] } diff --git a/lambda/custom/karaoke.json b/lambda/custom/karaoke.json index d5a3b26..e71e9fe 100644 --- a/lambda/custom/karaoke.json +++ b/lambda/custom/karaoke.json @@ -176,7 +176,7 @@ }, { "type": "AlexaFooter", - "footerHint": "${payload.karaokeTemplateData.properties.hintString}" + "hintText": "${payload.karaokeTemplateData.properties.hintString}" } ] } diff --git a/lambda/custom/pager.json b/lambda/custom/pager.json index fc79c14..4b5de03 100644 --- a/lambda/custom/pager.json +++ b/lambda/custom/pager.json @@ -233,7 +233,7 @@ }, { "type": "AlexaFooter", - "footerHint": "${hint}" + "hintText": "${hint}" } ] } @@ -314,7 +314,7 @@ }, { "type": "AlexaFooter", - "footerHint": "${hint}" + "hintText": "${hint}" } ] } @@ -360,7 +360,7 @@ }, { "type": "AlexaFooter", - "footerHint": "${hint}" + "hintText": "${hint}" } ] } From e897b0a6906b19579f6ac86d8c080c114e0a75af Mon Sep 17 00:00:00 2001 From: franklin-lobb Date: Thu, 24 Oct 2019 02:43:50 -0700 Subject: [PATCH 2/3] added karaoke highlight styling --- lambda/custom/karaoke.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lambda/custom/karaoke.json b/lambda/custom/karaoke.json index e71e9fe..041b754 100644 --- a/lambda/custom/karaoke.json +++ b/lambda/custom/karaoke.json @@ -27,6 +27,17 @@ } ], "styles": { + "karaokeStyle": { + "values": [ + { + "color": "@colorText" + }, + { + "when": "${state.karaokeTarget}", + "color": "blue" + } + ] + }, "CheeseStyle": { "values": [ { @@ -127,7 +138,7 @@ "text": "${payload.karaokeTemplateData.properties.karaokeText}", "speech": "${payload.karaokeTemplateData.properties.karaokeSpeech}", "fontSize": "55px", - "color": "#ffffff", + "style": "karaokeStyle", "width": "90vw", "paddingTop": "30px", "paddingLeft": "30px", @@ -167,7 +178,7 @@ "text": "${payload.karaokeTemplateData.properties.karaokeText}", "speech": "${payload.karaokeTemplateData.properties.karaokeSpeech}", "fontSize": "55px", - "color": "#ffffff", + "style": "karaokeStyle", "paddingLeft": "30px", "paddingTop": "30px", "fontWeight": 300 From 932d89a32919650c4dbc68a3ab0fecc11f3407ef Mon Sep 17 00:00:00 2001 From: franklin-lobb Date: Thu, 24 Oct 2019 05:12:03 -0700 Subject: [PATCH 3/3] tidy up layouts --- lambda/custom/karaoke.json | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/lambda/custom/karaoke.json b/lambda/custom/karaoke.json index 041b754..2c8c90f 100644 --- a/lambda/custom/karaoke.json +++ b/lambda/custom/karaoke.json @@ -28,12 +28,13 @@ ], "styles": { "karaokeStyle": { + "extends": "textStyleKaraoke", "values": [ { "color": "@colorText" }, { - "when": "${state.karaokeTarget}", + "when": "${state.karaoke}", "color": "blue" } ] @@ -44,7 +45,7 @@ "fontSize": "@headFontSize", "color": "@roundCheeseColor", "textAlign": "center", - "fontWeight": 300 + "fontWeight": "300" } ] }, @@ -56,7 +57,7 @@ "color": "@landscapeCheeseColor", "paddingLeft": "30px", "paddingTop": "30px", - "fontWeight": 100 + "fontWeight": "100" } ] } @@ -80,7 +81,7 @@ "items": [ { "type": "Frame", - "height": "95vh", + "height": "100vh", "width": "100vw", "borderWidth": "3px", "borderColor": "#C44D58", @@ -91,7 +92,9 @@ "type": "Text", "text": "${title}", "style": "CheeseStyle", - "paddingTop": "5vh" + "textAlign": "center", + "paddingTop": "5vh", + "width": "100vw" } ] } @@ -134,18 +137,17 @@ "item": [ { "type": "Text", - "id": "karaokecomponent", + "id": "karaokespeechtext", "text": "${payload.karaokeTemplateData.properties.karaokeText}", "speech": "${payload.karaokeTemplateData.properties.karaokeSpeech}", - "fontSize": "55px", "style": "karaokeStyle", - "width": "90vw", - "paddingTop": "30px", - "paddingLeft": "30px", - "paddingRight": "30px", - "fontWeight": 300 + "paddingLeft": "5vw", + "paddingRight": "5vw", + "paddingBottom": "50vh", + "textAlign": "center" } - ] + ], + "grow": 1 } ] }, @@ -170,7 +172,7 @@ { "type": "ScrollView", "width": "100vw", - "height": "100vh", + "height": "30vh", "items": [ { "type": "Text", @@ -181,9 +183,10 @@ "style": "karaokeStyle", "paddingLeft": "30px", "paddingTop": "30px", - "fontWeight": 300 + "fontWeight": "300" } - ] + ], + "grow": 1 }, { "type": "AlexaFooter",