Skip to content

Commit 2a4461b

Browse files
committed
use vertical aligned logo instead of horizontal
1 parent eeb68a9 commit 2a4461b

20 files changed

+1333
-1189
lines changed

nymea-app/images.qrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<file>ui/images/find.svg</file>
8181
<file>ui/images/fingerprint.svg</file>
8282
<file>ui/images/go-down.svg</file>
83-
<file>ui/images/guh-logo.svg</file>
83+
<file>ui/images/nymea-logo.svg</file>
8484
<file>ui/images/info.svg</file>
8585
<file>ui/images/light-off.svg</file>
8686
<file>ui/images/light-on.svg</file>
@@ -256,6 +256,6 @@
256256
<file>ui/images/sensors/water.svg</file>
257257
<file>ui/images/zigbee/deCONZ.svg</file>
258258
<file>ui/images/zigbee/NXP.svg</file>
259-
<file>ui/images/nymea-splash-horizontal.svg</file>
259+
<file>ui/images/nymea-splash.svg</file>
260260
</qresource>
261261
</RCC>

nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class NymeaAppActivity extends org.qtproject.qt5.android.bindings.QtActiv
1919
private static final String TAG = "nymea-app: NymeaAppActivity";
2020
private static Context context = null;
2121

22-
private static native void nightModeEnabledChangedJNI();
22+
private static native void darkModeEnabledChangedJNI();
2323

2424
@Override
2525
public void onCreate(Bundle savedInstanceState) {
@@ -30,7 +30,7 @@ public void onCreate(Bundle savedInstanceState) {
3030
@Override
3131
public void onConfigurationChanged(Configuration newConfig) {
3232
super.onConfigurationChanged(newConfig);
33-
NymeaAppActivity.nightModeEnabledChangedJNI();
33+
NymeaAppActivity.darkModeEnabledChangedJNI();
3434
}
3535

3636

nymea-app/styles/light/logo.svg

-1
Loading

nymea-app/ui/Nymea.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ ApplicationWindow {
560560
Image {
561561
id: splashScreen
562562
parent: overlay
563-
source: "/ui/images/nymea-splash-horizontal.svg"
563+
source: "/ui/images/nymea-splash.svg"
564564
anchors.fill: parent
565565
fillMode: Image.PreserveAspectCrop
566566
opacity: PlatformHelper.splashVisible ? 1 : 0

nymea-app/ui/images/guh-logo.svg nymea-app/ui/images/nymea-logo.svg

+1-2
Loading

nymea-app/ui/images/nymea-splash-horizontal.svg nymea-app/ui/images/nymea-splash-dark.svg

+238-18
Loading

0 commit comments

Comments
 (0)