diff --git a/nymea-app/images.qrc b/nymea-app/images.qrc index dabaebe0..c16b3c8c 100644 --- a/nymea-app/images.qrc +++ b/nymea-app/images.qrc @@ -80,7 +80,7 @@ ui/images/find.svg ui/images/fingerprint.svg ui/images/go-down.svg - ui/images/guh-logo.svg + ui/images/nymea-logo.svg ui/images/info.svg ui/images/light-off.svg ui/images/light-on.svg @@ -256,6 +256,6 @@ ui/images/sensors/water.svg ui/images/zigbee/deCONZ.svg ui/images/zigbee/NXP.svg - ui/images/nymea-splash-horizontal.svg + ui/images/nymea-splash.svg diff --git a/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java index 93b5e29f..fc24626d 100644 --- a/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java +++ b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java @@ -19,7 +19,7 @@ public class NymeaAppActivity extends org.qtproject.qt5.android.bindings.QtActiv private static final String TAG = "nymea-app: NymeaAppActivity"; private static Context context = null; - private static native void nightModeEnabledChangedJNI(); + private static native void darkModeEnabledChangedJNI(); @Override public void onCreate(Bundle savedInstanceState) { @@ -30,7 +30,7 @@ public class NymeaAppActivity extends org.qtproject.qt5.android.bindings.QtActiv @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - NymeaAppActivity.nightModeEnabledChangedJNI(); + NymeaAppActivity.darkModeEnabledChangedJNI(); } diff --git a/nymea-app/styles/light/logo.svg b/nymea-app/styles/light/logo.svg index 9d1907c3..03fb23c5 100644 --- a/nymea-app/styles/light/logo.svg +++ b/nymea-app/styles/light/logo.svg @@ -15,7 +15,6 @@ 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"> + height="595.28003" + inkscape:export-filename="/home/micha/Develop/nymea-app/packaging/linux-common/nymea-splash.png" + inkscape:export-xdpi="218.94" + inkscape:export-ydpi="218.94"> @@ -41,14 +44,15 @@ inkscape:window-height="873" id="namedview106" showgrid="true" - inkscape:zoom="0.44473763" - inkscape:cx="248.2707" - inkscape:cy="236.96862" + inkscape:zoom="0.48384218" + inkscape:cx="372.45009" + inkscape:cy="442.5357" inkscape:window-x="60" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="Layer_1" - units="px"> + units="px" + inkscape:document-rotation="0"> @@ -476,18 +480,224 @@ style="stop-color:#57BAAE" id="stop158" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Artboard 1 copy 5 Kopie 2 @@ -799,23 +1009,33 @@ + class="cls-4" + d="m 458.45974,254.10869 -0.15,0.1 z" + id="path1063" + style="fill:url(#linear-gradient-3-5)" /> + d="m 342.16974,376.39868 c 1,-0.25 2.33,-0.52 4,-0.8 a 34.89,34.89 0 0 1 5.74,-0.42 12.38,12.38 0 0 1 4.84,0.82 7.7,7.7 0 0 1 3.08,2.3 9.12,9.12 0 0 1 1.62,3.55 20.81,20.81 0 0 1 0.47,4.56 v 13.73 h -4.37 v -12.74 a 21.09,21.09 0 0 0 -0.31,-3.85 6.47,6.47 0 0 0 -1,-2.59 4,4 0 0 0 -1.88,-1.43 8.16,8.16 0 0 0 -2.91,-0.45 c -0.47,0 -1,0 -1.46,0.05 -0.46,0.05 -1,0.07 -1.43,0.12 -0.43,0.05 -0.87,0.10001 -1.23,0.16001 l -0.77,0.14 v 20.63999 h -4.37 z" + id="path1079" + style="fill:#fffff8;fill-opacity:1" /> + d="m 373.04974,404.68868 a 7.7,7.7 0 0 0 1.34,0.45 6.55,6.55 0 0 0 1.61,0.26 6.35,6.35 0 0 0 4,-1.15 11.64,11.64 0 0 0 2.77,-4.06 128.42,128.42 0 0 1 -5.66,-11.63999 103.32,103.32 0 0 1 -4.25,-12.81001 h 4.7 c 0.34,1.42001 0.76,2.94 1.24,4.56001 0.48,1.62 1,3.31 1.63,5 0.63,1.68999 1.23,3.44999 1.92,5.17 0.69,1.72 1.41,3.39 2.17,5 q 1.79,-4.94 3.1,-9.78 1.31,-4.84 2.49,-10 h 4.51 q -1.69,6.91 -3.76,13.28 -2.07,6.37 -4.46,11.92 a 24.85,24.85 0 0 1 -2,3.64 10.55,10.55 0 0 1 -2.23,2.51 8,8 0 0 1 -2.75,1.45999 11.85,11.85 0 0 1 -3.45,0.47001 8,8 0 0 1 -1.08,-0.07 c -0.38,-0.05 -0.75,-0.11 -1.11,-0.19 a 9.18,9.18 0 0 1 -1,-0.26 5.09,5.09 0 0 1 -0.64,-0.23 z" + id="path1081" + style="fill:#fffff8;fill-opacity:1" /> + d="m 404.86974,376.39868 c 1,-0.25 2.33,-0.52 4,-0.8 a 34.43,34.43 0 0 1 5.71,-0.42 10.83,10.83 0 0 1 3.95,0.63 7,7 0 0 1 2.68,1.86 c 0.22,-0.16 0.56,-0.38 1,-0.66 a 11.94,11.94 0 0 1 1.74,-0.82 18.64,18.64 0 0 1 2.31,-0.71 11.75,11.75 0 0 1 2.72,-0.3 11.06,11.06 0 0 1 4.61,0.82 6.54,6.54 0 0 1 2.79,2.33 9,9 0 0 1 1.37,3.57 27.44,27.44 0 0 1 0.35,4.51 v 13.73 h -4.37 v -12.74 a 28.09,28.09 0 0 0 -0.21,-3.71 7.19,7.19 0 0 0 -0.8,-2.58999 3.66,3.66 0 0 0 -1.6,-1.52 5.94,5.94 0 0 0 -2.6,-0.46 8.47,8.47 0 0 0 -3.54,0.89 12.23,12.23 0 0 0 -2,1.09 11.82,11.82 0 0 1 0.45,2.31 23,23 0 0 1 0.19,3.05 v 13.73 h -4.32 v -12.79001 a 24.63,24.63 0 0 0 -0.24,-3.71 7.38,7.38 0 0 0 -0.82,-2.58999 3.61,3.61 0 0 0 -1.6,-1.52 5.78,5.78 0 0 0 -2.56,-0.5 c -0.44,0 -0.91,0 -1.41,0.05 -0.5,0.05 -1,0.07 -1.43,0.12 -0.43,0.05 -0.87,0.1 -1.25,0.16 l -0.75,0.14 v 20.64 h -4.37 z" + id="path1083" + style="fill:#fffff8;fill-opacity:1" /> + d="m 490.31974,375.07868 a 12.47,12.47 0 0 1 4.44,0.69 7.17,7.17 0 0 1 2.92,1.92 7.34,7.34 0 0 1 1.57,3 14.51,14.51 0 0 1 0.47,3.79001 v 15.18 c -0.38,0.09 -1,0.24 -1.64,0.35 -0.64,0.11 -1.37,0.21 -2.21,0.31 -0.84,0.1 -1.76,0.18 -2.75,0.25 -0.99,0.07 -2,0.12 -2.94,0.12 a 16.23,16.23 0 0 1 -3.81,-0.42 8.4,8.4 0 0 1 -3,-1.34 6.12,6.12 0 0 1 -2,-2.42 8.47,8.47 0 0 1 -0.7,-3.62 6.94,6.94 0 0 1 0.82,-3.48 6.61,6.61 0 0 1 2.23,-2.35001 10.44,10.44 0 0 1 3.29,-1.31 17.46,17.46 0 0 1 4,-0.43 c 0.44,0 0.89,0 1.36,0.07 0.47,0.07 0.92,0.11 1.34,0.19 l 1.11,0.21 0.65,0.14 v -1.22 a 9.67,9.67 0 0 0 -0.23,-2.14 5,5 0 0 0 -0.85,-1.88 4.27,4.27 0 0 0 -1.67,-1.31 6.48,6.48 0 0 0 -2.74,-0.5 19.9,19.9 0 0 0 -3.73,0.36 11.47,11.47 0 0 0 -2.42,0.82 l -0.71,-3.62 a 12.45,12.45 0 0 1 3,-1 24,24 0 0 1 4.2,-0.36 z m 0.38,21.91 c 1,0 1.95,0 2.75,-0.07 a 12.76,12.76 0 0 0 2,-0.26 v -7.26001 a 5.81,5.81 0 0 0 -1.52,-0.4 17.06,17.06 0 0 0 -2.56,-0.16 17.48,17.48 0 0 0 -2.1,0.14 6.32,6.32 0 0 0 -2,0.59 4.13,4.13 0 0 0 -1.52,1.22 3.2,3.2 0 0 0 -0.62,2 3.52,3.52 0 0 0 1.51,3.27 7.82,7.82 0 0 0 4.06,0.93 z" + id="path1085" + style="fill:#fffff8;fill-opacity:1" /> + diff --git a/packaging/osx/AppIcon.svg b/nymea-app/ui/images/nymea-splash.svg similarity index 52% rename from packaging/osx/AppIcon.svg rename to nymea-app/ui/images/nymea-splash.svg index 301ab05e..471beede 100644 --- a/packaging/osx/AppIcon.svg +++ b/nymea-app/ui/images/nymea-splash.svg @@ -1,25 +1,262 @@ - - + sodipodi:docname="nymea-splash.svg" + inkscape:version="1.0.1 (1.0.1+r74)" + width="841.89001" + height="595.28003" + inkscape:export-filename="/home/micha/Develop/nymea-app/packaging/linux-common/nymea-splash.png" + inkscape:export-xdpi="218.94" + inkscape:export-ydpi="218.94"> + + + + image/svg+xml + + Artboard 1 copy 5 Kopie 2 + + + + + + + id="defs69"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="stop46-3" /> + id="stop48-6" /> + id="stop50-7" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - image/svg+xml - - - - - + Artboard 1 copy 5 Kopie 2 + + id="g1326" + transform="translate(87.962569,-39.787627)"> @@ -409,7 +821,7 @@ 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" /> + id="path91-5" /> @@ -599,5 +1011,30 @@ id="path160" /> + + + + + + diff --git a/packaging/android/appicon.svg b/packaging/android/appicon.svg index fb743ef7..fcdd3b76 100644 --- a/packaging/android/appicon.svg +++ b/packaging/android/appicon.svg @@ -15,7 +15,6 @@ version="1.1" inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="appicon.svg" - inkscape:export-filename="/home/micha/Develop/mea/mea/guh-logo-256x256.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> - diff --git a/packaging/android/res/drawable/splash.xml b/packaging/android/res/drawable/splash.xml index e155ae71..129bf592 100644 --- a/packaging/android/res/drawable/splash.xml +++ b/packaging/android/res/drawable/splash.xml @@ -5,6 +5,6 @@ - diff --git a/packaging/android/res/mipmap-anydpi/nymea_splash.xml b/packaging/android/res/mipmap-anydpi/nymea_splash.xml new file mode 100644 index 00000000..1f84a9b4 --- /dev/null +++ b/packaging/android/res/mipmap-anydpi/nymea_splash.xml @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/android/res/mipmap-anydpi/nymea_splash_dark.xml b/packaging/android/res/mipmap-anydpi/nymea_splash_dark.xml new file mode 100644 index 00000000..24827502 --- /dev/null +++ b/packaging/android/res/mipmap-anydpi/nymea_splash_dark.xml @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/android/res/mipmap-anydpi/nymea_splash_horizontal.xml b/packaging/android/res/mipmap-anydpi/nymea_splash_horizontal.xml deleted file mode 100644 index cdc6824d..00000000 --- a/packaging/android/res/mipmap-anydpi/nymea_splash_horizontal.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packaging/android/res/mipmap-anydpi/nymea_splash_horizontal_dark.xml b/packaging/android/res/mipmap-anydpi/nymea_splash_horizontal_dark.xml deleted file mode 100644 index 689d6a2f..00000000 --- a/packaging/android/res/mipmap-anydpi/nymea_splash_horizontal_dark.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packaging/linux-common/nymea-app-plain.svg b/packaging/linux-common/nymea-app-plain.svg deleted file mode 100644 index 064fcc23..00000000 --- a/packaging/linux-common/nymea-app-plain.svg +++ /dev/null @@ -1,555 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packaging/linux-common/nymea-splash-horizontal.png b/packaging/linux-common/nymea-splash-horizontal.png deleted file mode 100644 index 40f2abcd..00000000 Binary files a/packaging/linux-common/nymea-splash-horizontal.png and /dev/null differ diff --git a/packaging/linux-common/nymea-splash.png b/packaging/linux-common/nymea-splash.png new file mode 100644 index 00000000..bf47e43d Binary files /dev/null and b/packaging/linux-common/nymea-splash.png differ diff --git a/packaging/linux-common/nymea-splashscreen.service b/packaging/linux-common/nymea-splashscreen.service index 4364719b..25c2a786 100644 --- a/packaging/linux-common/nymea-splashscreen.service +++ b/packaging/linux-common/nymea-splashscreen.service @@ -6,7 +6,7 @@ ConditionKernelCommandLine=!nosplash ConditionKernelCommandLine=splash [Service] -ExecStart=/usr/bin/fbi --noverbose -d /dev/fb0 -a /usr/share/nymea-splashscreen/nymea-splash-horizontal.png -fitwidth +ExecStart=/usr/bin/fbi --noverbose -d /dev/fb0 -a /usr/share/nymea-splashscreen/nymea-splash.png -fitwidth StandardInput=tty StandardOutput=tty #TTYPath=/dev/tty1 diff --git a/packaging/ubuntu/click/appicon.svg b/packaging/ubuntu/click/appicon.svg index 7f1ddd65..b8f096ee 100644 --- a/packaging/ubuntu/click/appicon.svg +++ b/packaging/ubuntu/click/appicon.svg @@ -15,7 +15,6 @@ version="1.1" inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="appicon.svg" - inkscape:export-filename="/home/micha/Develop/mea/mea/guh-logo-256x256.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96">