From 0da865cf1afd620564365b79f96cd2f68e962a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kla=CC=88hn?= Date: Thu, 5 Oct 2023 16:19:35 +0200 Subject: [PATCH] Configured the Voted Talk Steps into the Hallway and Exhibitino Hall impls --- cinema/src/main/resources/tweetwall.css | 6 ++ .../src/main/resources/tweetwallConfig.json | 12 +-- exhibition/src/main/resources/tweetwall.css | 45 +++++++++- .../src/main/resources/tweetwallConfig.json | 83 ++++++++++++++++++ hallway/src/main/resources/tweetwall.css | 45 +++++++++- .../src/main/resources/tweetwallConfig.json | 84 ++++++++++++++++++- 6 files changed, 264 insertions(+), 11 deletions(-) diff --git a/cinema/src/main/resources/tweetwall.css b/cinema/src/main/resources/tweetwall.css index 02ff1b2..7abbe98 100644 --- a/cinema/src/main/resources/tweetwall.css +++ b/cinema/src/main/resources/tweetwall.css @@ -197,6 +197,12 @@ -fx-font-weight: bold; } +.scheduleSession .emojiFlow { + -fx-fill: blanchedalmond; + -fx-font-size: 13pt; + -fx-font-weight: bold; +} + .scheduleSession > .sessionTopPane > .speakerNames { -fx-alignment: "top-right" } diff --git a/cinema/src/main/resources/tweetwallConfig.json b/cinema/src/main/resources/tweetwallConfig.json index 4ee79af..985a18a 100644 --- a/cinema/src/main/resources/tweetwallConfig.json +++ b/cinema/src/main/resources/tweetwallConfig.json @@ -40,8 +40,8 @@ { "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", "config": { - "unit": "SECONDS", - "amount": "15" + "amount": 15, + "unit": "SECONDS" } }, { @@ -66,8 +66,8 @@ { "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", "config": { - "unit": "SECONDS", "amount": "15", + "unit": "SECONDS", "skipWhenSkipped": "TopRatedToday" } }, @@ -102,8 +102,8 @@ { "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", "config": { - "unit": "SECONDS", - "amount": "15" + "amount": 15, + "unit": "SECONDS" } }, { @@ -128,8 +128,8 @@ { "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", "config": { - "unit": "SECONDS", "amount": "15", + "unit": "SECONDS", "skipWhenSkipped": "TopRatedWeek" } }, diff --git a/exhibition/src/main/resources/tweetwall.css b/exhibition/src/main/resources/tweetwall.css index bb57cfc..fa632db 100644 --- a/exhibition/src/main/resources/tweetwall.css +++ b/exhibition/src/main/resources/tweetwall.css @@ -173,9 +173,33 @@ -fx-font-size: 10pt; } +.votedTalk .ratingAverageScore { + -fx-text-fill: blanchedalmond; + -fx-font-weight: bold; + -fx-font-size: 14pt; +} + +.votedTalk .ratingTotalVotes { + -fx-text-fill: blanchedalmond; + -fx-font-weight: normal; + -fx-font-size: 10pt; +} + +.scheduleSession > .sessionBottomPane > .centerFlow .emojiFlow { + -fx-fill: blanchedalmond; + -fx-font-size: 13pt; + -fx-font-weight: bold; +} + +.votedTalk .emojiFlow { + -fx-fill: blanchedalmond; + -fx-font-size: 13pt; + -fx-font-weight: bold; +} + .scheduleSession .emojiFlow { -fx-fill: blanchedalmond; - -fx-font-size: 15pt; + -fx-font-size: 13pt; -fx-font-weight: bold; } @@ -183,11 +207,20 @@ -fx-alignment: "top-right" } +.votedTalk > .sessionTopPane > .speakerNames { + -fx-alignment: "top-right" +} + .scheduleSession > .sessionTopPane > .speakerNames > .speakerName { -fx-text-fill: blanchedalmond; -fx-font-size: 11pt; } +.votedTalk > .sessionTopPane > .speakerNames > .speakerName { + -fx-text-fill: blanchedalmond; + -fx-font-size: 11pt; +} + .scheduleSession > .sessionTopPane > .speakerNames > .companyName { -fx-text-fill: blanchedalmond; -fx-font-size: 8pt; @@ -212,6 +245,14 @@ -fx-font-weight: bold; } +.votedTalk > .title { + -fx-background-color: devoxx_gradient_opaque; + -fx-background-radius: 10; + -fx-text-fill: blanchedalmond; + -fx-font-size: 20pt; + -fx-font-weight: bold; +} + .scheduleSession .sessionBottomPane .centerFlow { -fx-spacing: 3pt; } @@ -223,7 +264,7 @@ } .scheduleSession .sessionBottomPane .centerFlow .tagPane .tags .tagLabel { - -fx-font-size: 10pt; + -fx-font-size: 9pt; -fx-text-fill: blanchedalmond; /* -fx-text-fill: #e55630; */ /* -fx-background-color: black; */ diff --git a/exhibition/src/main/resources/tweetwallConfig.json b/exhibition/src/main/resources/tweetwallConfig.json index b5adcca..d5d7d9b 100644 --- a/exhibition/src/main/resources/tweetwallConfig.json +++ b/exhibition/src/main/resources/tweetwallConfig.json @@ -21,6 +21,7 @@ "config": { "layoutX": 103, "layoutY": 200, + "width": 800, "sessionHeight": 150, "showAvatar": true, "avatarArcSize": 16, @@ -42,6 +43,88 @@ "config": { "nodeSelector": "#scheduleNode" } + }, + { + "stepClassName": "org.tweetwallfx.conference.stepengine.steps.ShowTopRated", + "config": { + "layoutX": 103, + "layoutY": 200, + "width": 800, + "talkHeight": 125, + "talkVGap": 5, + "topVotedType": "TODAY", + "stepDuration": 500, + "skipTokenValue": "TopRatedToday" + } + }, + { + "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", + "config": { + "amount": "15", + "unit": "SECONDS", + "skipWhenSkipped": "TopRatedToday" + } + }, + { + "stepClassName": "org.tweetwallfx.controls.steps.NodeFadeOutStep", + "config": { + "nodeSelector": "#topRatedeNode" + } + }, + { + "stepClassName": "org.tweetwallfx.conference.stepengine.steps.ShowSchedule", + "config": { + "layoutX": 103, + "layoutY": 200, + "width": 800, + "sessionHeight": 150, + "showAvatar": true, + "avatarArcSize": 16, + "avatarSize": 50, + "avatarSpacing": 4, + "showFavourite": true, + "stepDuration": 500 + } + }, + { + "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", + "config": { + "amount": 15, + "unit": "SECONDS" + } + }, + { + "stepClassName": "org.tweetwallfx.controls.steps.NodeFadeOutStep", + "config": { + "nodeSelector": "#scheduleNode" + } + }, + { + "stepClassName": "org.tweetwallfx.conference.stepengine.steps.ShowTopRated", + "config": { + "layoutX": 103, + "layoutY": 200, + "width": 800, + "talkHeight": 125, + "talkVGap": 5, + "topVotedType": "WEEK", + "stepDuration": 500, + "skipTokenValue": "TopRatedWeek" + } + }, + { + "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", + "config": { + "amount": "15", + "unit": "SECONDS", + "skipWhenSkipped": "TopRatedWeek" + } + }, + { + "stepClassName": "org.tweetwallfx.controls.steps.NodeFadeOutStep", + "config": { + "nodeSelector": "#topRatedeNode" + } } ] } diff --git a/hallway/src/main/resources/tweetwall.css b/hallway/src/main/resources/tweetwall.css index 0c9d3bf..c53628b 100644 --- a/hallway/src/main/resources/tweetwall.css +++ b/hallway/src/main/resources/tweetwall.css @@ -173,9 +173,33 @@ -fx-font-size: 10pt; } +.votedTalk .ratingAverageScore { + -fx-text-fill: blanchedalmond; + -fx-font-weight: bold; + -fx-font-size: 14pt; +} + +.votedTalk .ratingTotalVotes { + -fx-text-fill: blanchedalmond; + -fx-font-weight: normal; + -fx-font-size: 10pt; +} + +.scheduleSession > .sessionBottomPane > .centerFlow .emojiFlow { + -fx-fill: blanchedalmond; + -fx-font-size: 13pt; + -fx-font-weight: bold; +} + +.votedTalk .emojiFlow { + -fx-fill: blanchedalmond; + -fx-font-size: 13pt; + -fx-font-weight: bold; +} + .scheduleSession .emojiFlow { -fx-fill: blanchedalmond; - -fx-font-size: 15pt; + -fx-font-size: 13pt; -fx-font-weight: bold; } @@ -183,11 +207,20 @@ -fx-alignment: "top-right" } +.votedTalk > .sessionTopPane > .speakerNames { + -fx-alignment: "top-right" +} + .scheduleSession > .sessionTopPane > .speakerNames > .speakerName { -fx-text-fill: blanchedalmond; -fx-font-size: 11pt; } +.votedTalk > .sessionTopPane > .speakerNames > .speakerName { + -fx-text-fill: blanchedalmond; + -fx-font-size: 11pt; +} + .scheduleSession > .sessionTopPane > .speakerNames > .companyName { -fx-text-fill: blanchedalmond; -fx-font-size: 8pt; @@ -212,6 +245,14 @@ -fx-font-weight: bold; } +.votedTalk > .title { + -fx-background-color: devoxx_gradient_opaque; + -fx-background-radius: 10; + -fx-text-fill: blanchedalmond; + -fx-font-size: 20pt; + -fx-font-weight: bold; +} + .scheduleSession .sessionBottomPane .centerFlow { -fx-spacing: 3pt; } @@ -223,7 +264,7 @@ } .scheduleSession .sessionBottomPane .centerFlow .tagPane .tags .tagLabel { - -fx-font-size: 10pt; + -fx-font-size: 9pt; -fx-text-fill: blanchedalmond; /* -fx-text-fill: #e55630; */ /* -fx-background-color: black; */ diff --git a/hallway/src/main/resources/tweetwallConfig.json b/hallway/src/main/resources/tweetwallConfig.json index f9705dc..1ebde3a 100644 --- a/hallway/src/main/resources/tweetwallConfig.json +++ b/hallway/src/main/resources/tweetwallConfig.json @@ -20,12 +20,67 @@ "config": { "layoutX": 103, "layoutY": 100, - "sessionHeight": 175, + "width": 1200, + "sessionHeight": 168, "showAvatar": true, "avatarArcSize": 16, "avatarSize": 64, "avatarSpacing": 4, + "showFavourite": true, + "stepDuration": 500 + } + }, + { + "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", + "config": { + "amount": 15, + "unit": "SECONDS" + } + }, + { + "stepClassName": "org.tweetwallfx.controls.steps.NodeFadeOutStep", + "config": { + "nodeSelector": "#scheduleNode" + } + }, + { + "stepClassName": "org.tweetwallfx.conference.stepengine.steps.ShowTopRated", + "config": { + "layoutX": 103, + "layoutY": 100, + "width": 800, + "talkHeight": 125, + "talkVGap": 5, + "topVotedType": "TODAY", + "stepDuration": 500, + "skipTokenValue": "TopRatedToday" + } + }, + { + "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", + "config": { + "amount": "15", + "unit": "SECONDS", + "skipWhenSkipped": "TopRatedToday" + } + }, + { + "stepClassName": "org.tweetwallfx.controls.steps.NodeFadeOutStep", + "config": { + "nodeSelector": "#topRatedeNode" + } + }, + { + "stepClassName": "org.tweetwallfx.conference.stepengine.steps.ShowSchedule", + "config": { + "layoutX": 103, + "layoutY": 100, "width": 1200, + "sessionHeight": 168, + "showAvatar": true, + "avatarArcSize": 16, + "avatarSize": 64, + "avatarSpacing": 4, "showFavourite": true, "stepDuration": 500 } @@ -42,6 +97,33 @@ "config": { "nodeSelector": "#scheduleNode" } + }, + { + "stepClassName": "org.tweetwallfx.conference.stepengine.steps.ShowTopRated", + "config": { + "layoutX": 103, + "layoutY": 100, + "width": 800, + "talkHeight": 125, + "talkVGap": 5, + "topVotedType": "WEEK", + "stepDuration": 500, + "skipTokenValue": "TopRatedWeek" + } + }, + { + "stepClassName": "org.tweetwallfx.stepengine.steps.PauseStep", + "config": { + "amount": "15", + "unit": "SECONDS", + "skipWhenSkipped": "TopRatedWeek" + } + }, + { + "stepClassName": "org.tweetwallfx.controls.steps.NodeFadeOutStep", + "config": { + "nodeSelector": "#topRatedeNode" + } } ] }