added offline media-player "service" for testing + settings entry; cosmetics;

Author: fquirin

www/css/sepiaFW-cards.css

@@ -21,9 +21,13 @@
 	margin: 0px 0px;
 	padding: 0px 0px;
 }
+article + .sepiaFW-cards-flexSize-container.oneElement,
 .sepiaFW-cards-flexSize-container.oneElement.addSpacer {
 	margin-top: 5px;
 }
+.sepiaFW-results-container > .addSpacer {
+	margin-bottom: 5px;
+}
 .sepiaFW-my-view-section .sepiaFW-cards-flexSize-container {
 	margin: 5px 5px 0px 5px;
 	/*flex: 1 0 auto;*/ /*256px*/
@@ -361,6 +365,10 @@
 	background: #212327;
     color: #eee;
 }
+.sepiaFW-cards-list-body .fullWidthItem .cardItemBlock.cardDisabledMessage {
+	padding: 5px;
+	opacity: 0.75;
+}
 .sepiaFW-cards-flexSize-container .cardBodyItem.fullWidthItem .cardItemOverlay {
 	position: absolute;
 	border-radius: 2px;
@@ -734,6 +742,7 @@
     justify-content: center;
     flex-direction: column;
 	/*width: calc(100% - 80px);*/
+	min-height: 48px;
 	flex: 1 1 auto;
 	/*max-width: 120px;*/
 	margin: 5px 0px 0px 0px;

www/css/sepiaFW-frames.css

@@ -300,16 +300,16 @@
 /* mic animations (idle, loading, speaking, listening, awaitDialog) */
 
 #sepiaFW-frames-view #sepiaFW-frames-mic.state-loading {
-	color: #8e8e8e;
+	color: #8e8e8e !important;
 }
 #sepiaFW-frames-view #sepiaFW-frames-mic.state-speaking {
-	color: #16ABC3;
+	color: #16ABC3 !important;
 }
 #sepiaFW-frames-view #sepiaFW-frames-mic.state-listening {
-	color: #ba2a2a;
+	color: #ba2a2a !important;
 }
 #sepiaFW-frames-view #sepiaFW-frames-mic.state-awaitDialog {
-	color: #ffeb3b;
+	color: #ffeb3b !important;
 }
 
 /* Small Landscape Modes */

www/css/sepiaFW-skin-history-of-future.css

@@ -441,6 +441,12 @@ html.landscape-small #sepiaFW-assist-btn-area {
 .sepiaFW-cards-list-body .weatherNowSmall > div:last-of-type {
     border-radius: 0 28px 28px 0;
 }
+.sepiaFW-cards-list-body .cardBodyItem .itemLeft:not(.listLeft) .material-icons {
+	padding-left: 4px;
+}
+.sepiaFW-cards-list-body .cardBodyItem .itemRight:not(.listRight) .material-icons {
+	padding-right: 4px;
+}
 
 .sepiaFW-cards-list-body .timeEvent div {
 	background: #fb9e37;

www/css/sepiaFW-skin-neo-sepia.css

@@ -211,7 +211,8 @@ html.landscape-small #sepiaFW-chat-controls {
 .sepiaFW-cards-button,
 .sepiaFW-notouch-device .sepiaFW-cards-button:hover {
 	background: #CEFF1A;
-    color: #121212;
+	color: #121212;
+	border: 1px solid #dadada;
 }
 
 .sepiaFW-cards-list-title {

www/css/sepiaFW-skin-os2.css

@@ -206,7 +206,8 @@ html.landscape-small #sepiaFW-chat-controls {
 .sepiaFW-cards-flexSize-container.oneElement {
 	padding-bottom: 5px;
 }
-.chatMsg > .sepiaFW-cards-flexSize-container.oneElement:only-of-type {
+.chatMsg > .sepiaFW-cards-flexSize-container.oneElement:only-of-type,
+.sepiaFW-results-container > .sepiaFW-cards-flexSize-container.oneElement {
 	padding-bottom: 0px;
 }
 .chatMsg > .sepiaFW-cards-flexSize-container.oneElement {

www/scripts/sepiaFW.audio.js

@@ -865,12 +865,10 @@ function sepiaFW_build_audio(){
 			broadcastAudioRequested();
 
 			//stop all other audio sources
-			if (SepiaFW.client.controls){
-				SepiaFW.client.controls.media({
-					action: "stop",
-					skipFollowUp: true
-				});
-			}
+			SepiaFW.client.controls.media({
+				action: "stop",
+				skipFollowUp: true
+			});
 			Stream.isLoading = true;
 
 		}else if (audioPlayer == player2){

www/scripts/sepiaFW.embedded.nlu.js

@@ -44,14 +44,22 @@ function sepiaFW_build_embedded_nlu(){
 		}else if (dataType == "openText"){
 			//Mixed languages:
 
+			//URLs
+			if (text.match(/(^http(s|):)/i)){
+				getOpenLinkCmd(nluResult, text);
+
 			//Lists
-			if (text.match(/(list|todo)/i)){
+			}else if (text.match(/(list|todo)/i)){
 				getListCmd(nluResult, text);
 
 			//News
 			}else if (text.match(/(news|nachrichten)/i)){
 				getNewsCmd(nluResult, text);
 
+			//Media Player (music)
+			}else if (text.match(/(music (by|of|from)|musik von)/i)){
+				getMusicCmd(nluResult, text);
+
 			//Radio
 			}else if (text.match(/(radio|music|musik)/i)){
 				getRadioCmd(nluResult, text);
@@ -65,7 +73,7 @@ function sepiaFW_build_embedded_nlu(){
 				getWeatherCmd(nluResult, text);
 
 			//Websearch
-			}else if (text.match(/(search|find|such(e|)|finde|link|^http(s|):.*)\b/i)){
+			}else if (text.match(/(search|find|such(e|)|finde|link)\b/i)){
 				getOpenLinkCmd(nluResult, text);
 
 			//Chat with custom action or card
@@ -153,6 +161,18 @@ function sepiaFW_build_embedded_nlu(){
 		return nluResult;
 	}
 
+	//Music
+	function getMusicCmd(nluResult, inputText){
+		nluResult.result = "success";
+		nluResult.context = "music";
+		nluResult.parameters = {
+			"music_service": "embedded",
+			"artist": "Ed"
+		};
+		nluResult.command = "music";
+		return nluResult;
+	}
+
 	//Radio
 	function getRadioCmd(nluResult, inputText){
 		nluResult.result = "success";

www/scripts/sepiaFW.embedded.services.js

@@ -49,6 +49,10 @@ function sepiaFW_build_embedded_services(){
 			}else if (nluResult.command == "news"){
 				serviceResult = Services.news(nluInput, nluResult);
 
+			//Music (media player)
+			}else if (nluResult.command == "music"){
+				serviceResult = Services.music(nluInput, nluResult);
+
 			//Radio
 			}else if (nluResult.command == "music_radio"){
 				serviceResult = Services.radio(nluInput, nluResult);
@@ -166,12 +170,31 @@ function sepiaFW_build_embedded_services(){
 		return serviceResult;
 	}
 
+	//Embedded music service
+	Services.music = function(nluInput, nluResult){
+		//Get dummy answer
+		var answerText = "Ok";
+		
+		//Get dummy media player card
+		var serviceResult;
+		if (SepiaFW.offline && nluResult.parameters && nluResult.parameters.music_service == "embedded"){
+			var cardInfo = dummyCards["embedded_player"]();
+			var actionInfo = "";
+			var htmlInfo = "";
+			serviceResult = Services.buildServiceResult(
+				nluInput.user, nluInput.language, 
+				nluResult.command, answerText, cardInfo, actionInfo, htmlInfo
+			);
+		}
+		return serviceResult;
+	}
+
 	//Embedded radio service
 	Services.radio = function(nluInput, nluResult){
 		//Get dummy answer
 		var answerText = "Ok";
 
-		//Get dummy weather service-result
+		//Get dummy radio service-result
 		var serviceResult;
 		if (SepiaFW.offline){
 			var cardInfo = Services.buildRadioCardInfoDummy(nluResult.language);
@@ -377,6 +400,15 @@ function sepiaFW_build_embedded_services(){
 				artist: "Ed",
 				song: "Twister"
 			}, service, serviceResult);
+		},
+		"embedded_player_youtube": function(){
+			var url = "https://www.youtube.com/embed?listType=playlist&list=OLAK5uy_nMLnwHRhSOAO6sO7LmFRkp21RATGG6mT8";
+			var service = "youtube_embedded";
+			var serviceResult = {};
+			return Services.buildEmbeddedPlayerCardInfoDummy(url, {
+				playlist: "Metallica",
+				uri: url
+			}, service, serviceResult);
 		}
 	}
 
@@ -583,6 +615,7 @@ function sepiaFW_build_embedded_services(){
 			SepiaFW.offline.getLinkCard(url, undefined, undefined, image, imageBackground, {})
 		];
 		if (!searchObj) searchObj = {};
+		cardInfo[0].info[0].url = url;
 		cardInfo[0].info[0].data = {
 			"title": "Embedded Player",
 			"desc": "Test Card",

www/scripts/sepiaFW.local.js

@@ -78,6 +78,8 @@ function sepiaFW_build_strings(){
 	StringsDE.copy = 'Kopieren';
 	StringsDE.show = 'Anzeigen';
 	StringsDE.open = 'Öffnen';
+	StringsDE.close = 'Schließen';
+	StringsDE.closed = 'geschlossen';
 	StringsDE.new = 'Neu';
 	StringsDE.unknown = 'Unbekannt';
 	StringsDE.not_defined = 'Nicht definiert';
@@ -109,6 +111,7 @@ function sepiaFW_build_strings(){
 	StringsDE.exportToUrl = '<i class="material-icons md-inherit">share</i><span>&nbsp;Link</span>';
 	StringsDE.copyUrl = '<i class="material-icons md-inherit">link</i><span>&nbsp;Kopieren</span>';
 	StringsDE.playOn = '<i class="material-icons md-inherit">airplay</i><span>&nbsp;Play On</span>';
+	StringsDE.closeCard = '<i class="material-icons md-inherit">cancel_presentation</i><span>&nbsp;Beenden</span>';
 	StringsDE.readNewsArticle = '<i class="material-icons md-inherit">local_library</i><span>&nbsp;Artikel lesen</span>';
 	StringsDE.alarm = 'Wecker';
 	StringsDE.alarmClock = 'Wecker'; 		//name is title of UserDataList
@@ -172,6 +175,7 @@ function sepiaFW_build_strings(){
 	StringsDE.no_media_found = "Es wurde nichts zum Abspielen gefunden.";
 	StringsDE.remote_action = "Remote-Zugriff";
 	StringsDE.remote_action_audio_stream = "ich habe einen Audio Stream via Remote-Zugriff empfangen. Stream wird gestartet.";
+	StringsDE.remote_action_media_player = "habe Daten via Remote-Zugriff empfangen. Media player wird gestartet.";
 	StringsDE.remote_action_notify = "ich habe eine Benachrichtigung für dich.";
 	StringsDE.read_article = "Artikel lesen";
 	StringsDE.choose_device_for_music = "Wähle ein Gerät auf dem du die Musik abspielen willst";
@@ -191,6 +195,7 @@ function sepiaFW_build_strings(){
 	StringsDE.myNewsDemoBtn = 'Öffne meine persönlichen News';
 	StringsDE.myRadioDemoBtn = 'Starte mein Lieblingsradio';
 	StringsDE.myToDoDemoBtn = 'Öffne meine To-Do Liste';
+	StringsDE.myMusicPlayerDemoBtn = 'Spiele Musik von Ed';
 	//Connection status
 	StringsDE.status_connecting = "Wird verbunden...";
 	StringsDE.status_opened = "Online";
@@ -291,6 +296,8 @@ function sepiaFW_build_strings(){
 	StringsEN.copy = 'Copy';
 	StringsEN.show = 'Show';
 	StringsEN.open = 'Open';
+	StringsEN.close = 'Close';
+	StringsEN.closed = 'closed';
 	StringsEN.new = 'New';
 	StringsEN.unknown = 'Unknown';
 	StringsEN.not_defined = 'Not defined';
@@ -322,6 +329,7 @@ function sepiaFW_build_strings(){
 	StringsEN.exportToUrl = '<i class="material-icons md-inherit">share</i><span>&nbsp;Link</span>';
 	StringsEN.copyUrl = '<i class="material-icons md-inherit">link</i><span>&nbsp;Copy</span>';
 	StringsEN.playOn = '<i class="material-icons md-inherit">airplay</i><span>&nbsp;Play On</span>';
+	StringsEN.closeCard = '<i class="material-icons md-inherit">cancel_presentation</i><span>&nbsp;Close</span>';
 	StringsEN.readNewsArticle = '<i class="material-icons md-inherit">local_library</i><span>&nbsp;Read article</span>';
 	StringsEN.alarm = 'Alarm';
 	StringsEN.alarmClock = 'Alarm';		//name is title of UserDataList
@@ -385,6 +393,7 @@ function sepiaFW_build_strings(){
 	StringsEN.no_media_found = "Found no media to play.";
 	StringsEN.remote_action = "Remote access";
 	StringsEN.remote_action_audio_stream = "I've received an audio stream via remote access. Starting now.";
+	StringsEN.remote_action_media_player = "I've received media via remote access. Starting player.";
 	StringsEN.remote_action_notify = "I have a message for you.";
 	StringsEN.read_article = "Read article";
 	StringsEN.choose_device_for_music = "Choose a device to play your music on";
@@ -404,6 +413,7 @@ function sepiaFW_build_strings(){
 	StringsEN.myNewsDemoBtn = 'Open my personal news';
 	StringsEN.myRadioDemoBtn = 'Start my favorite radio station';
 	StringsEN.myToDoDemoBtn = 'Open my to-do list';
+	StringsEN.myMusicPlayerDemoBtn = 'Play music from Ed';
 	//Connection status
 	StringsEN.status_connecting = "Connecting...";
 	StringsEN.status_opened = "Online";

www/scripts/sepiaFW.ui.actions.js

@@ -409,13 +409,9 @@ function sepiaFW_build_ui_actions(){
 	//STOP AUDIO STREAM
 	Actions.stopAudio = function(action){
 		//SepiaFW.debug.info("Action: type 'stop_audio_stream'.");
-		if (SepiaFW.client.controls){
-			SepiaFW.client.controls.media({
-				action: "stop"
-			});
-		}else{
-			SepiaFW.audio.stop();
-		}
+		SepiaFW.client.controls.media({
+			action: "stop"
+		});
 	}
 
 	//SCHEDULE Messages