From fecd5fd7161b3e5b2b93e30b0e9784705fa28f84 Mon Sep 17 00:00:00 2001 From: Egor Nemtsev Date: Wed, 12 Feb 2020 16:43:08 +0300 Subject: remove spotify and netflix, add youtube app Fixes: AUTOSUITE-1471 Fixes: AUTOSUITE-1433 Change-Id: I110f20aad0302356ff49b66299250e35e0e089c6 Reviewed-by: Grigorii Zimin --- com.pelagicore.netflix/Main.qml | 123 ---------------------- com.pelagicore.netflix/com.pelagicore.netflix.pro | 14 --- com.pelagicore.netflix/icon.png | Bin 595 -> 0 bytes com.pelagicore.netflix/info.yaml | 12 --- com.pelagicore.spotify/Main.qml | 123 ---------------------- com.pelagicore.spotify/com.pelagicore.spotify.pro | 14 --- com.pelagicore.spotify/icon.png | Bin 709 -> 0 bytes com.pelagicore.spotify/info.yaml | 13 --- com.pelagicore.youtube/Browser.qml | 103 ++++++++++++++++++ com.pelagicore.youtube/com.pelagicore.youtube.pro | 14 +++ com.pelagicore.youtube/icon.png | Bin 0 -> 600 bytes com.pelagicore.youtube/info.yaml | 12 +++ qt-auto-extra-apps.pro | 3 +- 13 files changed, 130 insertions(+), 301 deletions(-) delete mode 100644 com.pelagicore.netflix/Main.qml delete mode 100644 com.pelagicore.netflix/com.pelagicore.netflix.pro delete mode 100644 com.pelagicore.netflix/icon.png delete mode 100644 com.pelagicore.netflix/info.yaml delete mode 100644 com.pelagicore.spotify/Main.qml delete mode 100644 com.pelagicore.spotify/com.pelagicore.spotify.pro delete mode 100644 com.pelagicore.spotify/icon.png delete mode 100644 com.pelagicore.spotify/info.yaml create mode 100644 com.pelagicore.youtube/Browser.qml create mode 100644 com.pelagicore.youtube/com.pelagicore.youtube.pro create mode 100644 com.pelagicore.youtube/icon.png create mode 100644 com.pelagicore.youtube/info.yaml diff --git a/com.pelagicore.netflix/Main.qml b/com.pelagicore.netflix/Main.qml deleted file mode 100644 index 5d9da15..0000000 --- a/com.pelagicore.netflix/Main.qml +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtAuto Extra Apps. -** -** $QT_BEGIN_LICENSE:BSD-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite licenses may use -** this file in accordance with the commercial license agreement provided -** with the Software or, alternatively, in accordance with the terms -** contained in a written agreement between you and The Qt Company. For -** licensing terms and conditions see https://www.qt.io/terms-conditions. -** For further information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: BSD-3-Clause -** -****************************************************************************/ - -import QtQuick 2.8 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 -import QtWebEngine 1.7 -import controls 1.0 -import utils 1.0 -import com.pelagicore.styles.neptune 3.0 - -PrimaryWindow { - id: root - - Control { - id: mainContent - anchors.fill: parent - property alias title: webView.title - property string url: "https://www.netflix.com" - - onUrlChanged: { - var pattern = /^((file|http|https|ftp):\/\/)/; - - if (!pattern.test(url)) { - url = "http://" + url; - } - } - - ColumnLayout { - anchors.fill: parent - spacing: 0 - - Rectangle { - Layout.fillWidth: true - height: NeptuneStyle.dp(90) - color: "#000000" - - Rectangle { - anchors.bottom: parent.bottom - width: parent.width * webView.loadProgress / 100 - height: 4 - color: NeptuneStyle.accentColor - - opacity: webView.loading - Behavior on opacity { NumberAnimation {} } - } - } - - Item { - Layout.fillWidth: true - Layout.fillHeight: true - - Rectangle { - anchors.fill: parent - color: NeptuneStyle.mainColor - } - - WebEngineView { - id: webView - - anchors.fill: parent - url: mainContent.url - - onLoadingChanged: { - if (loadRequest.status === WebEngineView.LoadFailedStatus) { - console.log(Logging.sysui, "WebView.Loadfailed: " + loadRequest.errorString) - console.log(Logging.sysui, "when loading: " + loadRequest.url) - } - } - } - } - } - } -} diff --git a/com.pelagicore.netflix/com.pelagicore.netflix.pro b/com.pelagicore.netflix/com.pelagicore.netflix.pro deleted file mode 100644 index a18cbbc..0000000 --- a/com.pelagicore.netflix/com.pelagicore.netflix.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE = aux - -FILES += info.yaml \ - icon.png \ - Main.qml - -app.files = $$FILES -app.path = /apps/com.pelagicore.netflix -INSTALLS += app - -AM_MANIFEST = info.yaml -AM_PACKAGE_DIR = $$app.path - -load(am-app) diff --git a/com.pelagicore.netflix/icon.png b/com.pelagicore.netflix/icon.png deleted file mode 100644 index b081097..0000000 Binary files a/com.pelagicore.netflix/icon.png and /dev/null differ diff --git a/com.pelagicore.netflix/info.yaml b/com.pelagicore.netflix/info.yaml deleted file mode 100644 index ed6202e..0000000 --- a/com.pelagicore.netflix/info.yaml +++ /dev/null @@ -1,12 +0,0 @@ -formatVersion: 1 -formatType: am-application ---- -id: 'com.pelagicore.netflix' -icon: 'icon.png' -code: 'Main.qml' -runtime: 'qml' -name: - en: 'Netflix' - de: 'Netflix' - -categories: [ 'other' ] diff --git a/com.pelagicore.spotify/Main.qml b/com.pelagicore.spotify/Main.qml deleted file mode 100644 index 670422a..0000000 --- a/com.pelagicore.spotify/Main.qml +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtAuto Extra Apps. -** -** $QT_BEGIN_LICENSE:BSD-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite licenses may use -** this file in accordance with the commercial license agreement provided -** with the Software or, alternatively, in accordance with the terms -** contained in a written agreement between you and The Qt Company. For -** licensing terms and conditions see https://www.qt.io/terms-conditions. -** For further information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: BSD-3-Clause -** -****************************************************************************/ - -import QtQuick 2.8 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 -import QtWebEngine 1.7 -import controls 1.0 -import utils 1.0 -import com.pelagicore.styles.neptune 3.0 - -PrimaryWindow { - id: root - - Control { - id: mainContent - anchors.fill: parent - property alias title: webView.title - property string url: "https://play.spotify.com" - - onUrlChanged: { - var pattern = /^((file|http|https|ftp):\/\/)/; - - if (!pattern.test(url)) { - url = "http://" + url; - } - } - - ColumnLayout { - anchors.fill: parent - spacing: 0 - - Rectangle { - Layout.fillWidth: true - height: NeptuneStyle.dp(90) - color: "#000000" - - Rectangle { - anchors.bottom: parent.bottom - width: parent.width * webView.loadProgress / 100 - height: 4 - color: NeptuneStyle.accentColor - - opacity: webView.loading - Behavior on opacity { NumberAnimation {} } - } - } - - Item { - Layout.fillWidth: true - Layout.fillHeight: true - - Rectangle { - anchors.fill: parent - color: "white" - } - - WebEngineView { - id: webView - - anchors.fill: parent - url: mainContent.url - - onLoadingChanged: { - if (loadRequest.status === WebEngineView.LoadFailedStatus) { - console.log(Logging.sysui, "WebView.Loadfailed: " + loadRequest.errorString) - console.log(Logging.sysui, "when loading: " + loadRequest.url) - } - } - } - } - } - } -} diff --git a/com.pelagicore.spotify/com.pelagicore.spotify.pro b/com.pelagicore.spotify/com.pelagicore.spotify.pro deleted file mode 100644 index bb3f710..0000000 --- a/com.pelagicore.spotify/com.pelagicore.spotify.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE = aux - -FILES += info.yaml \ - icon.png \ - Main.qml - -app.files = $$FILES -app.path = /apps/com.pelagicore.spotify -INSTALLS += app - -AM_MANIFEST = info.yaml -AM_PACKAGE_DIR = $$app.path - -load(am-app) diff --git a/com.pelagicore.spotify/icon.png b/com.pelagicore.spotify/icon.png deleted file mode 100644 index ec81eb5..0000000 Binary files a/com.pelagicore.spotify/icon.png and /dev/null differ diff --git a/com.pelagicore.spotify/info.yaml b/com.pelagicore.spotify/info.yaml deleted file mode 100644 index 40774f0..0000000 --- a/com.pelagicore.spotify/info.yaml +++ /dev/null @@ -1,13 +0,0 @@ -formatVersion: 1 -formatType: am-application ---- -id: 'com.pelagicore.spotify' -icon: 'icon.png' -code: 'Main.qml' -runtime: 'qml' -name: - en: 'Spotify' - de: 'Spotify' - -categories: [ 'other' ] -mimeTypes: [ 'x-scheme-handler/x-spotify' ] diff --git a/com.pelagicore.youtube/Browser.qml b/com.pelagicore.youtube/Browser.qml new file mode 100644 index 0000000..ae756e6 --- /dev/null +++ b/com.pelagicore.youtube/Browser.qml @@ -0,0 +1,103 @@ +/**************************************************************************** +** +** Copyright (C) 2020 Luxoft Sweden AB +** Copyright (C) 2018 Pelagicore AG +** Contact: http://www.pelagicore.com/ +** +** This file is part of Neptune 3 IVI UI. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Neptune IVI UI licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Pelagicore. For licensing terms +** and conditions see http://www.pelagicore.com. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3 requirements will be +** met: http://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +import QtQuick 2.8 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.0 +import QtWebEngine 1.7 +import application.windows 1.0 +import shared.controls 1.0 +import shared.Style 1.0 +import shared.Sizes 1.0 + +ApplicationCCWindow { + id: root + + Control { + id: mainContent + x: root.exposedRect.x + y: root.exposedRect.y + width: root.exposedRect.width + height: root.exposedRect.height + property alias title: webView.title + property string url: "https://www.youtube.com" + + onUrlChanged: { + var pattern = /^((file|http|https|ftp):\/\/)/; + + if (!pattern.test(url)) { + url = "http://" + url; + } + } + + ColumnLayout { + anchors.fill: parent + spacing: 0 + + Rectangle { + Layout.fillWidth: true + height: Sizes.dp(4) + color: "#000000" + + Rectangle { + anchors.bottom: parent.bottom + width: parent.width * webView.loadProgress / 100 + height: Sizes.dp(4) + color: Style.accentColor + + opacity: webView.loading + Behavior on opacity { NumberAnimation {} } + } + } + + Item { + Layout.fillWidth: true + Layout.fillHeight: true + + Rectangle { + anchors.fill: parent + color: Style.mainColor + } + + WebEngineView { + id: webView + + anchors.fill: parent + url: mainContent.url + + onLoadingChanged: { + if (loadRequest.status === WebEngineView.LoadFailedStatus) { + console.log(Logging.sysui, "WebView.Loadfailed: " + + loadRequest.errorString) + console.log(Logging.sysui, "when loading: " + loadRequest.url) + } + } + } + } + } + } +} diff --git a/com.pelagicore.youtube/com.pelagicore.youtube.pro b/com.pelagicore.youtube/com.pelagicore.youtube.pro new file mode 100644 index 0000000..a970e4e --- /dev/null +++ b/com.pelagicore.youtube/com.pelagicore.youtube.pro @@ -0,0 +1,14 @@ +TEMPLATE = aux + +FILES += info.yaml \ + icon.png \ + Browser.qml + +app.files = $$FILES +app.path = /apps/com.pelagicore.youtube +INSTALLS += app + +AM_MANIFEST = info.yaml +AM_PACKAGE_DIR = $$app.path + +load(am-app) diff --git a/com.pelagicore.youtube/icon.png b/com.pelagicore.youtube/icon.png new file mode 100644 index 0000000..3291642 Binary files /dev/null and b/com.pelagicore.youtube/icon.png differ diff --git a/com.pelagicore.youtube/info.yaml b/com.pelagicore.youtube/info.yaml new file mode 100644 index 0000000..de35fce --- /dev/null +++ b/com.pelagicore.youtube/info.yaml @@ -0,0 +1,12 @@ +formatVersion: 1 +formatType: am-application +--- +id: 'com.pelagicore.youtube' +icon: 'icon.png' +code: 'Browser.qml' +runtime: 'qml' +name: + en: 'Youtube' + de: 'Youtube' + +categories: [ 'other' ] diff --git a/qt-auto-extra-apps.pro b/qt-auto-extra-apps.pro index 2c46d57..a4d519a 100644 --- a/qt-auto-extra-apps.pro +++ b/qt-auto-extra-apps.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS = com.pelagicore.camera \ - com.pelagicore.spotify \ - com.pelagicore.netflix \ + com.pelagicore.youtube \ com.luxoft.webbrowser \ com.luxoft.videoplayer \ com.luxoft.greenomics \ -- cgit v1.2.3