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 compile targets for release. Added SafeArea around webview
Michael Rademakerc7763917c6ff
diff --git a/console/generic_app/android/app/build.gradle b/console/generic_app/android/app/build.gradleindex 43236342a..3e2952cda 100644--- a/console/generic_app/android/app/build.gradle+++ b/console/generic_app/android/app/build.gradle@@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services'apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"android {- compileSdkVersion 28+ compileSdkVersion 29sourceSets {main.java.srcDirs += 'src/main/kotlin'@@ -39,8 +39,8 @@ android {defaultConfig {applicationId "io.openremote.app"- minSdkVersion 16- targetSdkVersion 28+ minSdkVersion 23+ targetSdkVersion 29versionCode flutterVersionCode.toInteger()versionName flutterVersionNametestInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"diff --git a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj b/console/generic_app/ios/Runner.xcodeproj/project.pbxprojindex 228a4dea5..308193c6f 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 = 10;+ CURRENT_PROJECT_VERSION = 12;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 = 10;+ CURRENT_PROJECT_VERSION = 12;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 = 10;+ CURRENT_PROJECT_VERSION = 12;DEVELOPMENT_TEAM = 4AC88KZHJZ;ENABLE_BITCODE = NO;FRAMEWORK_SEARCH_PATHS = (diff --git a/console/generic_app/lib/ui/WebViewPage.dart b/console/generic_app/lib/ui/WebViewPage.dartindex dcd7921ef..97696b020 100644--- a/console/generic_app/lib/ui/WebViewPage.dart+++ b/console/generic_app/lib/ui/WebViewPage.dart@@ -70,7 +70,7 @@ class _WebViewPageState extends State<WebViewPage> {}}- return WillPopScope( onWillPop: _onBackPressed, child: Scaffold(body: stack));+ return WillPopScope( onWillPop: _onBackPressed, child: Scaffold(body: SafeArea(child: stack)));}_notifyClient(Map<String, dynamic> data) {diff --git a/console/generic_app/pubspec.yaml b/console/generic_app/pubspec.yamlindex 4d6b7d081..c3b6af666 100644--- a/console/generic_app/pubspec.yaml+++ b/console/generic_app/pubspec.yaml@@ -11,7 +11,7 @@ description: Generic app of OpenRemote# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.# Read more about iOS versioning at# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html-version: 1.0.0+10+version: 1.0.0+12environment:sdk: ">=2.2.0 <3.0.0"