100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Updated app icon and UI updates on project page
Michael Rademaker7ce4ec96fa0c
diff --git a/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/MainActivity.kt b/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/MainActivity.ktindex 550d3d1b2..0ae3f5622 100644--- a/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/MainActivity.kt+++ b/console/generic_app/android/app/src/main/kotlin/io/openremote/generic_app/MainActivity.kt@@ -1,6 +1,8 @@package io.openremote.generic_appimport androidx.annotation.NonNull;+import android.content.Context+import android.content.Intentimport io.flutter.embedding.android.FlutterActivityimport io.flutter.embedding.engine.FlutterEngineimport io.flutter.plugins.GeneratedPluginRegistrant@@ -9,4 +11,18 @@ class MainActivity: FlutterActivity() {override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {GeneratedPluginRegistrant.registerWith(flutterEngine);}++ override fun onDestroy() {+ flutterEngine?.platformViewsController?.onFlutterViewDestroyed()+ super.onDestroy()+ }++// companion object {+// fun createIntent(context: Context, initialRoute: String = "/"): Intent {+// return Intent(context, MainActivity::class.java)+// .putExtra("initial_route", initialRoute)+// .putExtra("background_mode", "opaque")+// .putExtra("destroy_engine_with_activity", true)+// }+// }}diff --git a/console/generic_app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/console/generic_app/android/app/src/main/res/mipmap-hdpi/launcher_icon.pngindex bca2ff676..d128696a6 100644Binary files a/console/generic_app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and b/console/generic_app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differdiff --git a/console/generic_app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/console/generic_app/android/app/src/main/res/mipmap-mdpi/launcher_icon.pngindex 46ab91f30..d7eb4644c 100644Binary files a/console/generic_app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and b/console/generic_app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differdiff --git a/console/generic_app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/console/generic_app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.pngindex 7ecfa59d6..c7b3c5338 100644Binary files a/console/generic_app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and b/console/generic_app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differdiff --git a/console/generic_app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/console/generic_app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.pngindex 3751628ec..1f7f142f7 100644Binary files a/console/generic_app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and b/console/generic_app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differdiff --git a/console/generic_app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/console/generic_app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.pngindex 915769116..8d3688ee0 100644Binary files a/console/generic_app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and b/console/generic_app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differdiff --git a/console/generic_app/assets/images/or_app_icon.png b/console/generic_app/assets/images/or_app_icon.pngnew file mode 100644index 000000000..34fed749aBinary files /dev/null and b/console/generic_app/assets/images/or_app_icon.png differdiff --git a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj b/console/generic_app/ios/Runner.xcodeproj/project.pbxprojindex 00618c820..228a4dea5 100644--- a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj+++ b/console/generic_app/ios/Runner.xcodeproj/project.pbxproj@@ -390,7 +390,7 @@ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;CLANG_ENABLE_MODULES = YES;CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;- CURRENT_PROJECT_VERSION = 8;+ CURRENT_PROJECT_VERSION = 10;DEVELOPMENT_TEAM = 4AC88KZHJZ;ENABLE_BITCODE = NO;FRAMEWORK_SEARCH_PATHS = (@@ -526,7 +526,7 @@ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;CLANG_ENABLE_MODULES = YES;CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;- CURRENT_PROJECT_VERSION = 8;+ CURRENT_PROJECT_VERSION = 10;DEVELOPMENT_TEAM = 4AC88KZHJZ;ENABLE_BITCODE = NO;FRAMEWORK_SEARCH_PATHS = (@@ -555,7 +555,7 @@ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;CLANG_ENABLE_MODULES = YES;CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;- CURRENT_PROJECT_VERSION = 8;+ CURRENT_PROJECT_VERSION = 10;DEVELOPMENT_TEAM = 4AC88KZHJZ;ENABLE_BITCODE = NO;FRAMEWORK_SEARCH_PATHS = (diff --git a/console/generic_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/console/generic_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcschemeindex 925192aa7..dcdcff71d 100644--- a/console/generic_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme+++ b/console/generic_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme@@ -1,6 +1,6 @@<?xml version="1.0" encoding="UTF-8"?><Scheme- LastUpgradeVersion = "1020"+ LastUpgradeVersion = "1160"version = "1.3"><BuildActionparallelizeBuildables = "YES"diff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.jsonindex a4fe4b786..19f7ff69a 100644--- a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json+++ b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json@@ -1,115 +1,109 @@{"images" : [{- "filename" : "Icon-40.png",+ "filename" : "[email protected]","idiom" : "iphone","scale" : "2x","size" : "20x20"},{- "filename" : "Icon-60.png",+ "filename" : "[email protected]","idiom" : "iphone","scale" : "3x","size" : "20x20"},{- "filename" : "Icon-29.png",- "idiom" : "iphone",- "scale" : "1x",- "size" : "29x29"- },- {- "filename" : "Icon-58.png",+ "filename" : "[email protected]","idiom" : "iphone","scale" : "2x","size" : "29x29"},{- "filename" : "Icon-87.png",+ "filename" : "[email protected]","idiom" : "iphone","scale" : "3x","size" : "29x29"},{- "filename" : "Icon-80.png",+ "filename" : "[email protected]","idiom" : "iphone","scale" : "2x","size" : "40x40"},{- "filename" : "Icon-120.png",+ "filename" : "[email protected]","idiom" : "iphone","scale" : "3x","size" : "40x40"},{- "filename" : "Icon-121.png",+ "filename" : "[email protected]","idiom" : "iphone","scale" : "2x","size" : "60x60"},{- "filename" : "Icon-180.png",+ "filename" : "[email protected]","idiom" : "iphone","scale" : "3x","size" : "60x60"},{- "filename" : "Icon-20.png",+ "filename" : "[email protected]","idiom" : "ipad","scale" : "1x","size" : "20x20"},{- "filename" : "Icon-41.png",+ "filename" : "[email protected]","idiom" : "ipad","scale" : "2x","size" : "20x20"},{- "filename" : "Icon-30.png",+ "filename" : "[email protected]","idiom" : "ipad","scale" : "1x","size" : "29x29"},{- "filename" : "Icon-59.png",+ "filename" : "[email protected]","idiom" : "ipad","scale" : "2x","size" : "29x29"},{- "filename" : "Icon-42.png",+ "filename" : "[email protected]","idiom" : "ipad","scale" : "1x","size" : "40x40"},{- "filename" : "Icon-81.png",+ "filename" : "[email protected]","idiom" : "ipad","scale" : "2x","size" : "40x40"},{- "filename" : "Icon-76.png",+ "filename" : "[email protected]","idiom" : "ipad","scale" : "1x","size" : "76x76"},{- "filename" : "Icon-152.png",+ "filename" : "[email protected]","idiom" : "ipad","scale" : "2x","size" : "76x76"},{- "filename" : "Icon-167.png",+ "filename" : "[email protected]","idiom" : "ipad","scale" : "2x","size" : "83.5x83.5"},{- "filename" : "Icon-1024.png",+ "filename" : "[email protected]","idiom" : "ios-marketing","scale" : "1x","size" : "1024x1024"diff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.pngdeleted file mode 100644index d95d9a6da..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120.pngdeleted file mode 100644index 70c97f5d3..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-121.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-121.pngdeleted file mode 100644index 70c97f5d3..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-121.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-152.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-152.pngdeleted file mode 100644index 554e170a6..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-152.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-167.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-167.pngdeleted file mode 100644index d38064c64..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-167.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-180.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-180.pngdeleted file mode 100644index 91882db4c..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-180.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.pngdeleted file mode 100644index aa378c4ab..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.pngdeleted file mode 100644index c4b91e3ca..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-30.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-30.pngdeleted file mode 100644index c4b91e3ca..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-30.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.pngdeleted file mode 100644index 6ec8cb850..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-41.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-41.pngdeleted file mode 100644index 6ec8cb850..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-41.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-42.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-42.pngdeleted file mode 100644index 6ec8cb850..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-42.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58.pngdeleted file mode 100644index d4bb86ba9..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-59.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-59.pngdeleted file mode 100644index d4bb86ba9..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-59.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60.pngdeleted file mode 100644index 2bcdc4a44..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.pngdeleted file mode 100644index 451148155..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80.pngdeleted file mode 100644index 5b0b93d63..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-81.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-81.pngdeleted file mode 100644index 5b0b93d63..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-81.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-87.png b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-87.pngdeleted file mode 100644index 1481b3d38..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-87.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index 73be244ef..ad43546ff 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index f2760aabb..6e3e1c94f 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]new file mode 100644index 000000000..399abf5a0Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index a2cc0b23f..399abf5a0 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index 7e0c2c5b1..22c6080af 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index 58f8bd66a..98be8ad89 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]new file mode 100644index 000000000..297f1f1f8Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index 004a59efb..297f1f1f8 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index 6188efe32..e382dff07 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index a2cc0b23f..399abf5a0 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]new file mode 100644index 000000000..9b51cabd3Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index 836a0f2a5..9b51cabd3 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index 3ea720c8d..1bf66a183 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]deleted file mode 100644index 5555b306d..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]deleted file mode 100644index 1c4541919..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]deleted file mode 100644index 2ff7a1988..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]deleted file mode 100644index 9fad14089..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index 3ea720c8d..1bf66a183 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index ea64ae16b..692c9eecf 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]deleted file mode 100644index bca2ff676..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]deleted file mode 100644index 3751628ec..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index cc2343450..14bb13149 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index 3f720d0bc..a7526578e 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]index eda9d6e72..34cbe60d0 100644Binary files a/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] differdiff --git a/console/generic_app/lib/generated/intl/messages_all.dart b/console/generic_app/lib/generated/intl/messages_all.dartindex be632e7fe..b28574977 100644--- a/console/generic_app/lib/generated/intl/messages_all.dart+++ b/console/generic_app/lib/generated/intl/messages_all.dart@@ -16,20 +16,16 @@ import 'package:intl/message_lookup_by_library.dart';import 'package:intl/src/intl_helpers.dart';import 'messages_en.dart' as messages_en;-import 'messages_nl.dart' as messages_nl;typedef Future<dynamic> LibraryLoader();Map<String, LibraryLoader> _deferredLibraries = {'en': () => new Future.value(null),- 'nl': () => new Future.value(null),};MessageLookupByLibrary _findExact(String localeName) {switch (localeName) {case 'en':return messages_en.messages;- case 'nl':- return messages_nl.messages;default:return null;}diff --git a/console/generic_app/lib/generated/intl/messages_nl.dart b/console/generic_app/lib/generated/intl/messages_nl.dartdeleted file mode 100644index b31071e32..000000000--- a/console/generic_app/lib/generated/intl/messages_nl.dart+++ /dev/null@@ -1,30 +0,0 @@-// DO NOT EDIT. This is code generated via package:intl/generate_localized.dart-// This is a library that provides messages for a nl locale. All the-// messages from the main program should be duplicated here with the same-// function name.--// Ignore issues from commonly used lints in this file.-// ignore_for_file:unnecessary_brace_in_string_interps, unnecessary_new-// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering-// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases-// ignore_for_file:unused_import, file_names--import 'package:intl/intl.dart';-import 'package:intl/message_lookup_by_library.dart';--final messages = new MessageLookup();--typedef String MessageIfAbsent(String messageStr, List<dynamic> args);--class MessageLookup extends MessageLookupByLibrary {- String get localeName => 'nl';-- final messages = _notInlinedMessages(_notInlinedMessages);- static _notInlinedMessages(_) => <String, Function> {- "changeProject" : MessageLookupByLibrary.simpleMessage("Project wisselen"),- "connect" : MessageLookupByLibrary.simpleMessage("Verbind"),- "connectToYourApplication" : MessageLookupByLibrary.simpleMessage("Verbind met jouw applicatie"),- "project" : MessageLookupByLibrary.simpleMessage("Project"),- "realm" : MessageLookupByLibrary.simpleMessage("Realm")- };-}diff --git a/console/generic_app/lib/generated/l10n.dart b/console/generic_app/lib/generated/l10n.dartindex 10ed7f008..0e4057ec6 100644--- a/console/generic_app/lib/generated/l10n.dart+++ b/console/generic_app/lib/generated/l10n.dart@@ -90,7 +90,6 @@ class AppLocalizationDelegate extends LocalizationsDelegate<S> {List<Locale> get supportedLocales {return const <Locale>[Locale.fromSubtags(languageCode: 'en'),- Locale.fromSubtags(languageCode: 'nl'),];}diff --git a/console/generic_app/lib/l10n/intl_nl.arb b/console/generic_app/lib/l10n/intl_nl.arbdeleted file mode 100644index 2378b4124..000000000--- a/console/generic_app/lib/l10n/intl_nl.arb+++ /dev/null@@ -1,7 +0,0 @@-{- "connectToYourApplication": "Verbind met jouw applicatie",- "project": "Project",- "realm": "Realm",- "connect": "Verbind",- "changeProject": "Project wisselen"-}\ No newline at end of filediff --git a/console/generic_app/lib/ui/ProjectPage.dart b/console/generic_app/lib/ui/ProjectPage.dartindex 693c865a0..cfbf17e50 100644--- a/console/generic_app/lib/ui/ProjectPage.dart+++ b/console/generic_app/lib/ui/ProjectPage.dart@@ -30,20 +30,24 @@ class _ProjectPageState extends State<ProjectPage> {@overrideWidget build(BuildContext context) {- return Scaffold(body: Builder(builder: (BuildContext innerContext) {- _innerContext = innerContext;- return SafeArea(- child: SingleChildScrollView(- physics: ClampingScrollPhysics(),- child: Align(- alignment: Alignment.center,- child: Column(children: <Widget>[- Container(- padding: EdgeInsets.only(top: 25, left: 20, right: 20),- height: MediaQuery.of(context).size.height * 0.4,- child: Image.asset('assets/images/or_logo.png',- fit: BoxFit.contain),- ),+ return Scaffold(+ backgroundColor: Colors.white,+ body: Builder(builder: (BuildContext innerContext) {+ _innerContext = innerContext;+ return SafeArea(+ child: SingleChildScrollView(+ physics: ClampingScrollPhysics(),+ child: Align(+ alignment: Alignment.center,+ child: Column(children: <Widget>[+ Container(+ color: Colors.white,+ padding:+ EdgeInsets.only(top: 25, left: 50, right: 50),+ height: MediaQuery.of(context).size.height * 0.4,+ child: Image.asset('assets/images/or_logo.png',+ fit: BoxFit.contain),+ ),Container(color: Colors.white,height: MediaQuery.of(context).size.height * 0.6,@@ -67,13 +71,15 @@ class _ProjectPageState extends State<ProjectPage> {cursorColor: CurrentConsoleAppConfig.instance.primaryColor,decoration: InputDecoration(- labelText: S.of(context).project,+ border: new UnderlineInputBorder(+ borderRadius: BorderRadius.only(+ topLeft: Radius.circular(3),+ topRight: Radius.circular(3))),+ labelText: S+ .of(context)+ .project,filled: true,fillColor: Colors.grey.shade100,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,),textInputAction: TextInputAction.next,onChanged: (inputText) {@@ -89,13 +95,15 @@ class _ProjectPageState extends State<ProjectPage> {cursorColor: CurrentConsoleAppConfig.instance.primaryColor,decoration: InputDecoration(- labelText: S.of(context).realm,+ border: new UnderlineInputBorder(+ borderRadius: BorderRadius.only(+ topLeft: Radius.circular(3),+ topRight: Radius.circular(3))),+ labelText: S+ .of(context)+ .realm,filled: true,fillColor: Colors.grey.shade100,- focusedBorder: InputBorder.none,- enabledBorder: InputBorder.none,- errorBorder: InputBorder.none,- disabledBorder: InputBorder.none,),textInputAction: TextInputAction.done,onChanged: (inputText) {@@ -105,7 +113,7 @@ class _ProjectPageState extends State<ProjectPage> {_getConsoleAppConfig();FocusScope.of(context).unfocus();}),- padding: EdgeInsets.all(25),+ padding: EdgeInsets.fromLTRB(25, 10, 25, 10),),Container(child: Align(@@ -121,7 +129,7 @@ class _ProjectPageState extends State<ProjectPage> {},child: Text(S.of(context).connect)),),- padding: EdgeInsets.all(25),+ padding: EdgeInsets.fromLTRB(25, 10, 25, 10),)],),diff --git a/console/generic_app/lib/ui/WebViewPage.dart b/console/generic_app/lib/ui/WebViewPage.dartindex aadf7a4b0..dcd7921ef 100644--- a/console/generic_app/lib/ui/WebViewPage.dart+++ b/console/generic_app/lib/ui/WebViewPage.dart@@ -52,20 +52,20 @@ class _WebViewPageState extends State<WebViewPage> {switch (CurrentConsoleAppConfig.instance.menuPosition) {case "BOTTOM_RIGHT":stack.children- .add(Positioned(bottom: 25, right: 25, child: _menuPopup(-50, -100)));+ .add(Positioned(bottom: 25, right: 25, child: _menuPopup(-50, -80)));break;case "TOP_LEFT":stack.children- .add(Positioned(top: 25, left: 25, child: _menuPopup(0, 100)));+ .add(Positioned(top: 25, left: 25, child: _menuPopup(0, 80)));break;case "TOP_RIGHT":stack.children- .add(Positioned(top: 25, right: 25, child: _menuPopup(-50, 100)));+ .add(Positioned(top: 25, right: 25, child: _menuPopup(-50, 80)));break;case "BOTTOM_LEFT":default:stack.children- .add(Positioned(bottom: 25, left: 25, child: _menuPopup(0, -100)));+ .add(Positioned(bottom: 25, left: 25, child: _menuPopup(0, -80)));break;}}@@ -187,8 +187,7 @@ class _WebViewPageState extends State<WebViewPage> {if (CurrentConsoleAppConfig.instance.links == null) return items;int index = 0;- for (LinkConfig linkConfig- in CurrentConsoleAppConfig.instance.links) {+ for (LinkConfig linkConfig in CurrentConsoleAppConfig.instance.links) {items.add(PopupMenuItem(value: index++,child: Text(@@ -215,7 +214,7 @@ class _WebViewPageState extends State<WebViewPage> {),child: Icon(Icons.menu),),- offset: Offset(offsetX, offsetY),+ offset: Offset(offsetX, offsetY * CurrentConsoleAppConfig.instance.links?.length ?? 1),elevation: 2,onSelected: (selectedValue) {LinkConfig linkConfig =diff --git a/console/generic_app/pubspec.lock b/console/generic_app/pubspec.lockindex 34618e16e..e5eb83324 100644--- a/console/generic_app/pubspec.lock+++ b/console/generic_app/pubspec.lock@@ -490,6 +490,13 @@ packages:url: "https://pub.dartlang.org"source: hostedversion: "0.2.3"+ show_up_animation:+ dependency: "direct main"+ description:+ name: show_up_animation+ url: "https://pub.dartlang.org"+ source: hosted+ version: "1.0.2"sky_engine:dependency: transitivedescription: flutterdiff --git a/console/generic_app/pubspec.yaml b/console/generic_app/pubspec.yamlindex 31b88d7b1..4d6b7d081 100644--- a/console/generic_app/pubspec.yaml+++ b/console/generic_app/pubspec.yaml@@ -36,6 +36,7 @@ dependencies:permission_handler: ^5.0.1+1firebase_messaging: ^5.1.4quick_actions: 0.4.0+6+ show_up_animation: ^1.0.2dev_dependencies:flutter_test:@@ -43,12 +44,12 @@ dev_dependencies:build_runner: 1.8.1json_serializable: 3.3.0- flutter_launcher_icons: "^0.7.3"+ flutter_launcher_icons: "^0.7.5"flutter_icons:android: "launcher_icon"ios: true- image_path: "assets/images/or_splash.png"+ image_path: "assets/images/or_app_icon.png"# For information on the generic Dart part of this file, see thediff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.javaindex dd47c0a03..b7529fe0f 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java@@ -843,8 +843,8 @@ public class ManagerDemoSetup extends AbstractManagerSetup {persistenceService.doTransaction(entityManager ->entityManager.merge(new ConsoleAppConfig(realmCityTenant,- "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage",- "https://demo.openremote.io/main/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences",+ "http://localhost:9000/mobile/?realm=smartcity&consoleProviders=geofence push storage",+ "http://localhost:8000/main/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences",true,ConsoleAppConfig.MenuPosition.BOTTOM_LEFT,null,@@ -853,7 +853,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {Values.createArray().addAll(Values.createObject().put("displayText", "Map")- .put("pageLink", "https://demo.openremote.io/mobile/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences")+ .put("pageLink", "http://localhost:9000/mobile/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences")))));}