ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework the styling mechanism

Browse Source
This commit is contained in:
Michael Zanetti 2020-12-06 17:23:22 +01:00
parent 73fe9d1209
commit 038293a77d
137 changed files with 2141 additions and 2733 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nymea-app/main.cpp
View File

@ -95,15 +95,13 @@ int main(int argc, char *argv[])
parser.addOption(kioskOption);
QCommandLineOption connectOption = QCommandLineOption({"c", "connect"}, "Connect to nymea:core without discovery.", "host");
parser.addOption(connectOption);
QCommandLineOption styleOption = QCommandLineOption({"s", "style"}, "Override the style. Style in settings will be disabled.", "style");
parser.addOption(styleOption);
parser.process(application);
// Initialize app log controller as early as possible, but after setting app name etc
AppLogController::instance();
foreach (const QFileInfo &fi, QDir(":/ui/fonts/").entryInfoList()) {
QFontDatabase::addApplicationFont(fi.absoluteFilePath());
}
QTranslator qtTranslator;
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
application.installTranslator(&qtTranslator);
@ -125,10 +123,24 @@ int main(int argc, char *argv[])
QQmlApplicationEngine *engine = new QQmlApplicationEngine();
StyleController styleController;
if (parser.isSet(styleOption)) {
qDebug() << "Setting style to" << parser.value(styleOption);
styleController.setCurrentStyle(parser.value(styleOption));
}
QQmlFileSelector *styleSelector = new QQmlFileSelector(engine);
styleSelector->setExtraSelectors({styleController.currentStyle()});
foreach (const QFileInfo &fi, QDir(":/ui/fonts/").entryInfoList()) {
QFontDatabase::addApplicationFont(fi.absoluteFilePath());
}
foreach (const QFileInfo &fi, QDir(":/styles/" + styleController.currentStyle() + "/fonts/").entryInfoList()) {
qDebug() << "Adding style font:" << fi.absoluteFilePath();
QFontDatabase::addApplicationFont(fi.absoluteFilePath());
}
qmlRegisterSingletonType(QUrl("qrc:///styles/" + styleController.currentStyle() + "/Style.qml"), "Nymea", 1, 0, "Style" );
engine->rootContext()->setContextProperty("styleController", &styleController);
qmlRegisterSingletonType<PlatformHelper>("Nymea", 1, 0, "PlatformHelper", platformHelperProvider);

8
nymea-app/resources.qrc
View File

@ -35,7 +35,6 @@
<file>ui/components/AutoSizeMenu.qml</file>
<file>ui/components/EmptyViewPlaceholder.qml</file>
<file>ui/components/RemoveDeviceMethodDialog.qml</file>
<file>ui/components/FancyHeader.qml</file>
<file>ui/components/MainPageTile.qml</file>
<file>ui/components/BusyOverlay.qml</file>
<file>ui/components/SwipeDelegateGroup.qml</file>
@ -154,12 +153,6 @@
<file>ui/thingconfiguration/ConfigureThingPage.qml</file>
<file>ui/connection/CertificateDialog.qml</file>
<file>ui/experiences/heating/Main.qml</file>
<file>ui/fonts/Oswald-Bold.ttf</file>
<file>ui/fonts/Oswald-ExtraLight.ttf</file>
<file>ui/fonts/Oswald-Light.ttf</file>
<file>ui/fonts/Oswald-Medium.ttf</file>
<file>ui/fonts/Oswald-Regular.ttf</file>
<file>ui/fonts/Oswald-SemiBold.ttf</file>
<file>ui/system/WebServerSettingsPage.qml</file>
<file>ui/system/WebServerConfigurationDialog.qml</file>
<file>ui/system/DeveloperTools.qml</file>
@ -236,5 +229,6 @@
<file>ui/utils/ActionQueue.qml</file>
<file>ui/components/ColorTemperaturePicker.qml</file>
<file>ui/components/ThingContextMenu.qml</file>
<file>ui/StyleBase.qml</file>
</qresource>
</RCC>

5
nymea-app/stylecontroller.cpp
View File

@ -61,9 +61,14 @@ QString StyleController::currentStyle() const
void StyleController::setCurrentStyle(const QString &currentStyle)
{
if (!allStyles().contains(currentStyle)) {
qWarning().nospace() << "No style named: " << currentStyle << ". Available styles are: " << allStyles().join(", ");
return;
}
QSettings settings;
if (settings.value("style").toString() != currentStyle) {
settings.setValue("style", currentStyle);
QQuickStyle::setStyle(QString(":/styles/%1").arg(currentStyle));
emit currentStyleChanged();
}
}

21
nymea-app/styles.qrc
View File

@ -1,24 +1,35 @@
<RCC>
<qresource prefix="/">
<file>styles/light/ApplicationWindow.qml</file>
<file>styles/light/Page.qml</file>
<file>styles/light/logo.svg</file>
<file>styles/light/Button.qml</file>
<file>styles/dark/ApplicationWindow.qml</file>
<file>styles/dark/Page.qml</file>
<file>styles/dark/logo.svg</file>
<file>styles/dark/Button.qml</file>
<file>styles/noir/ApplicationWindow.qml</file>
<file>styles/noir/Page.qml</file>
<file>styles/noir/logo.svg</file>
<file>styles/noir/Button.qml</file>
<file>styles/lime/ApplicationWindow.qml</file>
<file>styles/noir/fonts/Oswald-Bold.ttf</file>
<file>styles/noir/fonts/Oswald-ExtraLight.ttf</file>
<file>styles/noir/fonts/Oswald-Light.ttf</file>
<file>styles/noir/fonts/Oswald-Medium.ttf</file>
<file>styles/noir/fonts/Oswald-Regular.ttf</file>
<file>styles/noir/fonts/Oswald-SemiBold.ttf</file>
<file>styles/lime/Page.qml</file>
<file>styles/lime/logo.svg</file>
<file>styles/lime/Button.qml</file>
<file>styles/energize/ApplicationWindow.qml</file>
<file>styles/energize/Button.qml</file>
<file>styles/energize/logo.svg</file>
<file>styles/energize/Page.qml</file>
<file>styles/dark/Style.qml</file>
<file>styles/light/Style.qml</file>
<file>styles/noir/Style.qml</file>
<file>styles/lime/Style.qml</file>
<file>styles/energize/Style.qml</file>
<file>styles/light/logo-wide.svg</file>
<file>styles/dark/logo-wide.svg</file>
<file>styles/energize/logo-wide.svg</file>
<file>styles/lime/logo-wide.svg</file>
<file>styles/noir/logo-wide.svg</file>
</qresource>
</RCC>

79
nymea-app/styles/dark/ApplicationWindow.qml
View File

@ -1,79 +0,0 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2020, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
* This project including source code and documentation is protected by
* copyright law, and remains the property of nymea GmbH. All rights, including
* reproduction, publication, editing and translation, are reserved. The use of
* this project is subject to the terms of a license agreement to be concluded
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
* under https://nymea.io/license
*
* GNU General Public License Usage
* Alternatively, this project may be redistributed and/or modified under the
* terms of the GNU General Public License as published by the Free Software
* Foundation, GNU version 3. This project is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
* this project. If not, see <https://www.gnu.org/licenses/>.
*
* For any further details and any questions please contact us under
* contact@nymea.io or see our FAQ/Licensing Information on
* https://nymea.io/license/faq
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.9
import QtQuick.Templates 2.2
import QtQuick.Controls.Material 2.2
ApplicationWindow {
Material.theme: Material.Dark
font.pixelSize: 16
font.weight: Font.Normal
font.capitalization: Font.MixedCase
font.family: "Ubuntu"
// The core system name.
property string systemName: "nymea"
// The app name
property string appName: "nymea:app"
// The header background color
property color primaryColor: Material.background
// Header font color
property color headerForegroundColor: Material.foreground
// The font color
property color foregroundColor: Material.foreground
// The color of selected/highlighted things
property color accentColor: "#ff57baae"
// colors for interfaces, e.g. icons
property var interfaceColors: {
"temperaturesensor": "red",
"humiditysensor": "deepskyblue",
"moisturesensor":"blue",
"lightsensor": "orange",
"conductivitysensor": "green",
"pressuresensor": "grey",
"noisesensor": "darkviolet",
"co2sensor": "turquoise",
"smartmeterproducer": "lightgreen",
"smartmeterconsumer": "orange",
"extendedsmartmeterproducer": "blue",
"extendedsmartmeterconsumer": "blue"
}
// Optional: Set this to override the cloud environment
//property string cloudEnvironment: "Community"
}

3
nymea-app/styles/dark/Button.qml
View File

@ -34,6 +34,7 @@ import QtQuick.Controls 2.2
import QtQuick.Controls.impl 2.2
import QtQuick.Controls.Material 2.2
import QtQuick.Controls.Material.impl 2.2
import Nymea 1.0
T.Button {
id: control
@ -55,7 +56,7 @@ T.Button {
contentItem: Text {
text: control.text
color: app.foregroundColor
color: Style.foregroundColor
font.bold: control.font.bold
font.capitalization: Font.AllUppercase
font.family: control.font.family

13
nymea-app/styles/dark/Style.qml Normal file
View File

@ -0,0 +1,13 @@
pragma Singleton
import QtQuick 2.0
import "../../ui"
StyleBase {
backgroundColor: "#303030"
foregroundColor: "#ffffff"
headerBackgroundColor: "#303030"
headerForegroundColor: "#ffffff"
iconColor: "#fafafa"
}

827
nymea-app/styles/dark/logo-wide.svg Normal file
View File

@ -0,0 +1,827 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="Layer_1"
data-name="Layer 1"
viewBox="0 0 285.59808 151.71999"
version="1.1"
sodipodi:docname="logo-wide.svg"
width="285.59808"
height="151.72"
inkscape:version="1.0.1 (1.0.1+r74)">
<metadata
id="metadata108">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Artboard 1 copy 5 Kopie 2</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1380"
inkscape:window-height="873"
id="namedview106"
showgrid="false"
lock-margins="true"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
inkscape:zoom="2.3158153"
inkscape:cx="129.50276"
inkscape:cy="58.748251"
inkscape:window-x="60"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
<defs
id="defs69">
<style
id="style2">.cls-1{fill:url(#New_Gradient_Swatch_1);}.cls-2{fill:url(#linear-gradient);}.cls-3{fill:url(#linear-gradient-2);}.cls-4{fill:url(#linear-gradient-3);}.cls-5{fill:url(#linear-gradient-4);}.cls-6{fill:url(#linear-gradient-5);}.cls-7{fill:url(#linear-gradient-6);}.cls-8{fill:url(#linear-gradient-7);}.cls-9{fill:url(#linear-gradient-8);}.cls-10{fill:url(#linear-gradient-9);}.cls-11{fill:url(#New_Gradient_Swatch_2);}.cls-12{fill:#676767;}</style>
<linearGradient
id="New_Gradient_Swatch_1"
x1="282.06"
y1="231.14"
x2="354.72"
y2="321.84"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0.13"
stop-color="#9fc8a4"
id="stop4" />
<stop
offset="0.4"
stop-color="#92bc9e"
id="stop6" />
<stop
offset="0.9"
stop-color="#719b8f"
id="stop8" />
<stop
offset="1"
stop-color="#69938c"
id="stop10" />
</linearGradient>
<linearGradient
id="linear-gradient"
x1="252.74001"
y1="539.15997"
x2="235.17"
y2="539.15997"
gradientTransform="matrix(0.97,0.26,-0.26,0.97,272.36,-301.35)"
gradientUnits="userSpaceOnUse">
<stop
offset="0"
stop-color="#e3eae4"
id="stop13" />
<stop
offset="1"
stop-color="#cde2d8"
id="stop15" />
</linearGradient>
<linearGradient
id="linear-gradient-2"
x1="364.04999"
y1="261.20999"
x2="355.76999"
y2="302.63"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0"
stop-color="#9fc8a4"
id="stop18" />
<stop
offset="0.27"
stop-color="#9bc4a2"
id="stop20" />
<stop
offset="0.54"
stop-color="#8fb89d"
id="stop22" />
<stop
offset="0.82"
stop-color="#7ba494"
id="stop24" />
<stop
offset="1"
stop-color="#69938c"
id="stop26" />
</linearGradient>
<linearGradient
id="linear-gradient-3"
x1="370.64999"
y1="293.82999"
x2="370.51001"
y2="293.82999"
xlink:href="#linear-gradient"
gradientTransform="translate(-278.17306,-221.79)" />
<linearGradient
id="linear-gradient-4"
x1="380.91"
y1="282.75"
x2="370.64999"
y2="282.75"
xlink:href="#linear-gradient"
gradientTransform="translate(-278.17306,-221.79)" />
<linearGradient
id="linear-gradient-5"
x1="370.51001"
y1="295.07999"
x2="365.47"
y2="295.07999"
xlink:href="#linear-gradient"
gradientTransform="translate(-278.17306,-221.79)" />
<linearGradient
id="linear-gradient-6"
x1="365.22"
y1="286.54001"
x2="373.5"
y2="286.54001"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0"
stop-color="#89ae8e"
id="stop32" />
<stop
offset="1"
stop-color="#79a79f"
id="stop34" />
</linearGradient>
<linearGradient
id="linear-gradient-7"
x1="330.54999"
y1="350.38"
x2="312.60999"
y2="365.42001"
gradientTransform="rotate(1.3,10830.334,-11455.762)"
gradientUnits="userSpaceOnUse">
<stop
offset="0"
stop-color="#9fc8a4"
id="stop37" />
<stop
offset="1"
stop-color="#8cc1b6"
id="stop39" />
</linearGradient>
<linearGradient
id="linear-gradient-8"
x1="304.51001"
y1="356.13"
x2="328.32999"
y2="356.13"
gradientTransform="rotate(1.3,10830.334,-11455.762)"
gradientUnits="userSpaceOnUse">
<stop
offset="0"
stop-color="#9fc8a4"
id="stop42" />
<stop
offset="0.25"
stop-color="#99c2a1"
id="stop44" />
<stop
offset="0.59"
stop-color="#88b19a"
id="stop46" />
<stop
offset="0.97"
stop-color="#6b958d"
id="stop48" />
<stop
offset="1"
stop-color="#69938c"
id="stop50" />
</linearGradient>
<linearGradient
id="linear-gradient-9"
x1="328.23999"
y1="320.20001"
x2="335.07999"
y2="312.04999"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0"
stop-color="#79a79f"
id="stop53" />
<stop
offset="0.49"
stop-color="#74a099"
id="stop55" />
<stop
offset="1"
stop-color="#69938c"
id="stop57" />
</linearGradient>
<linearGradient
id="New_Gradient_Swatch_2"
x1="338.64001"
y1="262.42001"
x2="306.78"
y2="298.69"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0"
stop-color="#9fc8a4"
id="stop60" />
<stop
offset="0.46"
stop-color="#9ac6a8"
id="stop62" />
<stop
offset="0.98"
stop-color="#8dc1b5"
id="stop64" />
<stop
offset="1"
stop-color="#8cc1b6"
id="stop66" />
</linearGradient>
<linearGradient
id="SVGID_1_"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop46-3" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop48-6" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop50-7" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop52" />
</linearGradient>
<linearGradient
id="SVGID_2_"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop61" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop63" />
</linearGradient>
<linearGradient
id="SVGID_3_"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop72" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop74" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop76" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop78" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop80" />
</linearGradient>
<linearGradient
id="SVGID_4_"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop87" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop89" />
</linearGradient>
<linearGradient
id="SVGID_5_"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop96" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop98" />
</linearGradient>
<linearGradient
id="SVGID_6_"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop105" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop107" />
</linearGradient>
<linearGradient
id="SVGID_7_"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop112" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop114" />
</linearGradient>
<linearGradient
id="SVGID_8_"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop119" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop121" />
</linearGradient>
<linearGradient
id="SVGID_9_"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop126" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop128" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop130" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop132" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop134" />
</linearGradient>
<linearGradient
id="SVGID_10_"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop141" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop143" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop145" />
</linearGradient>
<linearGradient
id="SVGID_11_"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop152" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop154" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop156" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop158" />
</linearGradient>
</defs>
<title
id="title71">Artboard 1 copy 5 Kopie 2</title>
<g
transform="matrix(0.99921713,0,0,0.99921713,-364.85552,-162.38673)"
id="g41">
<g
id="g43">
<linearGradient
id="linearGradient3548"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop3550" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop3552" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop3554" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3556" />
</linearGradient>
<path
style="fill:url(#SVGID_1_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -7.5,-5 -9.7,-9 -13.7,-14 -1.2,2.6 -2.2,5.8 -3,9.6 1.8,3.1 8.7,13.4 28.1,21.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -17.3,-6.3 -25,-15.1 -28,-19.9 -0.8,4.9 -1.1,10.6 -0.7,16.5 5.2,4.7 14,11 26.9,15.4 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -12.1,-2.9 -20.5,-8.4 -26.1,-13.3 0.5,4.3 1.4,8.6 2.8,13 0.3,1 0.7,2.1 1.1,3 4.4,2 9.6,3.9 15.4,5.2 1.1,0.2 4.3,1.1 4.3,1.1 l 3.8,1 -4,-0.2 c -0.1,0 -3.4,-0.2 -4.5,-0.4 -5.1,-0.7 -9.8,-2 -13.9,-3.6 6.6,13.7 18.8,21.4 35.2,27.5 18.7,7 19.4,25 19.4,25 0,0 5.1,-3.8 9.6,-18.4 5.1,-16.2 -0.3,-30.6 -6.2,-40.7 z"
id="path54" />
</g>
<g
id="g56">
<g
id="g58">
<linearGradient
id="linearGradient3561"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3563" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3565" />
</linearGradient>
<path
style="fill:url(#SVGID_2_)"
inkscape:connector-curvature="0"
d="m 458.6,233.8 c 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2.1 1.3,-5 0.3,-8.1 -0.8,-2.5 -6.5,-6.2 -11.2,-4.7 -5.1,1.7 -6.1,8.1 -6.5,10.9 -0.6,4.3 0.4,10.9 2.8,17.6 -0.1,0 2.1,-0.2 6.1,-3.2 z"
id="path65" />
</g>
<g
id="g67">
<g
id="g69">
<linearGradient
id="linearGradient3570"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3572" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop3574" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop3576" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop3578" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3580" />
</linearGradient>
<path
style="fill:url(#SVGID_3_)"
inkscape:connector-curvature="0"
d="m 449.7,219.4 c 0.4,-2.8 1.4,-9.2 6.5,-10.9 4.2,-1.4 9.3,1.5 10.8,3.9 -1.5,-3.9 -5.6,-6.6 -9,-8.3 -4.8,-2.5 -10.8,-2.9 -15.7,-1.7 -4.6,1.1 -7,3.6 -10.9,6.9 0.8,1.1 1.6,2.2 2.2,3.3 4.6,8 9,18.6 8.2,30.6 3,-5 9.7,-6.1 10.6,-6.2 -2.4,-6.6 -3.4,-13.3 -2.7,-17.6 z"
id="path82" />
</g>
<g
id="g84">
<linearGradient
id="linearGradient3584"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3586" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3588" />
</linearGradient>
<path
style="fill:url(#SVGID_4_)"
inkscape:connector-curvature="0"
d="m 457.6,234.5 c -0.1,0 -0.1,0.1 -0.1,0.1 0,0 0.1,0 0.1,-0.1 z"
id="path91-5" />
</g>
<g
id="g93">
<linearGradient
id="linearGradient3592"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3594" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3596" />
</linearGradient>
<path
style="fill:url(#SVGID_5_)"
inkscape:connector-curvature="0"
d="m 467.4,213.2 c -0.1,-0.2 -0.2,-0.5 -0.4,-0.8 0.7,1.7 0.8,3.7 0.1,5.9 -1.5,4.9 -1.8,7.1 -6.1,12.9 -1,1.3 -2.2,2.4 -3.4,3.2 0.3,-0.2 0.6,-0.4 1,-0.7 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2 1.2,-4.9 0.3,-8 z"
id="path100" />
</g>
<g
id="g102">
<linearGradient
id="linearGradient3600"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3602" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3604" />
</linearGradient>
<path
style="fill:url(#SVGID_6_)"
inkscape:connector-curvature="0"
d="m 452.4,237 c 0,0 0,0 0,0 0,0 1.8,-0.2 5,-2.4 -2.5,1.7 -4.9,2.4 -4.9,2.4 0,0 0,0 -0.1,0 z"
id="path109" />
</g>
</g>
<linearGradient
id="linearGradient3607"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop3609" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop3611" />
</linearGradient>
<path
style="fill:url(#SVGID_7_)"
inkscape:connector-curvature="0"
d="m 458.2,217.6 c -1,-0.3 -2,0 -2.8,0.6 -0.2,0.3 -0.3,0.6 -0.4,0.9 -0.4,1.6 0.5,3.3 2.2,3.7 0.7,0.2 1.3,0.1 1.9,-0.1 -0.9,6.9 -5.9,12.4 -6.9,13.5 0.1,0.4 0.2,0.5 0.2,0.7 0.3,0 0.4,-0.1 0.9,-0.2 1.7,-1.9 6.7,-7.9 7,-15.5 0.5,-1.5 -0.5,-3.1 -2.1,-3.6 z"
id="path116" />
</g>
<linearGradient
id="linearGradient3614"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3616" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3618" />
</linearGradient>
<path
style="fill:url(#SVGID_8_)"
inkscape:connector-curvature="0"
d="m 405.5,261.4 c 1.5,12.7 7.5,31.7 27.8,47.9 0,0 10.1,-15.4 0.4,-32.5 -9.7,-17.1 -23.8,-22.7 -28.8,-24.5 -0.2,3.6 0.4,6.8 0.6,9.1 z"
id="path123" />
<linearGradient
id="linearGradient3621"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3623" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop3625" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop3627" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop3629" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3631" />
</linearGradient>
<path
style="fill:url(#SVGID_9_)"
inkscape:connector-curvature="0"
d="m 423.7,272.8 c -5.7,-10 -12.8,-16.8 -18.8,-20.5 -0.1,3.2 0.4,7 0.6,9.1 1.2,10.8 5.8,26.1 19.6,40.4 2.4,-5.5 5.5,-16.8 -1.4,-29 z"
id="path136" />
<g
id="g138">
<linearGradient
id="linearGradient3635"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop3637" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop3639" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3641" />
</linearGradient>
<path
style="fill:url(#SVGID_10_)"
inkscape:connector-curvature="0"
d="m 411.9,246.7 c -2,-0.8 -4.9,-1.6 -6.8,-2.4 -0.3,2.5 -0.2,5.1 -0.2,8.1 4.4,1.6 16.1,6.2 25.5,19.3 0,-0.1 0,-0.2 0,-0.3 -0.2,-2.3 -1.1,-18.3 -18.5,-24.7 z"
id="path147" />
</g>
<g
id="g149">
<linearGradient
id="linearGradient3645"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3647" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop3649" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop3651" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3653" />
</linearGradient>
<path
style="fill:url(#SVGID_11_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -2.1,-1.4 -3.8,-2.7 -5.2,-4 -0.4,3.6 -0.6,7.5 -0.4,11.6 4.2,3.2 9.7,6.5 16.9,9.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -6.8,-2.5 -12.1,-5.3 -16.2,-8.2 0.4,5 1.3,10.1 2.9,15.2 3.4,1.8 7.2,3.4 11.6,4.9 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -3.7,-0.9 -7,-2 -10,-3.3 1.9,4.8 4.4,8.8 7.4,12.3 0.1,0 0.1,0 0.1,0 l 3.8,1 -3.2,-0.2 c 6.9,7.7 16.3,13.3 26.3,21.3 13.5,10.8 9.2,27.2 9.2,27.2 0,0 0.8,-0.6 1.5,-1.5 1.8,-2.1 5.1,-7 8.1,-16.9 5,-16.1 -0.4,-30.5 -6.3,-40.6 z"
id="path160" />
</g>
</g>
<path
class="cls-12"
d="m 123.04694,85.32 c 1,-0.25 2.33,-0.52 4,-0.8 a 33.84,33.84 0 0 1 5.74,-0.43 12.37,12.37 0 0 1 4.84,0.83 7.52,7.52 0 0 1 3.08,2.3 8.85,8.85 0 0 1 1.62,3.55 20.81,20.81 0 0 1 0.47,4.56 v 13.72 h -4.37 V 96.27 a 20.35,20.35 0 0 0 -0.31,-3.86 6.48,6.48 0 0 0 -1,-2.58 4,4 0 0 0 -1.88,-1.44 8.41,8.41 0 0 0 -2.91,-0.44 c -0.47,0 -1,0 -1.46,0 l -1.43,0.12 c -0.46,0.05 -0.86,0.1 -1.22,0.17 l -0.78,0.14 v 20.63 h -4.37 z"
id="path95"
style="fill:#fafafa;fill-opacity:1" />
<path
class="cls-12"
d="m 153.92694,113.61 a 9,9 0 0 0 1.34,0.45 6.55,6.55 0 0 0 1.62,0.21 6.39,6.39 0 0 0 4,-1.15 11.7,11.7 0 0 0 2.78,-4.07 126.9,126.9 0 0 1 -5.67,-11.63 106.17,106.17 0 0 1 -4.17,-12.81 h 4.7 c 0.35,1.41 0.76,2.93 1.25,4.56 0.49,1.63 1,3.31 1.62,5 0.62,1.69 1.24,3.45 1.92,5.17 0.68,1.72 1.41,3.38 2.17,5 q 1.78,-4.93 3.1,-9.78 1.32,-4.85 2.49,-10 h 4.51 q -1.7,6.92 -3.76,13.28 c -1.38,4.24 -2.86,8.22 -4.46,11.91 a 26,26 0 0 1 -1.95,3.65 11.23,11.23 0 0 1 -2.24,2.51 8.18,8.18 0 0 1 -2.75,1.46 11.8,11.8 0 0 1 -3.45,0.47 10.11,10.11 0 0 1 -1.08,-0.07 c -0.38,-0.05 -0.75,-0.11 -1.11,-0.19 -0.36,-0.08 -0.69,-0.17 -1,-0.26 a 3.68,3.68 0 0 1 -0.64,-0.24 z"
id="path97"
style="fill:#fafafa;fill-opacity:1" />
<path
class="cls-12"
d="m 185.74694,85.32 c 1,-0.25 2.33,-0.52 4,-0.8 a 33.3,33.3 0 0 1 5.71,-0.43 10.78,10.78 0 0 1 3.95,0.64 6.9,6.9 0 0 1 2.68,1.85 c 0.22,-0.15 0.56,-0.37 1,-0.65 a 11.39,11.39 0 0 1 1.74,-0.83 18.69,18.69 0 0 1 2.31,-0.7 11.73,11.73 0 0 1 2.72,-0.31 11.05,11.05 0 0 1 4.61,0.83 6.61,6.61 0 0 1 2.8,2.32 9.27,9.27 0 0 1 1.36,3.57 27.56,27.56 0 0 1 0.35,4.52 v 13.72 h -4.37 V 96.27 a 28.36,28.36 0 0 0 -0.21,-3.72 7.19,7.19 0 0 0 -0.8,-2.58 3.63,3.63 0 0 0 -1.6,-1.53 6,6 0 0 0 -2.6,-0.45 8.42,8.42 0 0 0 -3.53,0.89 12,12 0 0 0 -2,1.09 11.57,11.57 0 0 1 0.45,2.3 23.06,23.06 0 0 1 0.19,3.06 v 13.72 h -4.37 V 96.27 a 26.42,26.42 0 0 0 -0.23,-3.72 7.6,7.6 0 0 0 -0.83,-2.58 3.66,3.66 0 0 0 -1.59,-1.53 5.86,5.86 0 0 0 -2.57,-0.49 c -0.44,0 -0.91,0 -1.41,0 l -1.43,0.12 c -0.45,0.05 -0.87,0.1 -1.25,0.17 l -0.75,0.14 v 20.63 h -4.37 z"
id="path99"
style="fill:#fafafa;fill-opacity:1" />
<path
class="cls-12"
d="m 271.19694,84 a 12.82,12.82 0 0 1 4.45,0.68 6.95,6.95 0 0 1 4.48,4.89 14,14 0 0 1 0.47,3.78 v 15.18 c -0.38,0.09 -1,0.25 -1.64,0.35 -0.64,0.1 -1.36,0.22 -2.21,0.31 -0.85,0.09 -1.76,0.18 -2.75,0.26 -0.99,0.08 -2,0.12 -2.94,0.12 a 15.56,15.56 0 0 1 -3.8,-0.43 8.44,8.44 0 0 1 -3,-1.33 6.15,6.15 0 0 1 -2,-2.43 8.42,8.42 0 0 1 -0.7,-3.61 6.94,6.94 0 0 1 0.82,-3.48 6.53,6.53 0 0 1 2.23,-2.35 10.22,10.22 0 0 1 3.29,-1.32 18.12,18.12 0 0 1 3.93,-0.41 12.78,12.78 0 0 1 1.36,0.07 c 0.47,0.05 0.92,0.11 1.34,0.19 l 1.11,0.21 0.66,0.14 V 93.6 a 9.62,9.62 0 0 0 -0.24,-2.14 5,5 0 0 0 -0.84,-1.88 4.35,4.35 0 0 0 -1.67,-1.32 6.54,6.54 0 0 0 -2.75,-0.49 19.17,19.17 0 0 0 -3.73,0.36 11,11 0 0 0 -2.42,0.81 l -0.71,-3.61 a 12.49,12.49 0 0 1 3,-1 24.77,24.77 0 0 1 4.26,-0.33 z m 0.38,21.9 c 1,0 2,0 2.75,-0.07 a 11.93,11.93 0 0 0 2,-0.26 v -7.28 a 5.63,5.63 0 0 0 -1.53,-0.4 16.92,16.92 0 0 0 -2.56,-0.17 15.46,15.46 0 0 0 -2.09,0.15 6.49,6.49 0 0 0 -2,0.58 4.29,4.29 0 0 0 -1.53,1.22 3.21,3.21 0 0 0 -0.61,2.05 3.53,3.53 0 0 0 1.5,3.27 7.85,7.85 0 0 0 4.07,0.91 z"
id="path101"
style="fill:#fafafa;fill-opacity:1" />
<path
class="cls-12"
d="m 230.36694,96.88 a 15.81,15.81 0 0 1 0.94,-5.67 11.75,11.75 0 0 1 2.5,-4 10,10 0 0 1 3.57,-2.4 11.15,11.15 0 0 1 4.13,-0.8 q 4.94,0 7.57,3.08 c 1.75,2.05 2.63,5.18 2.63,9.37 v 0.75 a 7.21,7.21 0 0 1 0,0.83 h -16.78 a 9,9 0 0 0 2.21,5.78 c 1.29,1.31 3.29,2 6,2 a 15.9,15.9 0 0 0 3.88,-0.4 15,15 0 0 0 2.65,-1 l 0.61,3.67 a 14,14 0 0 1 -3.08,1.12 19.58,19.58 0 0 1 -4.53,0.43 14.45,14.45 0 0 1 -5.52,-0.92 10.26,10.26 0 0 1 -3.83,-2.65 10.84,10.84 0 0 1 -2.24,-4 17.17,17.17 0 0 1 -0.71,-5.19 z m 16.78,-2.4 a 7.33,7.33 0 0 0 -1.48,-4.86 5.1,5.1 0 0 0 -4.2,-1.91 5.79,5.79 0 0 0 -2.66,0.59 6.14,6.14 0 0 0 -2,1.53 7.11,7.11 0 0 0 -1.25,2.16 10.73,10.73 0 0 0 -0.58,2.49 z"
id="path103"
style="fill:#fafafa;fill-opacity:1" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

603
nymea-app/styles/dark/logo.svg
View File

@ -1,603 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="256"
height="256"
id="svg2"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="logo.svg"
inkscape:export-filename="/home/micha/Develop/mea/mea/guh-logo-256x256.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs4">
<linearGradient
id="SVGID_1_"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop46" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop48" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop50" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop52" />
</linearGradient>
<linearGradient
id="SVGID_2_"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop61" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop63" />
</linearGradient>
<linearGradient
id="SVGID_3_"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop72" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop74" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop76" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop78" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop80" />
</linearGradient>
<linearGradient
id="SVGID_4_"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop87" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop89" />
</linearGradient>
<linearGradient
id="SVGID_5_"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop96" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop98" />
</linearGradient>
<linearGradient
id="SVGID_6_"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop105" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop107" />
</linearGradient>
<linearGradient
id="SVGID_7_"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop112" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop114" />
</linearGradient>
<linearGradient
id="SVGID_8_"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop119" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop121" />
</linearGradient>
<linearGradient
id="SVGID_9_"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop126" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop128" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop130" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop132" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop134" />
</linearGradient>
<linearGradient
id="SVGID_10_"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop141" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop143" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop145" />
</linearGradient>
<linearGradient
id="SVGID_11_"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop152" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop154" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop156" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop158" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.959798"
inkscape:cx="83.152338"
inkscape:cy="132.37098"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="2880"
inkscape:window-height="1698"
inkscape:window-x="0"
inkscape:window-y="44"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0">
<inkscape:grid
type="xygrid"
id="grid922" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-143.41788,-709.27353)">
<g
transform="matrix(1.4088177,0,0,1.4088177,-318.98436,501.41139)"
id="g41">
<g
id="g43">
<linearGradient
id="linearGradient3548"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop3550" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop3552" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop3554" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3556" />
</linearGradient>
<path
style="fill:url(#SVGID_1_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -7.5,-5 -9.7,-9 -13.7,-14 -1.2,2.6 -2.2,5.8 -3,9.6 1.8,3.1 8.7,13.4 28.1,21.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -17.3,-6.3 -25,-15.1 -28,-19.9 -0.8,4.9 -1.1,10.6 -0.7,16.5 5.2,4.7 14,11 26.9,15.4 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -12.1,-2.9 -20.5,-8.4 -26.1,-13.3 0.5,4.3 1.4,8.6 2.8,13 0.3,1 0.7,2.1 1.1,3 4.4,2 9.6,3.9 15.4,5.2 1.1,0.2 4.3,1.1 4.3,1.1 l 3.8,1 -4,-0.2 c -0.1,0 -3.4,-0.2 -4.5,-0.4 -5.1,-0.7 -9.8,-2 -13.9,-3.6 6.6,13.7 18.8,21.4 35.2,27.5 18.7,7 19.4,25 19.4,25 0,0 5.1,-3.8 9.6,-18.4 5.1,-16.2 -0.3,-30.6 -6.2,-40.7 z"
id="path54" />
</g>
<g
id="g56">
<g
id="g58">
<linearGradient
id="linearGradient3561"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3563" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3565" />
</linearGradient>
<path
style="fill:url(#SVGID_2_)"
inkscape:connector-curvature="0"
d="m 458.6,233.8 c 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2.1 1.3,-5 0.3,-8.1 -0.8,-2.5 -6.5,-6.2 -11.2,-4.7 -5.1,1.7 -6.1,8.1 -6.5,10.9 -0.6,4.3 0.4,10.9 2.8,17.6 -0.1,0 2.1,-0.2 6.1,-3.2 z"
id="path65" />
</g>
<g
id="g67">
<g
id="g69">
<linearGradient
id="linearGradient3570"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3572" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop3574" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop3576" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop3578" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3580" />
</linearGradient>
<path
style="fill:url(#SVGID_3_)"
inkscape:connector-curvature="0"
d="m 449.7,219.4 c 0.4,-2.8 1.4,-9.2 6.5,-10.9 4.2,-1.4 9.3,1.5 10.8,3.9 -1.5,-3.9 -5.6,-6.6 -9,-8.3 -4.8,-2.5 -10.8,-2.9 -15.7,-1.7 -4.6,1.1 -7,3.6 -10.9,6.9 0.8,1.1 1.6,2.2 2.2,3.3 4.6,8 9,18.6 8.2,30.6 3,-5 9.7,-6.1 10.6,-6.2 -2.4,-6.6 -3.4,-13.3 -2.7,-17.6 z"
id="path82" />
</g>
<g
id="g84">
<linearGradient
id="linearGradient3584"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3586" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3588" />
</linearGradient>
<path
style="fill:url(#SVGID_4_)"
inkscape:connector-curvature="0"
d="m 457.6,234.5 c -0.1,0 -0.1,0.1 -0.1,0.1 0,0 0.1,0 0.1,-0.1 z"
id="path91" />
</g>
<g
id="g93">
<linearGradient
id="linearGradient3592"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3594" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3596" />
</linearGradient>
<path
style="fill:url(#SVGID_5_)"
inkscape:connector-curvature="0"
d="m 467.4,213.2 c -0.1,-0.2 -0.2,-0.5 -0.4,-0.8 0.7,1.7 0.8,3.7 0.1,5.9 -1.5,4.9 -1.8,7.1 -6.1,12.9 -1,1.3 -2.2,2.4 -3.4,3.2 0.3,-0.2 0.6,-0.4 1,-0.7 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2 1.2,-4.9 0.3,-8 z"
id="path100" />
</g>
<g
id="g102">
<linearGradient
id="linearGradient3600"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3602" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3604" />
</linearGradient>
<path
style="fill:url(#SVGID_6_)"
inkscape:connector-curvature="0"
d="m 452.4,237 c 0,0 0,0 0,0 0,0 1.8,-0.2 5,-2.4 -2.5,1.7 -4.9,2.4 -4.9,2.4 0,0 0,0 -0.1,0 z"
id="path109" />
</g>
</g>
<linearGradient
id="linearGradient3607"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop3609" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop3611" />
</linearGradient>
<path
style="fill:url(#SVGID_7_)"
inkscape:connector-curvature="0"
d="m 458.2,217.6 c -1,-0.3 -2,0 -2.8,0.6 -0.2,0.3 -0.3,0.6 -0.4,0.9 -0.4,1.6 0.5,3.3 2.2,3.7 0.7,0.2 1.3,0.1 1.9,-0.1 -0.9,6.9 -5.9,12.4 -6.9,13.5 0.1,0.4 0.2,0.5 0.2,0.7 0.3,0 0.4,-0.1 0.9,-0.2 1.7,-1.9 6.7,-7.9 7,-15.5 0.5,-1.5 -0.5,-3.1 -2.1,-3.6 z"
id="path116" />
</g>
<linearGradient
id="linearGradient3614"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3616" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3618" />
</linearGradient>
<path
style="fill:url(#SVGID_8_)"
inkscape:connector-curvature="0"
d="m 405.5,261.4 c 1.5,12.7 7.5,31.7 27.8,47.9 0,0 10.1,-15.4 0.4,-32.5 -9.7,-17.1 -23.8,-22.7 -28.8,-24.5 -0.2,3.6 0.4,6.8 0.6,9.1 z"
id="path123" />
<linearGradient
id="linearGradient3621"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3623" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop3625" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop3627" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop3629" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3631" />
</linearGradient>
<path
style="fill:url(#SVGID_9_)"
inkscape:connector-curvature="0"
d="m 423.7,272.8 c -5.7,-10 -12.8,-16.8 -18.8,-20.5 -0.1,3.2 0.4,7 0.6,9.1 1.2,10.8 5.8,26.1 19.6,40.4 2.4,-5.5 5.5,-16.8 -1.4,-29 z"
id="path136" />
<g
id="g138">
<linearGradient
id="linearGradient3635"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop3637" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop3639" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3641" />
</linearGradient>
<path
style="fill:url(#SVGID_10_)"
inkscape:connector-curvature="0"
d="m 411.9,246.7 c -2,-0.8 -4.9,-1.6 -6.8,-2.4 -0.3,2.5 -0.2,5.1 -0.2,8.1 4.4,1.6 16.1,6.2 25.5,19.3 0,-0.1 0,-0.2 0,-0.3 -0.2,-2.3 -1.1,-18.3 -18.5,-24.7 z"
id="path147" />
</g>
<g
id="g149">
<linearGradient
id="linearGradient3645"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3647" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop3649" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop3651" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3653" />
</linearGradient>
<path
style="fill:url(#SVGID_11_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -2.1,-1.4 -3.8,-2.7 -5.2,-4 -0.4,3.6 -0.6,7.5 -0.4,11.6 4.2,3.2 9.7,6.5 16.9,9.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -6.8,-2.5 -12.1,-5.3 -16.2,-8.2 0.4,5 1.3,10.1 2.9,15.2 3.4,1.8 7.2,3.4 11.6,4.9 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -3.7,-0.9 -7,-2 -10,-3.3 1.9,4.8 4.4,8.8 7.4,12.3 0.1,0 0.1,0 0.1,0 l 3.8,1 -3.2,-0.2 c 6.9,7.7 16.3,13.3 26.3,21.3 13.5,10.8 9.2,27.2 9.2,27.2 0,0 0.8,-0.6 1.5,-1.5 1.8,-2.1 5.1,-7 8.1,-16.9 5,-16.1 -0.4,-30.5 -6.3,-40.6 z"
id="path160" />
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 17 B

1
nymea-app/styles/dark/logo.svg Symbolic link
View File

@ -0,0 +1 @@
../light/logo.svg
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 17 B

75
nymea-app/styles/energize/ApplicationWindow.qml
View File

@ -1,75 +0,0 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2020, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
* This project including source code and documentation is protected by
* copyright law, and remains the property of nymea GmbH. All rights, including
* reproduction, publication, editing and translation, are reserved. The use of
* this project is subject to the terms of a license agreement to be concluded
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
* under https://nymea.io/license
*
* GNU General Public License Usage
* Alternatively, this project may be redistributed and/or modified under the
* terms of the GNU General Public License as published by the Free Software
* Foundation, GNU version 3. This project is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
* this project. If not, see <https://www.gnu.org/licenses/>.
*
* For any further details and any questions please contact us under
* contact@nymea.io or see our FAQ/Licensing Information on
* https://nymea.io/license/faq
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.0
import QtQuick.Templates 2.2
import QtQuick.Controls.Material 2.2
ApplicationWindow {
// The app style
Material.theme: Material.Light
// Main background color
Material.background: "#FFFFFF"
font.pixelSize: 14
font.weight: Font.Normal
font.capitalization: Font.MixedCase
font.family: "Ubuntu"
// The core system name.
property string systemName: "nymea"
// The app name
property string appName: "nymea:app"
// The header background color
property color primaryColor: Material.background
// Header font color
property color headerForegroundColor: "#79a79f"
// The font color
property color foregroundColor: "#638B87"
// The color of selected/highlighted things
property color accentColor: "#8cc1b6"
// colors for interfaces, e.g. icons
property var interfaceColors: {
"temperaturesensor": "#FF0000",
"humiditysensor": "#00BFFF",
"moisturesensor":"#0000FF",
"lightsensor": "#FFA500",
"conductivitysensor": "#008000",
"pressuresensor": "#808080"
}
}

2
nymea-app/styles/energize/Button.qml
View File

@ -64,7 +64,7 @@ T.Button {
font.overline: control.font.overline
font.pixelSize: app.smallFont
font.weight: Font.Bold
color: app.backgroundColor
color: Style.backgroundColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight

22
nymea-app/styles/energize/Style.qml Normal file
View File

@ -0,0 +1,22 @@
pragma Singleton
import QtQuick 2.0
import "../../ui"
StyleBase {
backgroundColor: "#ffffff"
foregroundColor: "#638B87"
headerBackgroundColor: "#ffffff"
headerForegroundColor: "#79a79f"
accentColor: "#8cc1b6"
interfaceColors: {
"temperaturesensor": "#FF0000",
"humiditysensor": "#00BFFF",
"moisturesensor":"#0000FF",
"lightsensor": "#FFA500",
"conductivitysensor": "#008000",
"pressuresensor": "#808080"
}
}

1
nymea-app/styles/energize/logo-wide.svg Symbolic link
View File

@ -0,0 +1 @@
../light/logo-wide.svg

78
nymea-app/styles/light/ApplicationWindow.qml
View File

@ -1,78 +0,0 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2020, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
* This project including source code and documentation is protected by
* copyright law, and remains the property of nymea GmbH. All rights, including
* reproduction, publication, editing and translation, are reserved. The use of
* this project is subject to the terms of a license agreement to be concluded
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
* under https://nymea.io/license
*
* GNU General Public License Usage
* Alternatively, this project may be redistributed and/or modified under the
* terms of the GNU General Public License as published by the Free Software
* Foundation, GNU version 3. This project is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
* this project. If not, see <https://www.gnu.org/licenses/>.
*
* For any further details and any questions please contact us under
* contact@nymea.io or see our FAQ/Licensing Information on
* https://nymea.io/license/faq
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.0
import QtQuick.Templates 2.2
import QtQuick.Controls.Material 2.2
ApplicationWindow {
font.pixelSize: 16
font.weight: Font.Normal
font.capitalization: Font.MixedCase
font.family: "Ubuntu"
// The core system name.
property string systemName: "nymea"
// The app name
property string appName: "nymea:app"
// The header background color
property color primaryColor: "white"
// Header font color
property color headerForegroundColor: Material.foreground
// The font color
property color foregroundColor: Material.foreground
// The color of selected/highlighted things
property color accentColor: "#ff57baae"
// colors for interfaces, e.g. icons
property var interfaceColors: {
"temperaturesensor": "red",
"humiditysensor": "deepskyblue",
"moisturesensor":"blue",
"lightsensor": "orange",
"conductivitysensor": "green",
"pressuresensor": "grey",
"noisesensor": "darkviolet",
"co2sensor": "turquoise",
"smartmeterproducer": "lightgreen",
"smartmeterconsumer": "orange",
"extendedsmartmeterproducer": "blue",
"extendedsmartmeterconsumer": "blue"
}
// Optional: Set this to override the cloud environment
//property string cloudEnvironment: "Community"
}

7
nymea-app/styles/light/Style.qml Normal file
View File

@ -0,0 +1,7 @@
pragma Singleton
import QtQuick 2.0
import "../../ui"
StyleBase {
// This is the default style. No overrides
}

822
nymea-app/styles/light/logo-wide.svg Normal file
View File

@ -0,0 +1,822 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="Layer_1"
data-name="Layer 1"
viewBox="0 0 285.59808 151.71999"
version="1.1"
sodipodi:docname="logo-wide.svg"
width="285.59808"
height="151.72"
inkscape:version="1.0.1 (1.0.1+r74)">
<metadata
id="metadata108">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Artboard 1 copy 5 Kopie 2</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1380"
inkscape:window-height="873"
id="namedview106"
showgrid="false"
lock-margins="true"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
inkscape:zoom="2.3158153"
inkscape:cx="129.50276"
inkscape:cy="58.748251"
inkscape:window-x="60"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
<defs
id="defs69">
<style
id="style2">.cls-1{fill:url(#New_Gradient_Swatch_1);}.cls-2{fill:url(#linear-gradient);}.cls-3{fill:url(#linear-gradient-2);}.cls-4{fill:url(#linear-gradient-3);}.cls-5{fill:url(#linear-gradient-4);}.cls-6{fill:url(#linear-gradient-5);}.cls-7{fill:url(#linear-gradient-6);}.cls-8{fill:url(#linear-gradient-7);}.cls-9{fill:url(#linear-gradient-8);}.cls-10{fill:url(#linear-gradient-9);}.cls-11{fill:url(#New_Gradient_Swatch_2);}.cls-12{fill:#676767;}</style>
<linearGradient
id="New_Gradient_Swatch_1"
x1="282.06"
y1="231.14"
x2="354.72"
y2="321.84"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0.13"
stop-color="#9fc8a4"
id="stop4" />
<stop
offset="0.4"
stop-color="#92bc9e"
id="stop6" />
<stop
offset="0.9"
stop-color="#719b8f"
id="stop8" />
<stop
offset="1"
stop-color="#69938c"
id="stop10" />
</linearGradient>
<linearGradient
id="linear-gradient"
x1="252.74001"
y1="539.15997"
x2="235.17"
y2="539.15997"
gradientTransform="matrix(0.97,0.26,-0.26,0.97,272.36,-301.35)"
gradientUnits="userSpaceOnUse">
<stop
offset="0"
stop-color="#e3eae4"
id="stop13" />
<stop
offset="1"
stop-color="#cde2d8"
id="stop15" />
</linearGradient>
<linearGradient
id="linear-gradient-2"
x1="364.04999"
y1="261.20999"
x2="355.76999"
y2="302.63"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0"
stop-color="#9fc8a4"
id="stop18" />
<stop
offset="0.27"
stop-color="#9bc4a2"
id="stop20" />
<stop
offset="0.54"
stop-color="#8fb89d"
id="stop22" />
<stop
offset="0.82"
stop-color="#7ba494"
id="stop24" />
<stop
offset="1"
stop-color="#69938c"
id="stop26" />
</linearGradient>
<linearGradient
id="linear-gradient-3"
x1="370.64999"
y1="293.82999"
x2="370.51001"
y2="293.82999"
xlink:href="#linear-gradient"
gradientTransform="translate(-278.17306,-221.79)" />
<linearGradient
id="linear-gradient-4"
x1="380.91"
y1="282.75"
x2="370.64999"
y2="282.75"
xlink:href="#linear-gradient"
gradientTransform="translate(-278.17306,-221.79)" />
<linearGradient
id="linear-gradient-5"
x1="370.51001"
y1="295.07999"
x2="365.47"
y2="295.07999"
xlink:href="#linear-gradient"
gradientTransform="translate(-278.17306,-221.79)" />
<linearGradient
id="linear-gradient-6"
x1="365.22"
y1="286.54001"
x2="373.5"
y2="286.54001"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0"
stop-color="#89ae8e"
id="stop32" />
<stop
offset="1"
stop-color="#79a79f"
id="stop34" />
</linearGradient>
<linearGradient
id="linear-gradient-7"
x1="330.54999"
y1="350.38"
x2="312.60999"
y2="365.42001"
gradientTransform="rotate(1.3,10830.334,-11455.762)"
gradientUnits="userSpaceOnUse">
<stop
offset="0"
stop-color="#9fc8a4"
id="stop37" />
<stop
offset="1"
stop-color="#8cc1b6"
id="stop39" />
</linearGradient>
<linearGradient
id="linear-gradient-8"
x1="304.51001"
y1="356.13"
x2="328.32999"
y2="356.13"
gradientTransform="rotate(1.3,10830.334,-11455.762)"
gradientUnits="userSpaceOnUse">
<stop
offset="0"
stop-color="#9fc8a4"
id="stop42" />
<stop
offset="0.25"
stop-color="#99c2a1"
id="stop44" />
<stop
offset="0.59"
stop-color="#88b19a"
id="stop46" />
<stop
offset="0.97"
stop-color="#6b958d"
id="stop48" />
<stop
offset="1"
stop-color="#69938c"
id="stop50" />
</linearGradient>
<linearGradient
id="linear-gradient-9"
x1="328.23999"
y1="320.20001"
x2="335.07999"
y2="312.04999"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0"
stop-color="#79a79f"
id="stop53" />
<stop
offset="0.49"
stop-color="#74a099"
id="stop55" />
<stop
offset="1"
stop-color="#69938c"
id="stop57" />
</linearGradient>
<linearGradient
id="New_Gradient_Swatch_2"
x1="338.64001"
y1="262.42001"
x2="306.78"
y2="298.69"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-278.17306,-221.79)">
<stop
offset="0"
stop-color="#9fc8a4"
id="stop60" />
<stop
offset="0.46"
stop-color="#9ac6a8"
id="stop62" />
<stop
offset="0.98"
stop-color="#8dc1b5"
id="stop64" />
<stop
offset="1"
stop-color="#8cc1b6"
id="stop66" />
</linearGradient>
<linearGradient
id="SVGID_1_"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop46-3" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop48-6" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop50-7" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop52" />
</linearGradient>
<linearGradient
id="SVGID_2_"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop61" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop63" />
</linearGradient>
<linearGradient
id="SVGID_3_"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop72" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop74" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop76" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop78" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop80" />
</linearGradient>
<linearGradient
id="SVGID_4_"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop87" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop89" />
</linearGradient>
<linearGradient
id="SVGID_5_"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop96" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop98" />
</linearGradient>
<linearGradient
id="SVGID_6_"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop105" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop107" />
</linearGradient>
<linearGradient
id="SVGID_7_"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop112" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop114" />
</linearGradient>
<linearGradient
id="SVGID_8_"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop119" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop121" />
</linearGradient>
<linearGradient
id="SVGID_9_"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop126" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop128" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop130" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop132" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop134" />
</linearGradient>
<linearGradient
id="SVGID_10_"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop141" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop143" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop145" />
</linearGradient>
<linearGradient
id="SVGID_11_"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop152" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop154" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop156" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop158" />
</linearGradient>
</defs>
<title
id="title71">Artboard 1 copy 5 Kopie 2</title>
<g
transform="matrix(0.99921713,0,0,0.99921713,-364.85552,-162.38673)"
id="g41">
<g
id="g43">
<linearGradient
id="linearGradient3548"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop3550" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop3552" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop3554" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3556" />
</linearGradient>
<path
style="fill:url(#SVGID_1_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -7.5,-5 -9.7,-9 -13.7,-14 -1.2,2.6 -2.2,5.8 -3,9.6 1.8,3.1 8.7,13.4 28.1,21.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -17.3,-6.3 -25,-15.1 -28,-19.9 -0.8,4.9 -1.1,10.6 -0.7,16.5 5.2,4.7 14,11 26.9,15.4 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -12.1,-2.9 -20.5,-8.4 -26.1,-13.3 0.5,4.3 1.4,8.6 2.8,13 0.3,1 0.7,2.1 1.1,3 4.4,2 9.6,3.9 15.4,5.2 1.1,0.2 4.3,1.1 4.3,1.1 l 3.8,1 -4,-0.2 c -0.1,0 -3.4,-0.2 -4.5,-0.4 -5.1,-0.7 -9.8,-2 -13.9,-3.6 6.6,13.7 18.8,21.4 35.2,27.5 18.7,7 19.4,25 19.4,25 0,0 5.1,-3.8 9.6,-18.4 5.1,-16.2 -0.3,-30.6 -6.2,-40.7 z"
id="path54" />
</g>
<g
id="g56">
<g
id="g58">
<linearGradient
id="linearGradient3561"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3563" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3565" />
</linearGradient>
<path
style="fill:url(#SVGID_2_)"
inkscape:connector-curvature="0"
d="m 458.6,233.8 c 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2.1 1.3,-5 0.3,-8.1 -0.8,-2.5 -6.5,-6.2 -11.2,-4.7 -5.1,1.7 -6.1,8.1 -6.5,10.9 -0.6,4.3 0.4,10.9 2.8,17.6 -0.1,0 2.1,-0.2 6.1,-3.2 z"
id="path65" />
</g>
<g
id="g67">
<g
id="g69">
<linearGradient
id="linearGradient3570"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3572" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop3574" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop3576" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop3578" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3580" />
</linearGradient>
<path
style="fill:url(#SVGID_3_)"
inkscape:connector-curvature="0"
d="m 449.7,219.4 c 0.4,-2.8 1.4,-9.2 6.5,-10.9 4.2,-1.4 9.3,1.5 10.8,3.9 -1.5,-3.9 -5.6,-6.6 -9,-8.3 -4.8,-2.5 -10.8,-2.9 -15.7,-1.7 -4.6,1.1 -7,3.6 -10.9,6.9 0.8,1.1 1.6,2.2 2.2,3.3 4.6,8 9,18.6 8.2,30.6 3,-5 9.7,-6.1 10.6,-6.2 -2.4,-6.6 -3.4,-13.3 -2.7,-17.6 z"
id="path82" />
</g>
<g
id="g84">
<linearGradient
id="linearGradient3584"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3586" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3588" />
</linearGradient>
<path
style="fill:url(#SVGID_4_)"
inkscape:connector-curvature="0"
d="m 457.6,234.5 c -0.1,0 -0.1,0.1 -0.1,0.1 0,0 0.1,0 0.1,-0.1 z"
id="path91-5" />
</g>
<g
id="g93">
<linearGradient
id="linearGradient3592"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3594" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3596" />
</linearGradient>
<path
style="fill:url(#SVGID_5_)"
inkscape:connector-curvature="0"
d="m 467.4,213.2 c -0.1,-0.2 -0.2,-0.5 -0.4,-0.8 0.7,1.7 0.8,3.7 0.1,5.9 -1.5,4.9 -1.8,7.1 -6.1,12.9 -1,1.3 -2.2,2.4 -3.4,3.2 0.3,-0.2 0.6,-0.4 1,-0.7 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2 1.2,-4.9 0.3,-8 z"
id="path100" />
</g>
<g
id="g102">
<linearGradient
id="linearGradient3600"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3602" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3604" />
</linearGradient>
<path
style="fill:url(#SVGID_6_)"
inkscape:connector-curvature="0"
d="m 452.4,237 c 0,0 0,0 0,0 0,0 1.8,-0.2 5,-2.4 -2.5,1.7 -4.9,2.4 -4.9,2.4 0,0 0,0 -0.1,0 z"
id="path109" />
</g>
</g>
<linearGradient
id="linearGradient3607"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop3609" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop3611" />
</linearGradient>
<path
style="fill:url(#SVGID_7_)"
inkscape:connector-curvature="0"
d="m 458.2,217.6 c -1,-0.3 -2,0 -2.8,0.6 -0.2,0.3 -0.3,0.6 -0.4,0.9 -0.4,1.6 0.5,3.3 2.2,3.7 0.7,0.2 1.3,0.1 1.9,-0.1 -0.9,6.9 -5.9,12.4 -6.9,13.5 0.1,0.4 0.2,0.5 0.2,0.7 0.3,0 0.4,-0.1 0.9,-0.2 1.7,-1.9 6.7,-7.9 7,-15.5 0.5,-1.5 -0.5,-3.1 -2.1,-3.6 z"
id="path116" />
</g>
<linearGradient
id="linearGradient3614"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3616" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3618" />
</linearGradient>
<path
style="fill:url(#SVGID_8_)"
inkscape:connector-curvature="0"
d="m 405.5,261.4 c 1.5,12.7 7.5,31.7 27.8,47.9 0,0 10.1,-15.4 0.4,-32.5 -9.7,-17.1 -23.8,-22.7 -28.8,-24.5 -0.2,3.6 0.4,6.8 0.6,9.1 z"
id="path123" />
<linearGradient
id="linearGradient3621"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3623" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop3625" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop3627" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop3629" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3631" />
</linearGradient>
<path
style="fill:url(#SVGID_9_)"
inkscape:connector-curvature="0"
d="m 423.7,272.8 c -5.7,-10 -12.8,-16.8 -18.8,-20.5 -0.1,3.2 0.4,7 0.6,9.1 1.2,10.8 5.8,26.1 19.6,40.4 2.4,-5.5 5.5,-16.8 -1.4,-29 z"
id="path136" />
<g
id="g138">
<linearGradient
id="linearGradient3635"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop3637" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop3639" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3641" />
</linearGradient>
<path
style="fill:url(#SVGID_10_)"
inkscape:connector-curvature="0"
d="m 411.9,246.7 c -2,-0.8 -4.9,-1.6 -6.8,-2.4 -0.3,2.5 -0.2,5.1 -0.2,8.1 4.4,1.6 16.1,6.2 25.5,19.3 0,-0.1 0,-0.2 0,-0.3 -0.2,-2.3 -1.1,-18.3 -18.5,-24.7 z"
id="path147" />
</g>
<g
id="g149">
<linearGradient
id="linearGradient3645"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3647" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop3649" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop3651" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3653" />
</linearGradient>
<path
style="fill:url(#SVGID_11_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -2.1,-1.4 -3.8,-2.7 -5.2,-4 -0.4,3.6 -0.6,7.5 -0.4,11.6 4.2,3.2 9.7,6.5 16.9,9.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -6.8,-2.5 -12.1,-5.3 -16.2,-8.2 0.4,5 1.3,10.1 2.9,15.2 3.4,1.8 7.2,3.4 11.6,4.9 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -3.7,-0.9 -7,-2 -10,-3.3 1.9,4.8 4.4,8.8 7.4,12.3 0.1,0 0.1,0 0.1,0 l 3.8,1 -3.2,-0.2 c 6.9,7.7 16.3,13.3 26.3,21.3 13.5,10.8 9.2,27.2 9.2,27.2 0,0 0.8,-0.6 1.5,-1.5 1.8,-2.1 5.1,-7 8.1,-16.9 5,-16.1 -0.4,-30.5 -6.3,-40.6 z"
id="path160" />
</g>
</g>
<path
class="cls-12"
d="m 123.04694,85.32 c 1,-0.25 2.33,-0.52 4,-0.8 a 33.84,33.84 0 0 1 5.74,-0.43 12.37,12.37 0 0 1 4.84,0.83 7.52,7.52 0 0 1 3.08,2.3 8.85,8.85 0 0 1 1.62,3.55 20.81,20.81 0 0 1 0.47,4.56 v 13.72 h -4.37 V 96.27 a 20.35,20.35 0 0 0 -0.31,-3.86 6.48,6.48 0 0 0 -1,-2.58 4,4 0 0 0 -1.88,-1.44 8.41,8.41 0 0 0 -2.91,-0.44 c -0.47,0 -1,0 -1.46,0 l -1.43,0.12 c -0.46,0.05 -0.86,0.1 -1.22,0.17 l -0.78,0.14 v 20.63 h -4.37 z"
id="path95" />
<path
class="cls-12"
d="m 153.92694,113.61 a 9,9 0 0 0 1.34,0.45 6.55,6.55 0 0 0 1.62,0.21 6.39,6.39 0 0 0 4,-1.15 11.7,11.7 0 0 0 2.78,-4.07 126.9,126.9 0 0 1 -5.67,-11.63 106.17,106.17 0 0 1 -4.17,-12.81 h 4.7 c 0.35,1.41 0.76,2.93 1.25,4.56 0.49,1.63 1,3.31 1.62,5 0.62,1.69 1.24,3.45 1.92,5.17 0.68,1.72 1.41,3.38 2.17,5 q 1.78,-4.93 3.1,-9.78 1.32,-4.85 2.49,-10 h 4.51 q -1.7,6.92 -3.76,13.28 c -1.38,4.24 -2.86,8.22 -4.46,11.91 a 26,26 0 0 1 -1.95,3.65 11.23,11.23 0 0 1 -2.24,2.51 8.18,8.18 0 0 1 -2.75,1.46 11.8,11.8 0 0 1 -3.45,0.47 10.11,10.11 0 0 1 -1.08,-0.07 c -0.38,-0.05 -0.75,-0.11 -1.11,-0.19 -0.36,-0.08 -0.69,-0.17 -1,-0.26 a 3.68,3.68 0 0 1 -0.64,-0.24 z"
id="path97" />
<path
class="cls-12"
d="m 185.74694,85.32 c 1,-0.25 2.33,-0.52 4,-0.8 a 33.3,33.3 0 0 1 5.71,-0.43 10.78,10.78 0 0 1 3.95,0.64 6.9,6.9 0 0 1 2.68,1.85 c 0.22,-0.15 0.56,-0.37 1,-0.65 a 11.39,11.39 0 0 1 1.74,-0.83 18.69,18.69 0 0 1 2.31,-0.7 11.73,11.73 0 0 1 2.72,-0.31 11.05,11.05 0 0 1 4.61,0.83 6.61,6.61 0 0 1 2.8,2.32 9.27,9.27 0 0 1 1.36,3.57 27.56,27.56 0 0 1 0.35,4.52 v 13.72 h -4.37 V 96.27 a 28.36,28.36 0 0 0 -0.21,-3.72 7.19,7.19 0 0 0 -0.8,-2.58 3.63,3.63 0 0 0 -1.6,-1.53 6,6 0 0 0 -2.6,-0.45 8.42,8.42 0 0 0 -3.53,0.89 12,12 0 0 0 -2,1.09 11.57,11.57 0 0 1 0.45,2.3 23.06,23.06 0 0 1 0.19,3.06 v 13.72 h -4.37 V 96.27 a 26.42,26.42 0 0 0 -0.23,-3.72 7.6,7.6 0 0 0 -0.83,-2.58 3.66,3.66 0 0 0 -1.59,-1.53 5.86,5.86 0 0 0 -2.57,-0.49 c -0.44,0 -0.91,0 -1.41,0 l -1.43,0.12 c -0.45,0.05 -0.87,0.1 -1.25,0.17 l -0.75,0.14 v 20.63 h -4.37 z"
id="path99" />
<path
class="cls-12"
d="m 271.19694,84 a 12.82,12.82 0 0 1 4.45,0.68 6.95,6.95 0 0 1 4.48,4.89 14,14 0 0 1 0.47,3.78 v 15.18 c -0.38,0.09 -1,0.25 -1.64,0.35 -0.64,0.1 -1.36,0.22 -2.21,0.31 -0.85,0.09 -1.76,0.18 -2.75,0.26 -0.99,0.08 -2,0.12 -2.94,0.12 a 15.56,15.56 0 0 1 -3.8,-0.43 8.44,8.44 0 0 1 -3,-1.33 6.15,6.15 0 0 1 -2,-2.43 8.42,8.42 0 0 1 -0.7,-3.61 6.94,6.94 0 0 1 0.82,-3.48 6.53,6.53 0 0 1 2.23,-2.35 10.22,10.22 0 0 1 3.29,-1.32 18.12,18.12 0 0 1 3.93,-0.41 12.78,12.78 0 0 1 1.36,0.07 c 0.47,0.05 0.92,0.11 1.34,0.19 l 1.11,0.21 0.66,0.14 V 93.6 a 9.62,9.62 0 0 0 -0.24,-2.14 5,5 0 0 0 -0.84,-1.88 4.35,4.35 0 0 0 -1.67,-1.32 6.54,6.54 0 0 0 -2.75,-0.49 19.17,19.17 0 0 0 -3.73,0.36 11,11 0 0 0 -2.42,0.81 l -0.71,-3.61 a 12.49,12.49 0 0 1 3,-1 24.77,24.77 0 0 1 4.26,-0.33 z m 0.38,21.9 c 1,0 2,0 2.75,-0.07 a 11.93,11.93 0 0 0 2,-0.26 v -7.28 a 5.63,5.63 0 0 0 -1.53,-0.4 16.92,16.92 0 0 0 -2.56,-0.17 15.46,15.46 0 0 0 -2.09,0.15 6.49,6.49 0 0 0 -2,0.58 4.29,4.29 0 0 0 -1.53,1.22 3.21,3.21 0 0 0 -0.61,2.05 3.53,3.53 0 0 0 1.5,3.27 7.85,7.85 0 0 0 4.07,0.91 z"
id="path101" />
<path
class="cls-12"
d="m 230.36694,96.88 a 15.81,15.81 0 0 1 0.94,-5.67 11.75,11.75 0 0 1 2.5,-4 10,10 0 0 1 3.57,-2.4 11.15,11.15 0 0 1 4.13,-0.8 q 4.94,0 7.57,3.08 c 1.75,2.05 2.63,5.18 2.63,9.37 v 0.75 a 7.21,7.21 0 0 1 0,0.83 h -16.78 a 9,9 0 0 0 2.21,5.78 c 1.29,1.31 3.29,2 6,2 a 15.9,15.9 0 0 0 3.88,-0.4 15,15 0 0 0 2.65,-1 l 0.61,3.67 a 14,14 0 0 1 -3.08,1.12 19.58,19.58 0 0 1 -4.53,0.43 14.45,14.45 0 0 1 -5.52,-0.92 10.26,10.26 0 0 1 -3.83,-2.65 10.84,10.84 0 0 1 -2.24,-4 17.17,17.17 0 0 1 -0.71,-5.19 z m 16.78,-2.4 a 7.33,7.33 0 0 0 -1.48,-4.86 5.1,5.1 0 0 0 -4.2,-1.91 5.79,5.79 0 0 0 -2.66,0.59 6.14,6.14 0 0 0 -2,1.53 7.11,7.11 0 0 0 -1.25,2.16 10.73,10.73 0 0 0 -0.58,2.49 z"
id="path103" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

81
nymea-app/styles/lime/ApplicationWindow.qml
View File

@ -1,81 +0,0 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2020, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
* This project including source code and documentation is protected by
* copyright law, and remains the property of nymea GmbH. All rights, including
* reproduction, publication, editing and translation, are reserved. The use of
* this project is subject to the terms of a license agreement to be concluded
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
* under https://nymea.io/license
*
* GNU General Public License Usage
* Alternatively, this project may be redistributed and/or modified under the
* terms of the GNU General Public License as published by the Free Software
* Foundation, GNU version 3. This project is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
* this project. If not, see <https://www.gnu.org/licenses/>.
*
* For any further details and any questions please contact us under
* contact@nymea.io or see our FAQ/Licensing Information on
* https://nymea.io/license/faq
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.9
import QtQuick.Templates 2.2
import QtQuick.Controls.Material 2.2
ApplicationWindow {
Material.theme: Material.Dark
font.pixelSize: 16
font.weight: Font.Normal
font.capitalization: Font.MixedCase
font.family: "Ubuntu"
Material.background: "#151515"
// The core system name.
property string systemName: "nymea"
// The app name
property string appName: "nymea:app"
// The header background color
property color primaryColor: Material.background
// Header font color
property color headerForegroundColor: Material.foreground
// The font color
property color foregroundColor: Material.foreground
// The color of selected/highlighted things
property color accentColor: "#ffb0d827"
// colors for interfaces, e.g. icons
property var interfaceColors: {
"temperaturesensor": "red",
"humiditysensor": "deepskyblue",
"moisturesensor":"blue",
"lightsensor": "orange",
"conductivitysensor": "green",
"pressuresensor": "grey",
"noisesensor": "darkviolet",
"co2sensor": "turquoise",
"smartmeterproducer": "lightgreen",
"smartmeterconsumer": "orange",
"extendedsmartmeterproducer": "blue",
"extendedsmartmeterconsumer": "blue"
}
// Optional: Set this to override the cloud environment
//property string cloudEnvironment: "Community"
}

14
nymea-app/styles/lime/Style.qml Normal file
View File

@ -0,0 +1,14 @@
pragma Singleton
import QtQuick 2.0
import "../../ui"
StyleBase {
backgroundColor: "#151515"
foregroundColor: "#fefefe"
headerBackgroundColor: backgroundColor
headerForegroundColor: foregroundColor
accentColor: "#ffb0d827"
iconColor: "#fafafa"
}

1
nymea-app/styles/lime/logo-wide.svg Symbolic link
View File

@ -0,0 +1 @@
../dark/logo-wide.svg

603
nymea-app/styles/lime/logo.svg
View File

@ -1,603 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="256"
height="256"
id="svg2"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="logo.svg"
inkscape:export-filename="/home/micha/Develop/mea/mea/guh-logo-256x256.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs4">
<linearGradient
id="SVGID_1_"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop46" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop48" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop50" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop52" />
</linearGradient>
<linearGradient
id="SVGID_2_"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop61" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop63" />
</linearGradient>
<linearGradient
id="SVGID_3_"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop72" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop74" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop76" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop78" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop80" />
</linearGradient>
<linearGradient
id="SVGID_4_"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop87" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop89" />
</linearGradient>
<linearGradient
id="SVGID_5_"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop96" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop98" />
</linearGradient>
<linearGradient
id="SVGID_6_"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop105" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop107" />
</linearGradient>
<linearGradient
id="SVGID_7_"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop112" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop114" />
</linearGradient>
<linearGradient
id="SVGID_8_"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop119" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop121" />
</linearGradient>
<linearGradient
id="SVGID_9_"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop126" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop128" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop130" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop132" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop134" />
</linearGradient>
<linearGradient
id="SVGID_10_"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop141" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop143" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop145" />
</linearGradient>
<linearGradient
id="SVGID_11_"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop152" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop154" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop156" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop158" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.959798"
inkscape:cx="83.152338"
inkscape:cy="132.37098"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="2880"
inkscape:window-height="1698"
inkscape:window-x="0"
inkscape:window-y="44"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0">
<inkscape:grid
type="xygrid"
id="grid922" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-143.41788,-709.27353)">
<g
transform="matrix(1.4088177,0,0,1.4088177,-318.98436,501.41139)"
id="g41">
<g
id="g43">
<linearGradient
id="linearGradient3548"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop3550" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop3552" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop3554" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3556" />
</linearGradient>
<path
style="fill:url(#SVGID_1_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -7.5,-5 -9.7,-9 -13.7,-14 -1.2,2.6 -2.2,5.8 -3,9.6 1.8,3.1 8.7,13.4 28.1,21.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -17.3,-6.3 -25,-15.1 -28,-19.9 -0.8,4.9 -1.1,10.6 -0.7,16.5 5.2,4.7 14,11 26.9,15.4 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -12.1,-2.9 -20.5,-8.4 -26.1,-13.3 0.5,4.3 1.4,8.6 2.8,13 0.3,1 0.7,2.1 1.1,3 4.4,2 9.6,3.9 15.4,5.2 1.1,0.2 4.3,1.1 4.3,1.1 l 3.8,1 -4,-0.2 c -0.1,0 -3.4,-0.2 -4.5,-0.4 -5.1,-0.7 -9.8,-2 -13.9,-3.6 6.6,13.7 18.8,21.4 35.2,27.5 18.7,7 19.4,25 19.4,25 0,0 5.1,-3.8 9.6,-18.4 5.1,-16.2 -0.3,-30.6 -6.2,-40.7 z"
id="path54" />
</g>
<g
id="g56">
<g
id="g58">
<linearGradient
id="linearGradient3561"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3563" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3565" />
</linearGradient>
<path
style="fill:url(#SVGID_2_)"
inkscape:connector-curvature="0"
d="m 458.6,233.8 c 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2.1 1.3,-5 0.3,-8.1 -0.8,-2.5 -6.5,-6.2 -11.2,-4.7 -5.1,1.7 -6.1,8.1 -6.5,10.9 -0.6,4.3 0.4,10.9 2.8,17.6 -0.1,0 2.1,-0.2 6.1,-3.2 z"
id="path65" />
</g>
<g
id="g67">
<g
id="g69">
<linearGradient
id="linearGradient3570"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3572" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop3574" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop3576" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop3578" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3580" />
</linearGradient>
<path
style="fill:url(#SVGID_3_)"
inkscape:connector-curvature="0"
d="m 449.7,219.4 c 0.4,-2.8 1.4,-9.2 6.5,-10.9 4.2,-1.4 9.3,1.5 10.8,3.9 -1.5,-3.9 -5.6,-6.6 -9,-8.3 -4.8,-2.5 -10.8,-2.9 -15.7,-1.7 -4.6,1.1 -7,3.6 -10.9,6.9 0.8,1.1 1.6,2.2 2.2,3.3 4.6,8 9,18.6 8.2,30.6 3,-5 9.7,-6.1 10.6,-6.2 -2.4,-6.6 -3.4,-13.3 -2.7,-17.6 z"
id="path82" />
</g>
<g
id="g84">
<linearGradient
id="linearGradient3584"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3586" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3588" />
</linearGradient>
<path
style="fill:url(#SVGID_4_)"
inkscape:connector-curvature="0"
d="m 457.6,234.5 c -0.1,0 -0.1,0.1 -0.1,0.1 0,0 0.1,0 0.1,-0.1 z"
id="path91" />
</g>
<g
id="g93">
<linearGradient
id="linearGradient3592"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3594" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3596" />
</linearGradient>
<path
style="fill:url(#SVGID_5_)"
inkscape:connector-curvature="0"
d="m 467.4,213.2 c -0.1,-0.2 -0.2,-0.5 -0.4,-0.8 0.7,1.7 0.8,3.7 0.1,5.9 -1.5,4.9 -1.8,7.1 -6.1,12.9 -1,1.3 -2.2,2.4 -3.4,3.2 0.3,-0.2 0.6,-0.4 1,-0.7 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2 1.2,-4.9 0.3,-8 z"
id="path100" />
</g>
<g
id="g102">
<linearGradient
id="linearGradient3600"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3602" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3604" />
</linearGradient>
<path
style="fill:url(#SVGID_6_)"
inkscape:connector-curvature="0"
d="m 452.4,237 c 0,0 0,0 0,0 0,0 1.8,-0.2 5,-2.4 -2.5,1.7 -4.9,2.4 -4.9,2.4 0,0 0,0 -0.1,0 z"
id="path109" />
</g>
</g>
<linearGradient
id="linearGradient3607"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop3609" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop3611" />
</linearGradient>
<path
style="fill:url(#SVGID_7_)"
inkscape:connector-curvature="0"
d="m 458.2,217.6 c -1,-0.3 -2,0 -2.8,0.6 -0.2,0.3 -0.3,0.6 -0.4,0.9 -0.4,1.6 0.5,3.3 2.2,3.7 0.7,0.2 1.3,0.1 1.9,-0.1 -0.9,6.9 -5.9,12.4 -6.9,13.5 0.1,0.4 0.2,0.5 0.2,0.7 0.3,0 0.4,-0.1 0.9,-0.2 1.7,-1.9 6.7,-7.9 7,-15.5 0.5,-1.5 -0.5,-3.1 -2.1,-3.6 z"
id="path116" />
</g>
<linearGradient
id="linearGradient3614"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3616" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3618" />
</linearGradient>
<path
style="fill:url(#SVGID_8_)"
inkscape:connector-curvature="0"
d="m 405.5,261.4 c 1.5,12.7 7.5,31.7 27.8,47.9 0,0 10.1,-15.4 0.4,-32.5 -9.7,-17.1 -23.8,-22.7 -28.8,-24.5 -0.2,3.6 0.4,6.8 0.6,9.1 z"
id="path123" />
<linearGradient
id="linearGradient3621"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3623" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop3625" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop3627" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop3629" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3631" />
</linearGradient>
<path
style="fill:url(#SVGID_9_)"
inkscape:connector-curvature="0"
d="m 423.7,272.8 c -5.7,-10 -12.8,-16.8 -18.8,-20.5 -0.1,3.2 0.4,7 0.6,9.1 1.2,10.8 5.8,26.1 19.6,40.4 2.4,-5.5 5.5,-16.8 -1.4,-29 z"
id="path136" />
<g
id="g138">
<linearGradient
id="linearGradient3635"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop3637" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop3639" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3641" />
</linearGradient>
<path
style="fill:url(#SVGID_10_)"
inkscape:connector-curvature="0"
d="m 411.9,246.7 c -2,-0.8 -4.9,-1.6 -6.8,-2.4 -0.3,2.5 -0.2,5.1 -0.2,8.1 4.4,1.6 16.1,6.2 25.5,19.3 0,-0.1 0,-0.2 0,-0.3 -0.2,-2.3 -1.1,-18.3 -18.5,-24.7 z"
id="path147" />
</g>
<g
id="g149">
<linearGradient
id="linearGradient3645"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3647" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop3649" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop3651" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3653" />
</linearGradient>
<path
style="fill:url(#SVGID_11_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -2.1,-1.4 -3.8,-2.7 -5.2,-4 -0.4,3.6 -0.6,7.5 -0.4,11.6 4.2,3.2 9.7,6.5 16.9,9.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -6.8,-2.5 -12.1,-5.3 -16.2,-8.2 0.4,5 1.3,10.1 2.9,15.2 3.4,1.8 7.2,3.4 11.6,4.9 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -3.7,-0.9 -7,-2 -10,-3.3 1.9,4.8 4.4,8.8 7.4,12.3 0.1,0 0.1,0 0.1,0 l 3.8,1 -3.2,-0.2 c 6.9,7.7 16.3,13.3 26.3,21.3 13.5,10.8 9.2,27.2 9.2,27.2 0,0 0.8,-0.6 1.5,-1.5 1.8,-2.1 5.1,-7 8.1,-16.9 5,-16.1 -0.4,-30.5 -6.3,-40.6 z"
id="path160" />
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 16 B

1
nymea-app/styles/lime/logo.svg Symbolic link
View File

@ -0,0 +1 @@
../dark/logo.svg
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 16 B

75
nymea-app/styles/noir/ApplicationWindow.qml
View File

@ -1,75 +0,0 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2020, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
* This project including source code and documentation is protected by
* copyright law, and remains the property of nymea GmbH. All rights, including
* reproduction, publication, editing and translation, are reserved. The use of
* this project is subject to the terms of a license agreement to be concluded
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
* under https://nymea.io/license
*
* GNU General Public License Usage
* Alternatively, this project may be redistributed and/or modified under the
* terms of the GNU General Public License as published by the Free Software
* Foundation, GNU version 3. This project is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
* this project. If not, see <https://www.gnu.org/licenses/>.
*
* For any further details and any questions please contact us under
* contact@nymea.io or see our FAQ/Licensing Information on
* https://nymea.io/license/faq
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.0
import QtQuick.Templates 2.2
import QtQuick.Controls.Material 2.2
ApplicationWindow {
// The app style
Material.theme: Material.Dark
// Main background color
Material.background: "#50514f"
font.pixelSize: 16
font.weight: Font.Normal
font.capitalization: Font.MixedCase
font.family: "Oswald"
// The core system name.
property string systemName: "nymea"
// The app name
property string appName: "nymea:app"
// The header background color
property color primaryColor: "#494948"
// Header font color
property color headerForegroundColor: "#ebebeb"
// The font color
property color foregroundColor: "#ebebeb"
// The color of selected/highlighted things
property color accentColor: "#f45b69"
// colors for interfaces, e.g. icons
property var interfaceColors: {
"temperaturesensor": "#FF0000",
"humiditysensor": "#00BFFF",
"moisturesensor":"#0000FF",
"lightsensor": "#FFA500",
"conductivitysensor": "#008000",
"pressuresensor": "#808080"
}
}

2
nymea-app/styles/noir/Button.qml
View File

@ -64,7 +64,7 @@ T.Button {
font.overline: control.font.overline
font.pixelSize: app.smallFont
font.weight: Font.Bold
color: app.foregroundColor
color: Style.foregroundColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight

4
nymea-app/styles/noir/Page.qml
View File

@ -31,10 +31,10 @@
import QtQuick 2.0
import QtQuick.Templates 2.2
import QtQuick.Controls.Material 2.2
import Nymea 1.0
Page {
background: Rectangle {
color: Material.background
color: Style.backgroundColor
}
}

16
nymea-app/styles/noir/Style.qml Normal file
View File

@ -0,0 +1,16 @@
pragma Singleton
import QtQuick 2.0
import "../../ui"
StyleBase {
backgroundColor: "#50514f"
foregroundColor: "#ebebeb"
headerBackgroundColor: "#494948"
headerForegroundColor: foregroundColor
accentColor: "#f45b69"
iconColor: foregroundColor
fontFamily: "Oswald"
}

0
nymea-app/ui/fonts/Oswald-Bold.ttf → nymea-app/styles/noir/fonts/Oswald-Bold.ttf
View File

0
nymea-app/ui/fonts/Oswald-ExtraLight.ttf → nymea-app/styles/noir/fonts/Oswald-ExtraLight.ttf
View File

0
nymea-app/ui/fonts/Oswald-Light.ttf → nymea-app/styles/noir/fonts/Oswald-Light.ttf
View File

0
nymea-app/ui/fonts/Oswald-Medium.ttf → nymea-app/styles/noir/fonts/Oswald-Medium.ttf
View File

0
nymea-app/ui/fonts/Oswald-Regular.ttf → nymea-app/styles/noir/fonts/Oswald-Regular.ttf
View File

0
nymea-app/ui/fonts/Oswald-SemiBold.ttf → nymea-app/styles/noir/fonts/Oswald-SemiBold.ttf
View File

1
nymea-app/styles/noir/logo-wide.svg Symbolic link
View File

@ -0,0 +1 @@
../dark/logo-wide.svg

603
nymea-app/styles/noir/logo.svg
View File

@ -1,603 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="256"
height="256"
id="svg2"
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="logo.svg"
inkscape:export-filename="/home/micha/Develop/mea/mea/guh-logo-256x256.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs4">
<linearGradient
id="SVGID_1_"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop46" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop48" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop50" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop52" />
</linearGradient>
<linearGradient
id="SVGID_2_"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop61" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop63" />
</linearGradient>
<linearGradient
id="SVGID_3_"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop72" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop74" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop76" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop78" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop80" />
</linearGradient>
<linearGradient
id="SVGID_4_"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop87" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop89" />
</linearGradient>
<linearGradient
id="SVGID_5_"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop96" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop98" />
</linearGradient>
<linearGradient
id="SVGID_6_"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop105" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop107" />
</linearGradient>
<linearGradient
id="SVGID_7_"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop112" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop114" />
</linearGradient>
<linearGradient
id="SVGID_8_"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop119" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop121" />
</linearGradient>
<linearGradient
id="SVGID_9_"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop126" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop128" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop130" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop132" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop134" />
</linearGradient>
<linearGradient
id="SVGID_10_"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop141" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop143" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop145" />
</linearGradient>
<linearGradient
id="SVGID_11_"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop152" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop154" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop156" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop158" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.959798"
inkscape:cx="83.152338"
inkscape:cy="132.37098"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="2880"
inkscape:window-height="1698"
inkscape:window-x="0"
inkscape:window-y="44"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0">
<inkscape:grid
type="xygrid"
id="grid922" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-143.41788,-709.27353)">
<g
transform="matrix(1.4088177,0,0,1.4088177,-318.98436,501.41139)"
id="g41">
<g
id="g43">
<linearGradient
id="linearGradient3548"
gradientUnits="userSpaceOnUse"
x1="369.02579"
y1="171.88429"
x2="441.68719"
y2="262.58051">
<stop
offset="0.1296"
style="stop-color:#7CC099"
id="stop3550" />
<stop
offset="0.3785"
style="stop-color:#6FB594"
id="stop3552" />
<stop
offset="0.835"
style="stop-color:#4E9688"
id="stop3554" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3556" />
</linearGradient>
<path
style="fill:url(#SVGID_1_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -7.5,-5 -9.7,-9 -13.7,-14 -1.2,2.6 -2.2,5.8 -3,9.6 1.8,3.1 8.7,13.4 28.1,21.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -17.3,-6.3 -25,-15.1 -28,-19.9 -0.8,4.9 -1.1,10.6 -0.7,16.5 5.2,4.7 14,11 26.9,15.4 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -12.1,-2.9 -20.5,-8.4 -26.1,-13.3 0.5,4.3 1.4,8.6 2.8,13 0.3,1 0.7,2.1 1.1,3 4.4,2 9.6,3.9 15.4,5.2 1.1,0.2 4.3,1.1 4.3,1.1 l 3.8,1 -4,-0.2 c -0.1,0 -3.4,-0.2 -4.5,-0.4 -5.1,-0.7 -9.8,-2 -13.9,-3.6 6.6,13.7 18.8,21.4 35.2,27.5 18.7,7 19.4,25 19.4,25 0,0 5.1,-3.8 9.6,-18.4 5.1,-16.2 -0.3,-30.6 -6.2,-40.7 z"
id="path54" />
</g>
<g
id="g56">
<g
id="g58">
<linearGradient
id="linearGradient3561"
gradientUnits="userSpaceOnUse"
x1="936.13898"
y1="154.45329"
x2="918.56207"
y2="154.45329"
gradientTransform="matrix(0.9669,0.2553,-0.2553,0.9669,-399.6603,-163.1002)">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3563" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3565" />
</linearGradient>
<path
style="fill:url(#SVGID_2_)"
inkscape:connector-curvature="0"
d="m 458.6,233.8 c 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2.1 1.3,-5 0.3,-8.1 -0.8,-2.5 -6.5,-6.2 -11.2,-4.7 -5.1,1.7 -6.1,8.1 -6.5,10.9 -0.6,4.3 0.4,10.9 2.8,17.6 -0.1,0 2.1,-0.2 6.1,-3.2 z"
id="path65" />
</g>
<g
id="g67">
<g
id="g69">
<linearGradient
id="linearGradient3570"
gradientUnits="userSpaceOnUse"
x1="451.01599"
y1="201.9489"
x2="442.73761"
y2="243.37801">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3572" />
<stop
offset="0.2568"
style="stop-color:#78BC98"
id="stop3574" />
<stop
offset="0.5165"
style="stop-color:#6CB193"
id="stop3576" />
<stop
offset="0.7767"
style="stop-color:#589F8C"
id="stop3578" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3580" />
</linearGradient>
<path
style="fill:url(#SVGID_3_)"
inkscape:connector-curvature="0"
d="m 449.7,219.4 c 0.4,-2.8 1.4,-9.2 6.5,-10.9 4.2,-1.4 9.3,1.5 10.8,3.9 -1.5,-3.9 -5.6,-6.6 -9,-8.3 -4.8,-2.5 -10.8,-2.9 -15.7,-1.7 -4.6,1.1 -7,3.6 -10.9,6.9 0.8,1.1 1.6,2.2 2.2,3.3 4.6,8 9,18.6 8.2,30.6 3,-5 9.7,-6.1 10.6,-6.2 -2.4,-6.6 -3.4,-13.3 -2.7,-17.6 z"
id="path82" />
</g>
<g
id="g84">
<linearGradient
id="linearGradient3584"
gradientUnits="userSpaceOnUse"
x1="457.62369"
y1="234.5722"
x2="457.47629"
y2="234.5722">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3586" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3588" />
</linearGradient>
<path
style="fill:url(#SVGID_4_)"
inkscape:connector-curvature="0"
d="m 457.6,234.5 c -0.1,0 -0.1,0.1 -0.1,0.1 0,0 0.1,0 0.1,-0.1 z"
id="path91" />
</g>
<g
id="g93">
<linearGradient
id="linearGradient3592"
gradientUnits="userSpaceOnUse"
x1="467.88159"
y1="223.4929"
x2="457.62369"
y2="223.4929">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3594" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3596" />
</linearGradient>
<path
style="fill:url(#SVGID_5_)"
inkscape:connector-curvature="0"
d="m 467.4,213.2 c -0.1,-0.2 -0.2,-0.5 -0.4,-0.8 0.7,1.7 0.8,3.7 0.1,5.9 -1.5,4.9 -1.8,7.1 -6.1,12.9 -1,1.3 -2.2,2.4 -3.4,3.2 0.3,-0.2 0.6,-0.4 1,-0.7 4.9,-3.6 6.9,-7.8 8.5,-12.5 0.7,-2 1.2,-4.9 0.3,-8 z"
id="path100" />
</g>
<g
id="g102">
<linearGradient
id="linearGradient3600"
gradientUnits="userSpaceOnUse"
x1="457.47629"
y1="235.823"
x2="452.43719"
y2="235.823">
<stop
offset="0"
style="stop-color:#DBE6E0"
id="stop3602" />
<stop
offset="1"
style="stop-color:#BCDED3"
id="stop3604" />
</linearGradient>
<path
style="fill:url(#SVGID_6_)"
inkscape:connector-curvature="0"
d="m 452.4,237 c 0,0 0,0 0,0 0,0 1.8,-0.2 5,-2.4 -2.5,1.7 -4.9,2.4 -4.9,2.4 0,0 0,0 -0.1,0 z"
id="path109" />
</g>
</g>
<linearGradient
id="linearGradient3607"
gradientUnits="userSpaceOnUse"
x1="452.19159"
y1="227.27921"
x2="460.47461"
y2="227.27921">
<stop
offset="0"
style="stop-color:#6AA583"
id="stop3609" />
<stop
offset="1"
style="stop-color:#4C9E96"
id="stop3611" />
</linearGradient>
<path
style="fill:url(#SVGID_7_)"
inkscape:connector-curvature="0"
d="m 458.2,217.6 c -1,-0.3 -2,0 -2.8,0.6 -0.2,0.3 -0.3,0.6 -0.4,0.9 -0.4,1.6 0.5,3.3 2.2,3.7 0.7,0.2 1.3,0.1 1.9,-0.1 -0.9,6.9 -5.9,12.4 -6.9,13.5 0.1,0.4 0.2,0.5 0.2,0.7 0.3,0 0.4,-0.1 0.9,-0.2 1.7,-1.9 6.7,-7.9 7,-15.5 0.5,-1.5 -0.5,-3.1 -2.1,-3.6 z"
id="path116" />
</g>
<linearGradient
id="linearGradient3614"
gradientUnits="userSpaceOnUse"
x1="473.17111"
y1="268.90411"
x2="455.23529"
y2="283.95389"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3616" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3618" />
</linearGradient>
<path
style="fill:url(#SVGID_8_)"
inkscape:connector-curvature="0"
d="m 405.5,261.4 c 1.5,12.7 7.5,31.7 27.8,47.9 0,0 10.1,-15.4 0.4,-32.5 -9.7,-17.1 -23.8,-22.7 -28.8,-24.5 -0.2,3.6 0.4,6.8 0.6,9.1 z"
id="path123" />
<linearGradient
id="linearGradient3621"
gradientUnits="userSpaceOnUse"
x1="447.13129"
y1="274.66199"
x2="470.95151"
y2="274.66199"
gradientTransform="matrix(0.9997,0.0227,-0.0227,0.9997,-36.4014,-7.9207)">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3623" />
<stop
offset="0.2327"
style="stop-color:#76BA97"
id="stop3625" />
<stop
offset="0.5485"
style="stop-color:#65AB90"
id="stop3627" />
<stop
offset="0.9106"
style="stop-color:#489186"
id="stop3629" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3631" />
</linearGradient>
<path
style="fill:url(#SVGID_9_)"
inkscape:connector-curvature="0"
d="m 423.7,272.8 c -5.7,-10 -12.8,-16.8 -18.8,-20.5 -0.1,3.2 0.4,7 0.6,9.1 1.2,10.8 5.8,26.1 19.6,40.4 2.4,-5.5 5.5,-16.8 -1.4,-29 z"
id="path136" />
<g
id="g138">
<linearGradient
id="linearGradient3635"
gradientUnits="userSpaceOnUse"
x1="415.2153"
y1="260.93829"
x2="422.0509"
y2="252.7919">
<stop
offset="0"
style="stop-color:#4C9E96"
id="stop3637" />
<stop
offset="0.4859"
style="stop-color:#489790"
id="stop3639" />
<stop
offset="1"
style="stop-color:#408A83"
id="stop3641" />
</linearGradient>
<path
style="fill:url(#SVGID_10_)"
inkscape:connector-curvature="0"
d="m 411.9,246.7 c -2,-0.8 -4.9,-1.6 -6.8,-2.4 -0.3,2.5 -0.2,5.1 -0.2,8.1 4.4,1.6 16.1,6.2 25.5,19.3 0,-0.1 0,-0.2 0,-0.3 -0.2,-2.3 -1.1,-18.3 -18.5,-24.7 z"
id="path147" />
</g>
<g
id="g149">
<linearGradient
id="linearGradient3645"
gradientUnits="userSpaceOnUse"
x1="425.60641"
y1="203.1666"
x2="393.7475"
y2="239.4308">
<stop
offset="0"
style="stop-color:#7CC099"
id="stop3647" />
<stop
offset="0.3183"
style="stop-color:#77BF9C"
id="stop3649" />
<stop
offset="0.6757"
style="stop-color:#6ABDA3"
id="stop3651" />
<stop
offset="1"
style="stop-color:#57BAAE"
id="stop3653" />
</linearGradient>
<path
style="fill:url(#SVGID_11_)"
inkscape:connector-curvature="0"
d="m 433.7,212.6 c -5.9,-10.1 -19,-17.9 -27.5,-21 -8.5,-3.2 -18,-10.1 -18,-10.1 -2.1,-1.4 -3.8,-2.7 -5.2,-4 -0.4,3.6 -0.6,7.5 -0.4,11.6 4.2,3.2 9.7,6.5 16.9,9.5 1.7,0.7 6.9,2.8 7,2.9 l 6.5,2.6 -6.7,-1.9 c -0.2,-0.1 -5.5,-1.6 -7.3,-2.2 -6.8,-2.5 -12.1,-5.3 -16.2,-8.2 0.4,5 1.3,10.1 2.9,15.2 3.4,1.8 7.2,3.4 11.6,4.9 0.9,0.3 3.6,1.3 3.6,1.3 l 3.4,1.2 -3.5,-0.5 c -0.1,0 -3,-0.4 -4,-0.6 -3.7,-0.9 -7,-2 -10,-3.3 1.9,4.8 4.4,8.8 7.4,12.3 0.1,0 0.1,0 0.1,0 l 3.8,1 -3.2,-0.2 c 6.9,7.7 16.3,13.3 26.3,21.3 13.5,10.8 9.2,27.2 9.2,27.2 0,0 0.8,-0.6 1.5,-1.5 1.8,-2.1 5.1,-7 8.1,-16.9 5,-16.1 -0.4,-30.5 -6.3,-40.6 z"
id="path160" />
</g>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 16 B

1
nymea-app/styles/noir/logo.svg Symbolic link
View File

@ -0,0 +1 @@
../dark/logo.svg
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 16 B

2
nymea-app/ui/MagicPage.qml
View File

@ -141,7 +141,7 @@ Page {
id: ruleDelegate
width: parent.width
iconName: "../images/" + (model.executable ? (iconTag.value.length > 0 ? iconTag.value : "slideshow") : "magic") + ".svg"
iconColor: model.executable ? (colorTag.value.length > 0 ? colorTag.value : app.accentColor) : !model.enabled ? "red" : (model.active ? app.accentColor : "grey")
iconColor: model.executable ? (colorTag.value.length > 0 ? colorTag.value : Style.accentColor) : !model.enabled ? "red" : (model.active ? Style.accentColor : "grey")
text: model.name
canDelete: true

15
nymea-app/ui/MainMenu.qml
View File

@ -20,7 +20,7 @@ Drawer {
signal startDemoMode();
background: Rectangle {
color: app.backgroundColor
color: Style.backgroundColor
}
@ -31,20 +31,21 @@ Drawer {
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: topSectionLayout.implicitHeight + app.margins * 2
color: Qt.tint(app.backgroundColor, Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, 0.05))
color: Qt.tint(Style.backgroundColor, Qt.rgba(Style.foregroundColor.r, Style.foregroundColor.g, Style.foregroundColor.b, 0.05))
ColumnLayout {
id: topSectionLayout
anchors { left: parent.left; top: parent.top; right: parent.right; margins: app.margins }
spacing: app.margins
Image {
Layout.preferredHeight: app.hugeIconSize
Layout.preferredWidth: height
sourceSize.width: width
sourceSize.height: height
source: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle)
// w : h = ss.w : ss.h
Layout.preferredWidth: app.hugeIconSize * sourceSize.width / sourceSize.height
source: "qrc:/styles/%1/logo-wide.svg".arg(styleController.currentStyle)
}
RowLayout {
visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost
ColumnLayout {
Label {
Layout.fillWidth: true
@ -55,13 +56,11 @@ Drawer {
text: root.currentEngine.jsonRpcClient.currentConnection.url
font.pixelSize: app.extraSmallFont
enabled: false
visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost
}
}
ProgressButton {
longpressEnabled: false
imageSource: "../images/close.svg"
visible: root.currentEngine && root.currentEngine.jsonRpcClient.currentHost
onClicked: {
root.currentEngine.jsonRpcClient.disconnectFromHost();
root.close();

6
nymea-app/ui/MainPage.qml
View File

@ -54,6 +54,7 @@ Page {
HeaderButton {
imageSource: "../images/navigation-menu.svg"
color: Style.headerForegroundColor
onClicked: {
if (d.configOverlay != null) {
d.configOverlay.destroy();
@ -64,6 +65,7 @@ Page {
Label {
Layout.fillWidth: true
color: Style.headerForegroundColor
text: d.configOverlay !== null ?
qsTr("Configure main view")
: swipeView.currentItem.item.title.length > 0 ? swipeView.currentItem.item.title : filteredContentModel.data(swipeView.currentIndex, "displayName")
@ -455,7 +457,7 @@ Page {
width: Math.min(parent.width, parent.height) * .8
height: width
name: Qt.resolvedUrl("images/" + model.icon + ".svg")
color: configDelegate.isEnabled ? app.accentColor : keyColor
color: configDelegate.isEnabled ? Style.accentColor : Style.iconColor
}
}
@ -519,7 +521,7 @@ Page {
width: Math.min(parent.width, parent.height) * .8
height: width
name: Qt.resolvedUrl("images/" + dndItem.icon + ".svg")
color: dndItem.isEnabled ? app.accentColor : keyColor
color: dndItem.isEnabled ? Style.accentColor : Style.iconColor
}
}

59
nymea-app/ui/Nymea.qml
View File

@ -46,18 +46,25 @@ ApplicationWindow {
minimumHeight: 480
visibility: kioskMode ? ApplicationWindow.FullScreen : settings.viewMode
color: Material.background
title: app.appName
// Those variables must be present in the Style
title: appName
Material.primary: primaryColor
Material.accent: accentColor
Material.foreground: foregroundColor
Material.theme: NymeaUtils.isDark(Style.backgroundColor) ? Material.Dark : Material.Light
Material.background: Style.backgroundColor
Material.primary: Style.headerBackgroundColor
Material.accent: Style.accentColor
Material.foreground: Style.foregroundColor
font.pixelSize: mediumFont
font.weight: Font.Normal
font.capitalization: Font.MixedCase
font.family: Style.fontFamily
property string appName: "appBranding" in app ? app.appBranding : "nymea:app"
property string systemName: "coreBranding" in app ? app.coreBranding : "nymea"
property int margins: 16
property int bigMargins: 20
property int radius: 6
property int extraSmallFont: 10
property int smallFont: 13
property int mediumFont: 16
@ -69,7 +76,6 @@ ApplicationWindow {
property int hugeIconSize: 64
property int delegateHeight: 60
property color backgroundColor: Material.background
readonly property bool landscape: app.width > app.height
@ -91,8 +97,8 @@ ApplicationWindow {
Component.onCompleted: {
styleController.setSystemFont(app.font)
PlatformHelper.topPanelColor = app.primaryColor
PlatformHelper.bottomPanelColor = Material.background
PlatformHelper.topPanelColor = Style.headerBackgroundColor
PlatformHelper.bottomPanelColor = Style.backgroundColor
}
Binding {
@ -374,37 +380,20 @@ ApplicationWindow {
return "";
}
property var fallbackColors: {
"temperaturesensor": "red",
"humiditysensor": "deepskyblue",
"moisturesensor":"blue",
"lightsensor": "orange",
"conductivitysensor": "green",
"pressuresensor": "grey",
"noisesensor": "darkviolet",
"co2sensor": "turquoise",
"daylightsensor": "gold",
"presencesensor": "darkblue",
"closablesensor": "green",
"smartmeterproducer": "lightgreen",
"smartmeterconsumer": "orange",
"extendedsmartmeterproducer": "blue",
"extendedsmartmeterconsumer": "blue",
"heating" : "gainsboro",
"thermostat": "dodgerblue",
"irrigation": "lightblue",
"windspeedsensor": "blue",
"ventilation": "lightblue"
StyleBase {
id: styleBase
}
function interfaceToColor(name) {
// Try to load color map from style
if (interfaceColors[name]) {
return interfaceColors[name];
if (Style.interfaceColors[name]) {
return Style.interfaceColors[name];
}
if (fallbackColors[name]) {
return fallbackColors[name];
if (styleBase.interfaceColors[name]) {
return styleBase.interfaceColors[name];
}
return "grey";

2
nymea-app/ui/PushButtonAuthPage.qml
View File

@ -68,7 +68,7 @@ Page {
Label {
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
color: app.accentColor
color: Style.accentColor
text: qsTr("Authentication required")
wrapMode: Text.WordWrap
font.pixelSize: app.largeFont

46
nymea-app/ui/StyleBase.qml Normal file
View File

@ -0,0 +1,46 @@
import QtQuick 2.0
Item {
property color backgroundColor: "#fafafa"
property color foregroundColor: "#202020"
property color headerBackgroundColor: "#ffffff"
property color headerForegroundColor: "#202020"
property color tileBackgroundColor: Qt.tint(backgroundColor, Qt.rgba(foregroundColor.r, foregroundColor.g, foregroundColor.b, 0.05))
property color tileForegroundColor: foregroundColor
property color tileOverlayColor: Qt.tint(backgroundColor, Qt.rgba(foregroundColor.r, foregroundColor.g, foregroundColor.b, 0.1))
property color tileOverlayForegroundColor: foregroundColor
property int tileRadius: 6
property color accentColor: "#ff57baae"
property color iconColor: "#808080"
// Note: Font files need to be provided in a "fonts" folder in the style
property string fontFamily: "Ubuntu"
// Icon/graph colors for various interfaces
property var interfaceColors: {
"temperaturesensor": "red",
"humiditysensor": "deepskyblue",
"moisturesensor":"blue",
"lightsensor": "orange",
"conductivitysensor": "green",
"pressuresensor": "grey",
"noisesensor": "darkviolet",
"co2sensor": "turquoise",
"daylightsensor": "gold",
"presencesensor": "darkblue",
"closablesensor": "green",
"smartmeterproducer": "lightgreen",
"smartmeterconsumer": "orange",
"extendedsmartmeterproducer": "blue",
"extendedsmartmeterconsumer": "blue",
"heating" : "gainsboro",
"thermostat": "dodgerblue",
"irrigation": "lightblue",
"windspeedsensor": "blue",
"ventilation": "lightblue"
}
}

2
nymea-app/ui/appsettings/AppLogPage.qml
View File

@ -57,7 +57,7 @@ Page {
maximumLineCount: 2
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
text: model.text
color: model.type === AppLogController.TypeWarning ? "red" : app.foregroundColor
color: model.type === AppLogController.TypeWarning ? "red" : Style.foregroundColor
font.pixelSize: app.smallFont
}
}

4
nymea-app/ui/appsettings/CloudLoginPage.qml
View File

@ -452,7 +452,7 @@ SettingsPageBase {
wrapMode: Text.WordWrap
text: qsTr("Password forgotten?")
font.pixelSize: app.largeFont
color: app.accentColor
color: Style.accentColor
}
Label {
Layout.fillWidth: true; Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
@ -508,7 +508,7 @@ SettingsPageBase {
Layout.margins: app.margins
wrapMode: Text.WordWrap
text: qsTr("Check your email!")
color: app.accentColor
color: Style.accentColor
font.pixelSize: app.largeFont
}

13
nymea-app/ui/components/BigTile.qml
View File

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import Nymea 1.0
Item {
@ -25,6 +26,8 @@ import Nymea 1.0
signal clicked();
signal pressAndHold();
Material.foreground: Style.tileForegroundColor
function wobble() {
wobbleAnimation.start();
}
@ -66,18 +69,18 @@ import Nymea 1.0
id: background
anchors.fill: parent
anchors.margins: app.margins / 2
radius: 6
radius: Style.tileRadius
gradient: Gradient {
GradientStop {
position: (headerRow.height + app.margins) / background.height
color: Qt.tint(app.backgroundColor, Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, .05))
color: Style.tileBackgroundColor
}
GradientStop {
position: (headerRow.height + app.margins) / background.height
color:root.showHeader ?
Qt.tint(app.backgroundColor, Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, .1))
: Qt.tint(app.backgroundColor, Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, .05))
Style.tileOverlayColor
: Style.tileBackgroundColor
}
}
}
@ -95,9 +98,11 @@ import Nymea 1.0
Layout.fillWidth: true
text: root.thing.name
elide: Text.ElideRight
color: Style.tileOverlayForegroundColor
}
ThingStatusIcons {
thing: root.thing
// color: Style.tileOverlayForegroundColor
}
}

6
nymea-app/ui/components/BrightnessSlider.qml
View File

@ -55,8 +55,8 @@ Item {
Rectangle {
id: clipRect
anchors.fill: parent
radius: app.radius
color: Qt.tint(app.backgroundColor, Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, 0.1))
radius: Style.tileRadius
color: Style.tileOverlayColor
}
LinearGradient {
@ -87,7 +87,7 @@ Item {
height: root.orientation === Qt.Horizontal ? parent.height : 8
width: root.orientation === Qt.Horizontal ? 8 : parent.width
radius: 4
color: app.foregroundColor
color: Style.foregroundColor
}
MouseArea {

3
nymea-app/ui/components/ClosableArrowAnimation.qml
View File

@ -29,6 +29,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.0
import Nymea 1.0
Item {
id: arrows
@ -71,7 +72,7 @@ Item {
name: arrows.up ? "../images/up.svg" : "../images/down.svg"
width: parent.width
height: width
color: app.accentColor
color: Style.accentColor
}
}
}

4
nymea-app/ui/components/ClosablesControlLarge.qml
View File

@ -95,7 +95,7 @@ Item {
width: parent.width
height: parent.height
name: "../images/" + root.type + "/" + root.type + "-inlay.svg"
color: app.foregroundColor
color: Style.foregroundColor
}
}
OpacityMask {
@ -131,7 +131,7 @@ Item {
anchors.right: parent.right
anchors.margins: parent.width / 6
height: 2
color: app.accentColor
color: Style.accentColor
y: Math.max(parent.minY, Math.min(parent.maxY, dragArea.mouseY))
visible: root.isExtended && dragArea.containsMouse
}

34
nymea-app/ui/components/ColorIcon.qml
View File

@ -31,17 +31,15 @@
import QtQuick 2.4
import QtGraphicalEffects 1.0
import Nymea 1.0
Item {
id: icon
property string name
property alias color: colorizedImage.color
property alias color: colorizedImage.outColor
property int margins: 0
//TODO: Should be in the style
readonly property color keyColor: "#808080"
property alias status: image.status
Image {
@ -59,12 +57,32 @@ Item {
cache: true
}
ColorOverlay {
ShaderEffect {
id: colorizedImage
objectName: "shader"
anchors.fill: parent
anchors.margins: parent ? parent.margins : 0
visible: image.status == Image.Ready
source: image
// Whether or not a color has been set.
visible: image.status == Image.Ready && outColor != inColor
property Image source: image
property color outColor: Style.iconColor
// Colorize only pixels of this color, leave the rest untouched.
// This needs to match the basic color of the icon set
property color inColor: "#808080"
property real threshold: 0.1
fragmentShader: "
varying highp vec2 qt_TexCoord0;
uniform sampler2D source;
uniform highp vec4 outColor;
uniform highp vec4 inColor;
uniform lowp float threshold;
uniform lowp float qt_Opacity;
void main() {
lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
gl_FragColor = mix(vec4(outColor.rgb, 1.0) * sourceColor.a, sourceColor, step(threshold, distance(sourceColor.rgb / sourceColor.a, inColor.rgb))) * qt_Opacity;
}"
}
}

3
nymea-app/ui/components/ColorPickerCt.qml
View File

@ -29,6 +29,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.3
import Nymea 1.0
Item {
id: root
@ -46,7 +47,7 @@ Item {
anchors.centerIn: parent
rotation: -90
border.width: 1
border.color: app.foregroundColor
border.color: Style.foregroundColor
gradient: Gradient {
GradientStop { position: 0.0; color: "#efffff" }

5
nymea-app/ui/components/ColorPickerPre510.qml
View File

@ -29,6 +29,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.5
import Nymea 1.0
Item {
id: root
@ -43,7 +44,7 @@ Item {
height: 15
width: height
radius: height / 2
color: app.accentColor
color: Style.accentColor
Rectangle {
@ -176,7 +177,7 @@ Item {
Rectangle {
anchors.fill: parent
border.color: app.foregroundColor
border.color: Style.foregroundColor
border.width: 1
gradient: Gradient {
GradientStop { position: 0.0; color: "transparent" }

4
nymea-app/ui/components/ColorTemperaturePicker.qml
View File

@ -25,7 +25,7 @@ Item {
Rectangle {
id: clipRect
anchors.fill: parent
radius: app.radius
radius: Style.tileRadius
}
LinearGradient {
@ -48,7 +48,7 @@ Item {
height: root.orientation == Qt.Horizontal ? parent.height : 8
width: root.orientation == Qt.Horizontal ? 8 : parent.width
radius: 4
color: Qt.tint(app.backgroundColor, Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, 0.5))
color: Qt.tint(Style.backgroundColor, Qt.rgba(Style.foregroundColor.r, Style.foregroundColor.g, Style.foregroundColor.b, 0.5))
}
MouseArea {

2
nymea-app/ui/components/ConnectionStatusIcon.qml
View File

@ -31,5 +31,5 @@ ColorIcon {
color: connectedState && connectedState.value === false
? "red"
: signalStrengthState && signalStrengthState.value < 20
? "orange" : keyColor
? "orange" : Style.iconColor
}

2
nymea-app/ui/components/DatePicker.qml
View File

@ -142,7 +142,7 @@ ColumnLayout {
property bool isNextMonth: dayOfMonth > daysGrid.daysInMonth
property int correctedDayOfMonth: isPreviousMonth ? daysGrid.daysInPreviousMonth + dayOfMonth
: isNextMonth ? dayOfMonth - daysGrid.daysInMonth : dayOfMonth
color: !isPreviousMonth && !isNextMonth && correctedDayOfMonth == root.date.getDate() ? app.accentColor : "transparent"
color: !isPreviousMonth && !isNextMonth && correctedDayOfMonth == root.date.getDate() ? Style.accentColor : "transparent"
Label {
anchors.centerIn: parent
opacity: isPreviousMonth || isNextMonth ? 0.6 : 1

6
nymea-app/ui/components/Dial.qml
View File

@ -42,7 +42,7 @@ ColumnLayout {
property bool showValueLabel: true
property int steps: 10
property color color: app.accentColor
property color color: Style.accentColor
property int maxAngle: 235
// value : max = angle : maxAngle
@ -157,7 +157,7 @@ ColumnLayout {
Rectangle {
anchors.fill: rotationButton
radius: height / 2
border.color: app.foregroundColor
border.color: Style.foregroundColor
border.width: 2
color: "transparent"
opacity: rotateMouseArea.pressed && !rotateMouseArea.grabbed ? .7 : 1
@ -223,7 +223,7 @@ ColumnLayout {
width: height
anchors.centerIn: parent
radius: height / 2
border.color: app.foregroundColor
border.color: Style.foregroundColor
opacity: .3
border.width: width * .025
color: "transparent"

3
nymea-app/ui/components/EmptyViewPlaceholder.qml
View File

@ -31,6 +31,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import Nymea 1.0
ColumnLayout {
id: root
@ -51,7 +52,7 @@ ColumnLayout {
Layout.fillWidth: true
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
color: app.accentColor
color: Style.accentColor
}
Label {
id: textLabel

194
nymea-app/ui/components/FancyHeader.qml
View File

@ -1,194 +0,0 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2020, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
* This project including source code and documentation is protected by
* copyright law, and remains the property of nymea GmbH. All rights, including
* reproduction, publication, editing and translation, are reserved. The use of
* this project is subject to the terms of a license agreement to be concluded
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
* under https://nymea.io/license
*
* GNU General Public License Usage
* Alternatively, this project may be redistributed and/or modified under the
* terms of the GNU General Public License as published by the Free Software
* Foundation, GNU version 3. This project is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with
* this project. If not, see <https://www.gnu.org/licenses/>.
*
* For any further details and any questions please contact us under
* contact@nymea.io or see our FAQ/Licensing Information on
* https://nymea.io/license/faq
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.1
ToolBar {
id: root
height: 50 + (menuOpen ? app.iconSize * 3 + app.margins / 2 : 0)
Behavior on height { NumberAnimation { easing.type: Easing.InOutQuad; duration: 200 } }
property string title
property alias model: menuRepeater.model
property alias leftButtonVisible: leftButton.visible
property alias leftButtonImageSource: leftButton.imageSource
signal clicked(int index);
signal leftButtonClicked();
property bool menuOpen: false
RowLayout {
id: mainRow
height: 50
width: parent.width
opacity: menuOpen ? 0 : 1
Behavior on opacity { NumberAnimation { easing.type: Easing.InOutQuad; duration: 200 } }
ToolButton {
id: leftButton
property string imageSource: "../images/navigation-menu.svg"
visible: false
onClicked: root.leftButtonClicked()
contentItem: Item {
height: 20
width: 20
Loader {
id: image
anchors.fill: parent
anchors.margins: app.margins / 2
opacity: enabled ? 1 : .5
sourceComponent: leftButton.imageSource.endsWith(".gif") ? animatedImageComponent : stillImageComponent
Component {
id: animatedImageComponent
AnimatedImage {
source: leftButton.imageSource
}
}
Component {
id: stillImageComponent
Image {
source: leftButton.imageSource
}
}
}
}
}
Label {
id: label
Layout.fillWidth: true
Layout.fillHeight: true
Layout.topMargin: app.margins; Layout.bottomMargin: app.margins; Layout.leftMargin: leftButton.visible ? 0 : app.margins
verticalAlignment: Text.AlignVCenter
font.pixelSize: app.mediumFont
elide: Text.ElideRight
text: root.title
color: app.headerForegroundColor
}
HeaderButton {
id: menuButton
imageSource: "../images/navigation-menu.svg"
onClicked: menuOpen = true
}
}
RowLayout {
height: 50
anchors.bottom: menuPanel.top
width: parent.width
opacity: menuOpen ? 1 : 0
visible: opacity > 0
Behavior on opacity { NumberAnimation { easing.type: Easing.InOutQuad; duration: 200 } }
Label {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.margins: app.margins
verticalAlignment: Text.AlignVCenter
font.pixelSize: app.mediumFont
elide: Text.ElideRight
text: qsTr("Menu")
color: app.headerForegroundColor
}
HeaderButton {
imageSource:"../images/close.svg"
onClicked: menuOpen = false
}
}
Flickable {
id: menuPanel
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottomMargin: app.margins / 2
width: Math.min(menuRow.childrenRect.width, parent.width)
height: app.iconSize * 3
contentWidth: menuRow.childrenRect.width
opacity: menuOpen ? 1 : 0
visible: opacity > 0
Behavior on opacity { NumberAnimation { easing.type: Easing.InOutQuad; duration: 200 } }
Row {
id: menuRow
Repeater {
id: menuRepeater
MouseArea {
height: 80
width: height
onClicked: {
menuOpen = false
root.clicked(index)
}
Rectangle {
anchors.fill: parent
anchors.margins: app.margins / 2
border.width: 1
border.color: app.accentColor
color: "transparent"
ColumnLayout {
anchors.fill: parent
anchors.margins: app.margins / 2
spacing: 0
ColorIcon {
name: model.iconSource
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize
Layout.alignment: Qt.AlignHCenter
}
Label {
text: model.text
Layout.fillWidth: true
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
maximumLineCount: 2
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pixelSize: app.extraSmallFont
color: app.headerForegroundColor
}
}
}
}
}
}
}
}

1
nymea-app/ui/components/HeaderButton.qml
View File

@ -34,7 +34,6 @@ import QtQuick.Controls 2.1
ToolButton {
property alias imageSource: image.name
property alias color: image.color
property alias keyColor: image.keyColor
contentItem: Item {
height: 20

3
nymea-app/ui/components/InfoPaneBase.qml
View File

@ -2,6 +2,7 @@ import QtQuick 2.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.2
import Nymea 1.0
Item {
id: root
@ -44,7 +45,7 @@ Item {
Rectangle {
id: background
color: app.accentColor
color: Style.accentColor
anchors.fill: parent
}

4
nymea-app/ui/components/KeypadButton.qml
View File

@ -39,7 +39,7 @@ Item {
property alias imageSource: icon.name
property color activeColor: app.accentColor
property color activeColor: Style.accentColor
function activate() {
t.start();
@ -48,7 +48,7 @@ Item {
ColorIcon {
id: icon
anchors.fill: parent
color: active ? root.activeColor : keyColor
color: active ? root.activeColor : Style.iconColor
Behavior on color { ColorAnimation { duration: 200 } }
property bool active: t.running

5
nymea-app/ui/components/Led.qml
View File

@ -29,6 +29,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.9
import Nymea 1.0
Item {
id: root
@ -46,7 +47,7 @@ Item {
color: {
switch (root.state) {
case "on":
return app.accentColor
return Style.accentColor
case "green":
return "#73c0b3";
case "off":
@ -58,6 +59,6 @@ Item {
}
}
border.width: 1
border.color: app.foregroundColor
border.color: Style.foregroundColor
}
}

2
nymea-app/ui/components/ListFilterInput.qml
View File

@ -60,7 +60,7 @@ Item {
imageSource: "../images/erase.svg"
onClicked: searchTextField.text = ""
enabled: searchTextField.displayText.length > 0
color: enabled ? app.accentColor : keyColor
color: enabled ? Style.accentColor : Style.iconColor
}
}
ThinDivider {}

5
nymea-app/ui/components/MainPageTabButton.qml
View File

@ -32,6 +32,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.3
import Nymea 1.0
TabButton {
id: root
@ -57,13 +58,13 @@ TabButton {
width: app.iconSize
height: app.iconSize
name: root.iconSource
color: root.checked ? app.accentColor : keyColor
color: root.checked ? Style.accentColor : Style.iconColor
}
Label {
id: textLabel
text: root.text
font.pixelSize: app.smallFont
color: root.checked ? app.accentColor : Material.foreground
color: root.checked ? Style.accentColor : Material.foreground
}
}
}

15
nymea-app/ui/components/MainPageTile.qml
View File

@ -62,15 +62,15 @@ Item {
gradient: Gradient {
GradientStop {
position: 1 - innerContent.height / background.height
color: Qt.tint(app.backgroundColor, Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, .1))
color: Style.tileOverlayColor
}
GradientStop {
position: 1 - innerContent.height / background.height
color: Qt.tint(app.backgroundColor, Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, .05))
color: Style.tileBackgroundColor
}
}
radius: 6
radius: Style.tileRadius
}
Image {
@ -159,6 +159,7 @@ Item {
horizontalAlignment: Text.AlignHCenter
maximumLineCount: 2
elide: Text.ElideRight
color: Style.tileForegroundColor
}
}
}
@ -169,6 +170,7 @@ Item {
id: innerContent
anchors { left: parent.left; bottom: parent.bottom; right: parent.right; margins: app.margins / 2 }
height: app.iconSize + app.margins * 2
Material.foreground: Style.tileOverlayForegroundColor
MouseArea {
anchors.fill: parent
@ -182,7 +184,7 @@ Item {
height: app.smallIconSize
width: height
name: "../images/system-update.svg"
color: app.accentColor
color: Style.accentColor
visible: root.updateStatus
}
@ -191,13 +193,13 @@ Item {
width: height
name: root.isWireless ? "../images/connections/nm-signal-00.svg" : "../images/connections/network-wired-offline.svg"
color: root.disconnected ? "red" : "orange"
visible: root.setupStatus == Thing.ThingSetupStatusComplete && (root.disconnected || (root.isWireless && root.signalStrength < 20))
visible: root.setupStatus == Thing.ThingSetupStatusComplete && (root.disconnected || (root.isWireless && root.signalStrength < 20 && root.signalStrength >= 0))
}
ColorIcon {
height: app.smallIconSize
width: height
name: root.setupStatus === Thing.ThingSetupStatusFailed ? "../images/dialog-warning-symbolic.svg" : "../images/settings.svg"
color: root.setupStatus === Thing.ThingSetupStatusFailed ? "red" : keyColor
color: root.setupStatus === Thing.ThingSetupStatusFailed ? "red" : Style.tileForegroundColor
visible: root.setupStatus === Thing.ThingSetupStatusFailed || root.setupStatus === Thing.ThingSetupStatusInProgress
}
ColorIcon {
@ -205,6 +207,7 @@ Item {
width: height
name: "../images/battery/battery-010.svg"
visible: root.setupStatus == Thing.ThingSetupStatusComplete && root.batteryCritical
color: Style.tileForegroundColor
}
}
}

5
nymea-app/ui/components/MeaDialog.qml
View File

@ -31,6 +31,7 @@
import QtQuick 2.8
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.2
import Nymea 1.0
Dialog {
id: root
@ -70,7 +71,7 @@ Dialog {
id: headerColorIcon
Layout.preferredHeight: app.hugeIconSize
Layout.preferredWidth: height
color: app.accentColor
color: Style.accentColor
visible: name.length > 0
}
@ -80,7 +81,7 @@ Dialog {
Layout.margins: app.margins
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
text: root.title
color: app.accentColor
color: Style.accentColor
font.pixelSize: app.largeFont
}
}

2
nymea-app/ui/components/MediaControls.qml
View File

@ -133,7 +133,7 @@ RowLayout {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: height
imageSource: root.repeatState.value === "One" ? "../images/media-playlist-repeat-one.svg" : "../images/media-playlist-repeat.svg"
color: root.repeatState.value === "None" ? keyColor : app.accentColor
color: root.repeatState.value === "None" ? Style.iconColor : Style.accentColor
longpressEnabled: false
enabled: root.repeatState !== null
opacity: enabled ? 1 : .5

16
nymea-app/ui/components/MediaPlayer.qml
View File

@ -117,7 +117,7 @@ Item {
gradient: Gradient {
GradientStop { position: gradientMask.gradientEnd - .5; color: "transparent"}
GradientStop { position: gradientMask.gradientEnd; color: app.backgroundColor }
GradientStop { position: gradientMask.gradientEnd; color: Style.backgroundColor }
}
}
@ -169,7 +169,7 @@ Item {
longpressEnabled: false
imageSource: "../images/like.svg"
visible: root.likeState !== null
color: root.likeState && root.likeState.value === true ? app.accentColor : keyColor
color: root.likeState && root.likeState.value === true ? Style.accentColor : Style.iconColor
onClicked: {
engine.thingManager.executeAction(root.thing.id, root.likeState.stateTypeId, [{ paramTypeId: root.likeState.stateTypeId, value: !root.likeState.value}])
}
@ -273,7 +273,7 @@ Item {
Layout.preferredWidth: app.iconSize * 3
visible: root.ambeoModeState !== null
name: "../images/media/ambeo.svg"
color: root.ambeoModeState && root.ambeoModeState.value !== "Off" ? app.accentColor : keyColor
color: root.ambeoModeState && root.ambeoModeState.value !== "Off" ? Style.accentColor : Style.iconColor
MouseArea {
anchors.fill: parent
onClicked: {
@ -288,7 +288,7 @@ Item {
longpressEnabled: false
visible: root.nightModeState !== null
imageSource: "../images/weathericons/weather-clear-night.svg"
color: root.nightModeState && root.nightModeState.value === true ? app.accentColor : keyColor
color: root.nightModeState && root.nightModeState.value === true ? Style.accentColor : Style.iconColor
onClicked: d.pendingCallId = engine.thingManager.executeAction(root.thing.id, root.nightModeState.stateTypeId, [{paramTypeId: root.nightModeState.stateTypeId, value: !root.nightModeState.value}])
}
ProgressButton {
@ -375,7 +375,7 @@ Item {
visible: root.muteState !== null
Layout.alignment: Qt.AlignHCenter
imageSource: "../images/audio-speakers-muted-symbolic.svg"
color: root.muteState.value === true ? app.accentColor : keyColor
color: root.muteState.value === true ? Style.accentColor : Style.iconColor
onClicked: engine.thingManager.executeAction(root.thing.id, root.muteState.stateTypeId, [{paramTypeId: root.muteState.stateTypeId, value: !root.muteState.value}]);
}
}
@ -436,10 +436,10 @@ Item {
Rectangle {
height: pathFlickable.height
width: Math.min(150, folderLabel.implicitWidth + app.margins)
border.color: app.backgroundColor
border.color: Style.backgroundColor
border.width: 1
radius: 4
color: Qt.lighter(app.backgroundColor)
color: Qt.lighter(Style.backgroundColor)
Label {
id: folderLabel
text: modelData
@ -548,7 +548,7 @@ Item {
Layout.preferredWidth: app.hugeIconSize * 3
Layout.alignment: Qt.AlignHCenter
name: "../images/media/ambeo.svg"
color: app.accentColor
color: Style.accentColor
}
ListView {

2
nymea-app/ui/components/NavigationPad.qml
View File

@ -103,7 +103,7 @@ Item {
height: app.iconSize
width: app.iconSize
radius: width / 2
border.color: t.running ? app.accentColor : "#808080"
border.color: t.running ? Style.accentColor : "#808080"
Behavior on border.color { ColorAnimation { duration: 200 } }
Timer { id: t; interval: 400 }
border.width: 3

5
nymea-app/ui/components/NymeaHeader.qml
View File

@ -32,6 +32,7 @@ import QtQuick 2.5
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1
import QtQuick.Controls.Material 2.1
import Nymea 1.0
Item {
id: root
@ -90,7 +91,7 @@ Item {
elide: Text.ElideRight
text: root.text
visible: text.length > 0
color: app.headerForegroundColor
color: Style.headerForegroundColor
}
}
}
@ -111,7 +112,7 @@ Item {
padding: 0
contentItem: Rectangle {
color: infoPane.isError ? "red" : app.accentColor
color: infoPane.isError ? "red" : Style.accentColor
implicitHeight: contentRow.implicitHeight
RowLayout {
id: contentRow

6
nymea-app/ui/components/NymeaItemDelegate.qml
View File

@ -32,6 +32,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Nymea 1.0
// There's a bug in QtQuick.Controls' SwipeDelegate in that it appears with wrong
// background when used in Popups/Dialogs So we need a non-swipable one for those cases
@ -53,15 +54,12 @@ ItemDelegate {
property string iconName
property string thumbnail
property int iconSize: app.iconSize
property color iconColor: app.accentColor
property alias iconKeyColor: icon.keyColor
property color iconColor: Style.accentColor
property alias secondaryIconName: secondaryIcon.name
property alias secondaryIconColor: secondaryIcon.color
property alias secondaryIconKeyColor: secondaryIcon.keyColor
property alias secondaryIconClickable: secondaryIconMouseArea.enabled
property alias tertiaryIconName: tertiaryIcon.name
property alias tertiaryIconColor: tertiaryIcon.color
property alias tertiaryIconKeyColor: tertiaryIcon.keyColor
property alias tertiaryIconClickable: tertiaryIconMouseArea.enabled
property var contextOptions: []

8
nymea-app/ui/components/NymeaSwipeDelegate.qml
View File

@ -32,6 +32,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Nymea 1.0
SwipeDelegate {
id: root
@ -48,15 +49,12 @@ SwipeDelegate {
property string iconName
property string thumbnail
property int iconSize: app.iconSize
property color iconColor: app.accentColor
property alias iconKeyColor: icon.keyColor
property color iconColor: Style.accentColor
property alias secondaryIconName: secondaryIcon.name
property alias secondaryIconColor: secondaryIcon.color
property alias secondaryIconKeyColor: secondaryIcon.keyColor
property alias secondaryIconClickable: secondaryIconMouseArea.enabled
property alias tertiaryIconName: tertiaryIcon.name
property alias tertiaryIconColor: tertiaryIcon.color
property alias tertiaryIconKeyColor: tertiaryIcon.keyColor
property alias tertiaryIconClickable: tertiaryIconMouseArea.enabled
property var contextOptions: []
@ -214,7 +212,7 @@ SwipeDelegate {
anchors.fill: parent
anchors.margins: app.margins
name: entry.icon
color: entry.hasOwnProperty("foregroundColor") ? entry.foregroundColor : keyColor
color: entry.hasOwnProperty("foregroundColor") ? entry.foregroundColor : Style.iconColor
}
onClicked: {
swipe.close();

5
nymea-app/ui/components/PasswordTextField.qml
View File

@ -31,6 +31,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.2
import Nymea 1.0
ColumnLayout {
id: root
@ -99,7 +100,7 @@ ColumnLayout {
}
var ret = []
for (var i = 0; i < texts.length; i++) {
var entry = "<font color=\"%1\">• ".arg(checks[i] ? "#ffffff" : app.accentColor)
var entry = "<font color=\"%1\">• ".arg(checks[i] ? "#ffffff" : Style.accentColor)
entry += texts[i]
entry += "</font>"
ret.push(entry)
@ -112,7 +113,7 @@ ColumnLayout {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize
name: "../images/eye.svg"
color: root.hiddenPassword ? keyColor : app.accentColor
color: root.hiddenPassword ? Style.iconColor : Style.accentColor
MouseArea {
anchors.fill: parent
onClicked: {

6
nymea-app/ui/components/ProgressButton.qml
View File

@ -30,6 +30,7 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import Nymea 1.0
Item {
id: root
@ -39,7 +40,6 @@ Item {
property string imageSource
property string longpressImageSource: imageSource
property bool repeat: false
property alias keyColor: icon.keyColor
property alias color: icon.color
property bool longpressEnabled: true
@ -98,7 +98,7 @@ Item {
anchors.fill: parent
anchors.margins: -app.margins / 2
radius: width / 2
color: app.foregroundColor
color: Style.foregroundColor
opacity: buttonDelegate.pressed || buttonDelegate.containsMouse ? .08 : 0
Behavior on opacity {
NumberAnimation { duration: 200 }
@ -132,7 +132,7 @@ Item {
ctx.clearRect(0, 0, canvas.width, canvas.height);
ctx.fillStyle = Qt.rgba(1, 0, 0, 1);
ctx.lineWidth = canvas.penWidth
ctx.strokeStyle = app.accentColor
ctx.strokeStyle = Style.accentColor
var start = -Math.PI / 2;
var stop = -Math.PI / 2;

2
nymea-app/ui/components/SettingsPageBase.qml
View File

@ -47,7 +47,7 @@ Page {
Flickable {
anchors.fill: parent
contentHeight: contentColumn.height
contentHeight: contentColumn.height + app.margins
interactive: contentHeight > height
ScrollBar.vertical: ScrollBar {}

3
nymea-app/ui/components/SettingsPageSectionHeader.qml
View File

@ -31,6 +31,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.2
import Nymea 1.0
Label {
Layout.fillWidth: true
@ -38,6 +39,6 @@ Label {
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
Layout.bottomMargin: app.margins
color: app.accentColor
color: Style.accentColor
wrapMode: Text.WordWrap
}

2
nymea-app/ui/components/SetupStatusIcon.qml
View File

@ -12,7 +12,7 @@ ColorIcon {
name: setupFailed ? "../images/dialog-warning-symbolic.svg"
: setupInProgress ? "../images/settings.svg" : "../images/tick.svg"
color: setupFailed ? "red" : keyColor
color: setupFailed ? "red" : Style.iconColor
RotationAnimation on rotation {
from: 0; to: 360

6
nymea-app/ui/components/ShuffleRepeatVolumeControl.qml
View File

@ -54,7 +54,7 @@ RowLayout {
HeaderButton {
anchors.centerIn: parent
imageSource: root.repeatState.value === "One" ? "../images/media-playlist-repeat-one.svg" : "../images/media-playlist-repeat.svg"
color: root.repeatState.value === "None" ? keyColor : app.accentColor
color: root.repeatState.value === "None" ? Style.iconColor : Style.accentColor
property var allowedValues: ["None", "All", "One"]
onClicked: {
var params = []
@ -75,7 +75,7 @@ RowLayout {
HeaderButton {
anchors.centerIn: parent
imageSource: "../images/media-playlist-shuffle.svg"
color: root.shuffleState.value === true ? app.accentColor: keyColor
color: root.shuffleState.value === true ? Style.accentColor: Style.iconColor
onClicked: {
var params = []
var param = {}
@ -151,7 +151,7 @@ RowLayout {
HeaderButton {
visible: root.muteState !== null
imageSource: "../images/audio-speakers-muted-symbolic.svg"
color: root.muteState.value === true ? app.accentColor : keyColor
color: root.muteState.value === true ? Style.accentColor : Style.iconColor
onClicked: engine.thingManager.executeAction(root.thing.id, root.muteState.stateTypeId, [{paramTypeId: root.muteState.stateTypeId, value: !root.muteState.value}]);
}
}

4
nymea-app/ui/components/ShutterControls.qml
View File

@ -52,7 +52,7 @@ RowLayout {
ProgressButton {
longpressEnabled: false
imageSource: root.invert ? "../images/down.svg" : "../images/up.svg"
color: root.openState && root.openState.value === "opening" ? Material.accent : keyColor
color: root.openState && root.openState.value === "opening" ? Material.accent : Style.iconColor
onClicked: {
engine.deviceManager.executeAction(root.device.id, root.deviceClass.actionTypes.findByName("open").id)
root.activated("open")
@ -76,7 +76,7 @@ RowLayout {
ProgressButton {
imageSource: root.invert ? "../images/up.svg" : "../images/down.svg"
longpressEnabled: false
color: root.openState && root.openState.value === "closing" ? Material.accent : keyColor
color: root.openState && root.openState.value === "closing" ? Material.accent : Style.iconColor
onClicked: {
engine.deviceManager.executeAction(root.device.id, root.deviceClass.actionTypes.findByName("close").id)
root.activated("close")

8
nymea-app/ui/components/SmartMeterChart.qml
View File

@ -37,12 +37,12 @@ import Nymea 1.0
ChartView {
id: chart
backgroundColor: app.backgroundColor
backgroundColor: Style.backgroundColor
theme: ChartView.ChartThemeLight
legend.labelColor: app.foregroundColor
legend.labelColor: Style.foregroundColor
legend.font.pixelSize: app.smallFont
legend.alignment: Qt.AlignRight
titleColor: app.foregroundColor
titleColor: Style.foregroundColor
property ThingsProxy meters: null
property int multiplier: 1
@ -78,7 +78,7 @@ ChartView {
value = value - (totalProducedState.value * chart.multiplier)
}
var slice = pieSeries.append(thing.name, Math.max(0, value))
var color = app.accentColor
var color = Style.accentColor
for (var j = 0; j < i; j+=2) {
if (i % 2 == 0) {
color = Qt.lighter(color, 1.2);

3
nymea-app/ui/components/ThinDivider.qml
View File

@ -30,9 +30,10 @@
import QtQuick 2.0
import QtQuick.Layouts 1.2
import Nymea 1.0
Rectangle {
height: 1
Layout.fillWidth: true
color: app.accentColor
color: Style.accentColor
}

6
nymea-app/ui/components/ThingInfoPane.qml
View File

@ -28,7 +28,7 @@ InfoPaneBase {
shown: setupInProgress || setupFailure || batteryState !== null || (connectedState !== null && connectedState.value === false) || signalStrengthState !== null || updateAvailable
color: alertState ? "red"
: highlightState ? app.accentColor : "transparent"
: highlightState ? Style.accentColor : "transparent"
contentItem: RowLayout {
id: contentRow
@ -36,7 +36,7 @@ InfoPaneBase {
Label {
id: textLabel
color: root.alertState || root.highlightState ? "white" : app.foregroundColor
color: root.alertState || root.highlightState ? "white" : Style.foregroundColor
font.pixelSize: app.smallFont
Layout.fillWidth: true
horizontalAlignment: Text.AlignRight
@ -59,7 +59,7 @@ InfoPaneBase {
ThingStatusIcons {
thing: root.thing
color: root.alertState || root.highlightState ? "white" : keyColor
color: root.alertState || root.highlightState ? "white" : Style.iconColor
}
}

11
nymea-app/ui/components/ThingStatusIcons.qml
View File

@ -10,8 +10,7 @@ RowLayout {
property Thing thing: null
property color color: keyColor
readonly property color keyColor: updateStatusIcon.keyColor
property color color: Style.iconColor
signal updateIconClicked();
signal batteryIconClicked();
@ -24,7 +23,7 @@ RowLayout {
Layout.preferredWidth: height
thing: root.thing
visible: setupStatusIcon.setupStatus == Thing.ThingSetupStatusComplete && connectionStatusIcon.isConnected && (updateAvailable || updateRunning)
Binding { target: updateStatusIcon; property: "color"; value: root.color; when: root.color !== root.keyColor }
Binding { target: updateStatusIcon; property: "color"; value: root.color; when: root.color !== Style.iconColor }
MouseArea {
anchors.fill: parent
anchors.margins: -app.margins / 4
@ -62,7 +61,7 @@ RowLayout {
Layout.preferredWidth: height
thing: root.thing
visible: root.thing.setupStatus == Thing.ThingSetupStatusComplete && (hasBatteryLevel || isCritical)
Binding { target: batteryStatusIcon; property: "color"; value: root.color; when: root.color !== root.keyColor }
Binding { target: batteryStatusIcon; property: "color"; value: root.color; when: root.color !== Style.iconColor }
MouseArea {
anchors.fill: parent
anchors.margins: -app.margins / 4
@ -91,7 +90,7 @@ RowLayout {
Layout.preferredWidth: height
thing: root.thing
visible: root.thing.setupStatus == Thing.ThingSetupStatusComplete && (hasSignalStrength || !isConnected)
Binding { target: connectionStatusIcon; property: "color"; value: root.color; when: root.color !== root.keyColor }
Binding { target: connectionStatusIcon; property: "color"; value: root.color; when: root.color !== Style.iconColor }
MouseArea {
anchors.fill: parent
anchors.margins: -app.margins / 4
@ -120,7 +119,7 @@ RowLayout {
Layout.preferredWidth: height
thing: root.thing
visible: setupFailed || setupInProgress
Binding { target: setupStatusIcon; property: "color"; value: root.color; when: root.color !== root.keyColor }
Binding { target: setupStatusIcon; property: "color"; value: root.color; when: root.color !== Style.iconColor }
MouseArea {
anchors.fill: parent
anchors.margins: -app.margins / 4

4
nymea-app/ui/components/TimePicker.qml
View File

@ -206,7 +206,7 @@ ColumnLayout {
Rectangle {
anchors { left: parent.left; top: parent.top; right: parent.right }
height: width
color: app.accentColor
color: Style.accentColor
radius: width / 2
}
Rectangle {
@ -214,7 +214,7 @@ ColumnLayout {
anchors.horizontalCenter: parent.horizontalCenter
width: 5
height: parent.height / 2
color: app.accentColor
color: Style.accentColor
radius: width / 2
}
}

2
nymea-app/ui/components/UpdateRunningOverlay.qml
View File

@ -53,7 +53,7 @@ Rectangle {
width: height
Layout.alignment: Qt.AlignHCenter
name: Qt.resolvedUrl("../images/system-update.svg")
color: app.accentColor
color: Style.accentColor
PropertyAnimation on rotation {
from: 0; to: 360;
duration: 2000

2
nymea-app/ui/components/UpdateStatusIcon.qml
View File

@ -11,7 +11,7 @@ ColorIcon {
readonly property bool updateRunning: updateStatusState && updateStatusState.value === "updating"
name: "../images/system-update.svg"
color: app.accentColor
color: Style.accentColor
RotationAnimation on rotation {
from: 0; to: 360

4
nymea-app/ui/connection/CertificateDialog.qml
View File

@ -57,7 +57,7 @@ Dialog {
Layout.preferredHeight: app.iconSize * 2
Layout.preferredWidth: height
name: "../images/lock-closed.svg"
color: app.accentColor
color: Style.accentColor
}
Label {
@ -65,7 +65,7 @@ Dialog {
Layout.fillWidth: true
wrapMode: Text.WordWrap
text: qsTr("Certificate information")
color: app.accentColor
color: Style.accentColor
font.pixelSize: app.largeFont
}
}

22
nymea-app/ui/connection/ConnectPage.qml
View File

@ -54,24 +54,6 @@ Page {
}
}
// header: FancyHeader {
// title: qsTr("Connect %1").arg(app.systemName)
// model: ListModel {
// ListElement { iconSource: "../images/connections/network-vpn.svg"; text: qsTr("Manual connection"); page: "ManualConnectPage.qml" }
// ListElement { iconSource: "../images/connections/bluetooth.svg"; text: qsTr("Wireless setup"); page: "wifisetup/BluetoothDiscoveryPage.qml"; }
// ListElement { iconSource: "../images/private-browsing.svg"; text: qsTr("Demo mode"); page: "" }
// ListElement { iconSource: "../images/stock_application.svg"; text: qsTr("App settings"); page: "../appsettings/AppSettingsPage.qml" }
// }
// onClicked: {
// if (index === 2) {
// var host = discovery.nymeaHosts.createWanHost("Demo server", "nymea://nymea.nymea.io:2222")
// engine.jsonRpcClient.connectToHost(host)
// } else {
// pageStack.push(model.get(index).page, {nymeaDiscovery: discovery});
// }
// }
// }
readonly property bool haveHosts: hostsProxy.count > 0
@ -312,7 +294,7 @@ Page {
Layout.preferredHeight: app.iconSize * 2
Layout.preferredWidth: height
name: "../images/info.svg"
color: app.accentColor
color: Style.accentColor
}
Label {
@ -320,7 +302,7 @@ Page {
Layout.fillWidth: true
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
text: dialog.title
color: app.accentColor
color: Style.accentColor
font.pixelSize: app.largeFont
}
}

2
nymea-app/ui/connection/LoginPage.qml
View File

@ -96,7 +96,7 @@ Page {
Layout.preferredHeight: app.iconSize * 2
Layout.preferredWidth: app.iconSize * 2
name: "../images/lock-closed.svg"
color: app.accentColor
color: Style.accentColor
}
Label {

2
nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml
View File

@ -159,7 +159,7 @@ Page {
Label {
Layout.fillWidth: true
text: qsTr("Uh oh")
color: app.accentColor
color: Style.accentColor
font.pixelSize: app.largeFont
}

4
nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml
View File

@ -79,7 +79,7 @@ Page {
enabled: !networkManagerController.manager.working
subText: model.hostAddress
iconColor: model.selectedNetwork ? app.accentColor : "#808080"
iconColor: model.selectedNetwork ? Style.accentColor : "#808080"
iconName: {
if (model.protected) {
if (model.signalStrength <= 25)
@ -175,7 +175,7 @@ Page {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize
name: "../images/eye.svg"
color: passwordTextField.showPassword ? app.accentColor : keyColor
color: passwordTextField.showPassword ? Style.accentColor : Style.iconColor
MouseArea {
anchors.fill: parent
onClicked: passwordTextField.showPassword = !passwordTextField.showPassword

2
nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml
View File

@ -115,7 +115,7 @@ Page {
Layout.preferredWidth: height
Layout.alignment: Qt.AlignCenter
name: "../images/tick.svg"
color: app.accentColor
color: Style.accentColor
}
Label {
Layout.fillWidth: true

2
nymea-app/ui/customviews/GarageController.qml
View File

@ -93,7 +93,7 @@ Item {
name: arrows.up ? "../images/up.svg" : "../images/down.svg"
width: parent.width
height: width
color: app.accentColor
color: Style.accentColor
}
}
}

16
nymea-app/ui/customviews/GenericTypeGraph.qml
View File

@ -49,7 +49,7 @@ Item {
readonly property bool hasConnectable: deviceClass.interfaces.indexOf("connectable") >= 0
readonly property var connectedStateType: hasConnectable ? deviceClass.stateTypes.findByName("connected") : null
property color color: app.accentColor
property color color: Style.accentColor
property string iconSource: ""
LogsModelNg {
@ -127,7 +127,7 @@ Item {
margins.right: 0
backgroundColor: Material.background
legend.visible: false
legend.labelColor: app.foregroundColor
legend.labelColor: Style.foregroundColor
animationDuration: 300
animationOptions: ChartView.SeriesAnimations
@ -154,9 +154,9 @@ Item {
return "%d";
}
}
labelsColor: app.foregroundColor
labelsColor: Style.foregroundColor
tickCount: root.stateType.type.toLowerCase() === "bool" ? 2 : chartView.height / 40
color: Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, .2)
color: Qt.rgba(Style.foregroundColor.r, Style.foregroundColor.g, Style.foregroundColor.b, .2)
gridLineColor: color
}
@ -170,10 +170,10 @@ Item {
DateTimeAxis {
id: xAxis
gridVisible: false
color: Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, .2)
color: Qt.rgba(Style.foregroundColor.r, Style.foregroundColor.g, Style.foregroundColor.b, .2)
tickCount: chartView.width / 70
labelsFont.pixelSize: app.smallFont
labelsColor: app.foregroundColor
labelsColor: Style.foregroundColor
property int timeDiff: (xAxis.max.getTime() - xAxis.min.getTime()) / 1000
function getTimeSpanString() {
@ -213,7 +213,7 @@ Item {
}
return Qt.formatDate(xAxis.min) + " - " + Qt.formatDate(xAxis.max) + " (" + getTimeSpanString() + ")"
}
titleBrush: app.foregroundColor
titleBrush: Style.foregroundColor
format: {
if (timeDiff < 60) { // one minute
return "mm:ss"
@ -354,7 +354,7 @@ Item {
axisX: xAxis
axisY: yAxis
pointLabelsVisible: root.stateType.type.toLowerCase() !== "bool"
pointLabelsColor: app.foregroundColor
pointLabelsColor: Style.foregroundColor
pointLabelsFont.pixelSize: app.smallFont
pointLabelsFormat: "@yPoint"
pointLabelsClipping: false

2
nymea-app/ui/customviews/WeatherView.qml
View File

@ -98,7 +98,7 @@ Item {
Layout.preferredWidth: parent.mainImageSize
Layout.preferredHeight: width
name: weatherConditionState ? "../images/weathericons/weather-" + weatherConditionState.value + ".svg" : ""
color: app.foregroundColor
color: Style.foregroundColor
}
Item {

6
nymea-app/ui/delegates/InterfaceTile.qml
View File

@ -39,7 +39,7 @@ MainPageTile {
id: root
text: iface ? iface.displayName.toUpperCase() : qsTr("uncategorized").toUpperCase()
iconName: iface ? interfaceToIcon(iface.name) : interfaceToIcon("uncategorized")
iconColor: app.accentColor
iconColor: Style.accentColor
disconnected: devicesSubProxyConnectables.count > 0
isWireless: devicesSubProxyConnectables.count > 0 && devicesSubProxyConnectables.get(0).thingClass.interfaces.indexOf("wirelessconnectable") >= 0
batteryCritical: devicesSubProxyBattery.count > 0
@ -683,7 +683,7 @@ MainPageTile {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize
name: sensorsRoot.currentSensor >= 0 && sensorsRoot.shownSensors.length > sensorsRoot.currentSensor ? app.interfaceToIcon(sensorsRoot.shownSensors[sensorsRoot.currentSensor].ifaceName) : ""
color: sensorsRoot.currentSensor >= 0 && sensorsRoot.shownSensors.length > sensorsRoot.currentSensor ? app.interfaceToColor(sensorsRoot.shownSensors[sensorsRoot.currentSensor].ifaceName) : keyColor
color: sensorsRoot.currentSensor >= 0 && sensorsRoot.shownSensors.length > sensorsRoot.currentSensor ? app.interfaceToColor(sensorsRoot.shownSensors[sensorsRoot.currentSensor].ifaceName) : Style.iconColor
}
ColumnLayout {
@ -698,7 +698,7 @@ MainPageTile {
text: sensorsRoot.shownStateType
? (Math.round(Types.toUiValue(sensorsRoot.device.states.getState(sensorsRoot.shownStateType.id).value, sensorsRoot.shownStateType.unit) * 100) / 100) + " " + Types.toUiUnit(sensorsRoot.shownStateType.unit)
: ""
// font.pixelSize: app.smallFont
font.pixelSize: app.smallFont
Layout.fillWidth: true
visible: sensorsRoot.shownStateType && sensorsRoot.shownStateType.type.toLowerCase() !== "bool"
elide: Text.ElideRight

2
nymea-app/ui/delegates/ParamDelegate.qml
View File

@ -336,7 +336,7 @@ ItemDelegate {
touchDelegate: Rectangle {
height: colorPickerCt.height
width: 5
color: app.accentColor
color: Style.accentColor
}
}
}

4
nymea-app/ui/delegates/ThingDelegate.qml
View File

@ -62,12 +62,12 @@ NymeaSwipeDelegate {
return "red"
}
if (thing.setupStatus == Thing.ThingSetupStatusInProgress) {
return iconKeyColor
return Style.iconColor
}
if (connectedState && connectedState.value === false) {
return "red"
}
return iconKeyColor
return Style.iconColor
}
property Device device: null

4
nymea-app/ui/delegates/ThingTile.qml
View File

@ -39,7 +39,7 @@ MainPageTile {
id: root
text: device.name.toUpperCase()
iconName: app.interfacesToIcon(deviceClass.interfaces)
iconColor: app.accentColor
iconColor: Style.accentColor
isWireless: deviceClass.interfaces.indexOf("wirelessconnectable") >= 0
batteryCritical: batteryCriticalState && batteryCriticalState.value === true
disconnected: connectedState && connectedState.value === false
@ -128,7 +128,7 @@ MainPageTile {
name: deviceClass.interfaces.indexOf("light") >= 0
? (powerState.value === true ? "../images/light-on.svg" : "../images/light-off.svg")
: app.interfacesToIcon(deviceClass.interfaces)
color: powerState.value === true ? app.accentColor : keyColor
color: powerState.value === true ? Style.accentColor : Style.iconColor
}
onClicked: {
var deviceClass = engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);

4
nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml
View File

@ -124,8 +124,8 @@ DeviceListPageBase {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize
color: itemDelegate.movingState && itemDelegate.movingState.value === true
? app.accentColor
: keyColor
? Style.accentColor
: Style.iconColor
name: itemDelegate.percentageState
? root.iconBasename + "-" + app.pad(Math.round(itemDelegate.percentageState.value / 10) * 10, 3) + ".svg"
: root.iconBasename + "-050.svg"

4
nymea-app/ui/devicelistpages/GarageThingListPage.qml
View File

@ -90,8 +90,8 @@ DeviceListPageBase {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize
color: itemDelegate.movingState && itemDelegate.movingState.value === true
? app.accentColor
: keyColor
? Style.accentColor
: Style.iconColor
name: itemDelegate.percentageState
? root.iconBasename + "-" + app.pad(Math.round(itemDelegate.percentageState.value / 10) * 10, 3) + ".svg"
: root.iconBasename + "-050.svg"

2
nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
View File

@ -94,7 +94,7 @@ DeviceListPageBase {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: app.iconSize
name: app.interfacesToIcon(itemDelegate.thing.thingClass.interfaces)
color: itemDelegate.powerState && itemDelegate.powerState.value === true ? app.accentColor : keyColor
color: itemDelegate.powerState && itemDelegate.powerState.value === true ? Style.accentColor : Style.iconColor
}
Label {

Some files were not shown because too many files have changed in this diff Show More