diff --git a/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java b/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java index c182f8a6..dfb5c512 100644 --- a/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java +++ b/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java @@ -52,11 +52,11 @@ public class NymeaAppNotificationService extends FirebaseMessagingService { PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent, PendingIntent.FLAG_CANCEL_CURRENT); - // We can't directly access R.drawable.ic_stat_notification from here: + // We can't directly access R.drawable.notificationicon from here: // When the package is branded, the package name is not "io.guh.nymeaapp" and resources in // the res/ folder are built into the app's package which isn't the same as this files package. // Because of this, we need to dynamically fetch the resource from the package resources - int resId = getResources().getIdentifier("ic_stat_notificationicon", "drawable", getPackageName()); + int resId = getResources().getIdentifier("notificationicon", "drawable", getPackageName()); Log.d(TAG, "notification icon resource: " + resId + " Package:" + getPackageName()); diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml index 2846b6de..ab7fb800 100644 --- a/packaging/android/AndroidManifest.xml +++ b/packaging/android/AndroidManifest.xml @@ -33,7 +33,7 @@ - + diff --git a/packaging/android/icon_foreground.svg b/packaging/android/icon_foreground.svg new file mode 100644 index 00000000..b65e6579 --- /dev/null +++ b/packaging/android/icon_foreground.svg @@ -0,0 +1,621 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/android/icon_monochrome.svg b/packaging/android/icon_monochrome.svg new file mode 100644 index 00000000..8943e1de --- /dev/null +++ b/packaging/android/icon_monochrome.svg @@ -0,0 +1,935 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/android/notificationicon.svg b/packaging/android/notificationicon.svg index adb5fb2b..48c5642b 100644 --- a/packaging/android/notificationicon.svg +++ b/packaging/android/notificationicon.svg @@ -2,22 +2,22 @@ + inkscape:export-ydpi="9" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> image/svg+xml - @@ -358,577 +357,582 @@ inkscape:groupmode="layer" id="layer1" transform="translate(-143.41788,-709.27353)"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g1111" + transform="matrix(1.2404189,0,0,1.2404189,-65.253872,-201.29635)" + style="stroke-width:0.806179"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="fill:#feffff;fill-opacity:1;stroke-width:0.806179" + id="g43" + transform="matrix(1.4440786,0,0,1.4440786,-333.76137,493.00519)"> + id="linearGradient3548"> + id="stop3550" + style="stop-color:#7CC099" + offset="0.1296" /> + + + style="fill:#feffff;fill-opacity:1;stroke-width:0.806179" + id="g56" + transform="matrix(1.4440786,0,0,1.4440786,-333.76137,493.00519)"> + style="fill:#feffff;fill-opacity:1;stroke-width:0.806179" + id="g58"> + id="linearGradient3561"> - - - - - - - - - - - - - - - - - - - + style="fill:#feffff;fill-opacity:1;stroke-width:0.806179" + id="g67"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - diff --git a/packaging/android/res/drawable-anydpi/notificationicon.xml b/packaging/android/res/drawable-anydpi/notificationicon.xml new file mode 100644 index 00000000..9d202e77 --- /dev/null +++ b/packaging/android/res/drawable-anydpi/notificationicon.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/android/res/drawable-hdpi/ic_stat_notificationicon.png b/packaging/android/res/drawable-hdpi/ic_stat_notificationicon.png deleted file mode 100644 index d5d0e760..00000000 Binary files a/packaging/android/res/drawable-hdpi/ic_stat_notificationicon.png and /dev/null differ diff --git a/packaging/android/res/drawable-mdpi/ic_stat_notificationicon.png b/packaging/android/res/drawable-mdpi/ic_stat_notificationicon.png deleted file mode 100644 index 07896d40..00000000 Binary files a/packaging/android/res/drawable-mdpi/ic_stat_notificationicon.png and /dev/null differ diff --git a/packaging/android/res/drawable-mdpi/icon.png b/packaging/android/res/drawable-mdpi/icon.png deleted file mode 100644 index c9e36c72..00000000 Binary files a/packaging/android/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/packaging/android/res/drawable-mdpi/icon_foreground.png b/packaging/android/res/drawable-mdpi/icon_foreground.png deleted file mode 100644 index 8650e6cb..00000000 Binary files a/packaging/android/res/drawable-mdpi/icon_foreground.png and /dev/null differ diff --git a/packaging/android/res/drawable-mdpi/round_icon.png b/packaging/android/res/drawable-mdpi/round_icon.png deleted file mode 100644 index e1940ab0..00000000 Binary files a/packaging/android/res/drawable-mdpi/round_icon.png and /dev/null differ diff --git a/packaging/android/res/drawable-xhdpi/ic_stat_notificationicon.png b/packaging/android/res/drawable-xhdpi/ic_stat_notificationicon.png deleted file mode 100644 index bbe8b155..00000000 Binary files a/packaging/android/res/drawable-xhdpi/ic_stat_notificationicon.png and /dev/null differ diff --git a/packaging/android/res/drawable-xxhdpi/ic_stat_notificationicon.png b/packaging/android/res/drawable-xxhdpi/ic_stat_notificationicon.png deleted file mode 100644 index 67245277..00000000 Binary files a/packaging/android/res/drawable-xxhdpi/ic_stat_notificationicon.png and /dev/null differ diff --git a/packaging/android/res/drawable-xxxhdpi/ic_stat_notificationicon.png b/packaging/android/res/drawable-xxxhdpi/ic_stat_notificationicon.png deleted file mode 100644 index a51e3717..00000000 Binary files a/packaging/android/res/drawable-xxxhdpi/ic_stat_notificationicon.png and /dev/null differ diff --git a/packaging/android/res/mipmap-anydpi-v26/icon.xml b/packaging/android/res/mipmap-anydpi-v26/icon.xml index 228e9421..a1bf1142 100644 --- a/packaging/android/res/mipmap-anydpi-v26/icon.xml +++ b/packaging/android/res/mipmap-anydpi-v26/icon.xml @@ -1,5 +1,6 @@ - + + diff --git a/packaging/android/res/mipmap-anydpi-v26/round_icon.xml b/packaging/android/res/mipmap-anydpi-v26/round_icon.xml index 228e9421..a1bf1142 100644 --- a/packaging/android/res/mipmap-anydpi-v26/round_icon.xml +++ b/packaging/android/res/mipmap-anydpi-v26/round_icon.xml @@ -1,5 +1,6 @@ - + + diff --git a/packaging/android/res/mipmap-anydpi/icon_foreground.xml b/packaging/android/res/mipmap-anydpi/icon_foreground.xml new file mode 100644 index 00000000..4054a6da --- /dev/null +++ b/packaging/android/res/mipmap-anydpi/icon_foreground.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/android/res/mipmap-anydpi/icon_monochrome.xml b/packaging/android/res/mipmap-anydpi/icon_monochrome.xml new file mode 100644 index 00000000..9f052c83 --- /dev/null +++ b/packaging/android/res/mipmap-anydpi/icon_monochrome.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +