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 images and localization
Michael Rademaker4bf91059da4d
diff --git a/console/generic_app/assets/images/logo-mobile.png b/console/generic_app/assets/images/logo-mobile.pngdeleted file mode 100644index 15ace0048..000000000Binary files a/console/generic_app/assets/images/logo-mobile.png and /dev/null differdiff --git a/console/generic_app/assets/images/logo.png b/console/generic_app/assets/images/logo.pngdeleted file mode 100644index 2179b259d..000000000Binary files a/console/generic_app/assets/images/logo.png and /dev/null differdiff --git a/console/generic_app/assets/images/or_logo.png b/console/generic_app/assets/images/or_logo.pngnew file mode 100644index 000000000..d7154867eBinary files /dev/null and b/console/generic_app/assets/images/or_logo.png differdiff --git a/console/generic_app/ios/GoogleService-Info.plist b/console/generic_app/ios/GoogleService-Info.plistnew file mode 100644index 000000000..bbc96593f--- /dev/null+++ b/console/generic_app/ios/GoogleService-Info.plist@@ -0,0 +1,36 @@+<?xml version="1.0" encoding="UTF-8"?>+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">+<plist version="1.0">+<dict>+ <key>CLIENT_ID</key>+ <string>667022545910-9fee9uvb8iguprjtimmq8uea6cqt2p5i.apps.googleusercontent.com</string>+ <key>REVERSED_CLIENT_ID</key>+ <string>com.googleusercontent.apps.667022545910-9fee9uvb8iguprjtimmq8uea6cqt2p5i</string>+ <key>API_KEY</key>+ <string>AIzaSyB9T09jK4r0Cvc8Yy_D2cMo96GZQZr3qBI</string>+ <key>GCM_SENDER_ID</key>+ <string>667022545910</string>+ <key>PLIST_VERSION</key>+ <string>1</string>+ <key>BUNDLE_ID</key>+ <string>io.openremote.app</string>+ <key>PROJECT_ID</key>+ <string>openremoteapp-a6a60</string>+ <key>STORAGE_BUCKET</key>+ <string>openremoteapp-a6a60.appspot.com</string>+ <key>IS_ADS_ENABLED</key>+ <false></false>+ <key>IS_ANALYTICS_ENABLED</key>+ <false></false>+ <key>IS_APPINVITE_ENABLED</key>+ <true></true>+ <key>IS_GCM_ENABLED</key>+ <true></true>+ <key>IS_SIGNIN_ENABLED</key>+ <true></true>+ <key>GOOGLE_APP_ID</key>+ <string>1:667022545910:ios:d757be33609bc318a5add7</string>+ <key>DATABASE_URL</key>+ <string>https://openremoteapp-a6a60.firebaseio.com</string>+</dict>+</plist>\ No newline at end of filediff --git a/console/generic_app/ios/Podfile.lock b/console/generic_app/ios/Podfile.lockindex 02f27369f..e06de97e0 100644--- a/console/generic_app/ios/Podfile.lock+++ b/console/generic_app/ios/Podfile.lock@@ -1,68 +1,178 @@PODS:- - apple_maps_flutter (0.0.1):- - Flutter- - cryptography_flutter (0.1.0):+ - Firebase/Core (6.24.0):+ - Firebase/CoreOnly+ - FirebaseAnalytics (= 6.5.0)+ - Firebase/CoreOnly (6.24.0):+ - FirebaseCore (= 6.7.0)+ - Firebase/Messaging (6.24.0):+ - Firebase/CoreOnly+ - FirebaseMessaging (~> 4.4.0)+ - firebase_messaging (0.0.1):+ - Firebase/Core+ - Firebase/Messaging- Flutter+ - FirebaseAnalytics (6.5.0):+ - FirebaseCore (~> 6.7)+ - FirebaseInstallations (~> 1.2)+ - GoogleAppMeasurement (= 6.5.0)+ - GoogleUtilities/AppDelegateSwizzler (~> 6.0)+ - GoogleUtilities/MethodSwizzler (~> 6.0)+ - GoogleUtilities/Network (~> 6.0)+ - "GoogleUtilities/NSData+zlib (~> 6.0)"+ - nanopb (~> 1.30905.0)+ - FirebaseAnalyticsInterop (1.5.0)+ - FirebaseCore (6.7.0):+ - FirebaseCoreDiagnostics (~> 1.3)+ - FirebaseCoreDiagnosticsInterop (~> 1.2)+ - GoogleUtilities/Environment (~> 6.5)+ - GoogleUtilities/Logger (~> 6.5)+ - FirebaseCoreDiagnostics (1.3.0):+ - FirebaseCoreDiagnosticsInterop (~> 1.2)+ - GoogleDataTransportCCTSupport (~> 3.1)+ - GoogleUtilities/Environment (~> 6.5)+ - GoogleUtilities/Logger (~> 6.5)+ - nanopb (~> 1.30905.0)+ - FirebaseCoreDiagnosticsInterop (1.2.0)+ - FirebaseInstallations (1.2.0):+ - FirebaseCore (~> 6.6)+ - GoogleUtilities/Environment (~> 6.6)+ - GoogleUtilities/UserDefaults (~> 6.6)+ - PromisesObjC (~> 1.2)+ - FirebaseInstanceID (4.3.4):+ - FirebaseCore (~> 6.6)+ - FirebaseInstallations (~> 1.0)+ - GoogleUtilities/Environment (~> 6.5)+ - GoogleUtilities/UserDefaults (~> 6.5)+ - FirebaseMessaging (4.4.0):+ - FirebaseAnalyticsInterop (~> 1.5)+ - FirebaseCore (~> 6.6)+ - FirebaseInstanceID (~> 4.3)+ - GoogleUtilities/AppDelegateSwizzler (~> 6.5)+ - GoogleUtilities/Environment (~> 6.5)+ - GoogleUtilities/Reachability (~> 6.5)+ - GoogleUtilities/UserDefaults (~> 6.5)+ - Protobuf (>= 3.9.2, ~> 3.9)- Flutter (1.0.0)- flutter_geofence (0.1.1):- Flutter- - flutter_local_notifications (0.0.1):- - Flutter- - share (0.0.1):+ - GoogleAppMeasurement (6.5.0):+ - GoogleUtilities/AppDelegateSwizzler (~> 6.0)+ - GoogleUtilities/MethodSwizzler (~> 6.0)+ - GoogleUtilities/Network (~> 6.0)+ - "GoogleUtilities/NSData+zlib (~> 6.0)"+ - nanopb (~> 1.30905.0)+ - GoogleDataTransport (6.1.0)+ - GoogleDataTransportCCTSupport (3.1.0):+ - GoogleDataTransport (~> 6.1)+ - nanopb (~> 1.30905.0)+ - GoogleUtilities/AppDelegateSwizzler (6.6.0):+ - GoogleUtilities/Environment+ - GoogleUtilities/Logger+ - GoogleUtilities/Network+ - GoogleUtilities/Environment (6.6.0):+ - PromisesObjC (~> 1.2)+ - GoogleUtilities/Logger (6.6.0):+ - GoogleUtilities/Environment+ - GoogleUtilities/MethodSwizzler (6.6.0):+ - GoogleUtilities/Logger+ - GoogleUtilities/Network (6.6.0):+ - GoogleUtilities/Logger+ - "GoogleUtilities/NSData+zlib"+ - GoogleUtilities/Reachability+ - "GoogleUtilities/NSData+zlib (6.6.0)"+ - GoogleUtilities/Reachability (6.6.0):+ - GoogleUtilities/Logger+ - GoogleUtilities/UserDefaults (6.6.0):+ - GoogleUtilities/Logger+ - nanopb (1.30905.0):+ - nanopb/decode (= 1.30905.0)+ - nanopb/encode (= 1.30905.0)+ - nanopb/decode (1.30905.0)+ - nanopb/encode (1.30905.0)+ - "permission_handler (5.0.1+1)":- Flutter- - url_launcher (0.0.1):+ - PromisesObjC (1.2.8)+ - Protobuf (3.11.4)+ - shared_preferences (0.0.1):- Flutter- - url_launcher_macos (0.0.1):+ - shared_preferences_macos (0.0.1):- Flutter- - url_launcher_web (0.0.1):+ - shared_preferences_web (0.0.1):- Flutter- webview_flutter (0.0.1):- FlutterDEPENDENCIES:- - apple_maps_flutter (from `.symlinks/plugins/apple_maps_flutter/ios`)- - cryptography_flutter (from `.symlinks/plugins/cryptography_flutter/ios`)+ - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)- Flutter (from `Flutter`)- flutter_geofence (from `.symlinks/plugins/flutter_geofence/ios`)- - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)- - share (from `.symlinks/plugins/share/ios`)- - url_launcher (from `.symlinks/plugins/url_launcher/ios`)- - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)- - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)+ - permission_handler (from `.symlinks/plugins/permission_handler/ios`)+ - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)+ - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)+ - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)+SPEC REPOS:+ trunk:+ - Firebase+ - FirebaseAnalytics+ - FirebaseAnalyticsInterop+ - FirebaseCore+ - FirebaseCoreDiagnostics+ - FirebaseCoreDiagnosticsInterop+ - FirebaseInstallations+ - FirebaseInstanceID+ - FirebaseMessaging+ - GoogleAppMeasurement+ - GoogleDataTransport+ - GoogleDataTransportCCTSupport+ - GoogleUtilities+ - nanopb+ - PromisesObjC+ - Protobuf+EXTERNAL SOURCES:- apple_maps_flutter:- :path: ".symlinks/plugins/apple_maps_flutter/ios"- cryptography_flutter:- :path: ".symlinks/plugins/cryptography_flutter/ios"+ firebase_messaging:+ :path: ".symlinks/plugins/firebase_messaging/ios"Flutter::path: Flutterflutter_geofence::path: ".symlinks/plugins/flutter_geofence/ios"- flutter_local_notifications:- :path: ".symlinks/plugins/flutter_local_notifications/ios"- share:- :path: ".symlinks/plugins/share/ios"- url_launcher:- :path: ".symlinks/plugins/url_launcher/ios"- url_launcher_macos:- :path: ".symlinks/plugins/url_launcher_macos/ios"- url_launcher_web:- :path: ".symlinks/plugins/url_launcher_web/ios"+ permission_handler:+ :path: ".symlinks/plugins/permission_handler/ios"+ shared_preferences:+ :path: ".symlinks/plugins/shared_preferences/ios"+ shared_preferences_macos:+ :path: ".symlinks/plugins/shared_preferences_macos/ios"+ shared_preferences_web:+ :path: ".symlinks/plugins/shared_preferences_web/ios"webview_flutter::path: ".symlinks/plugins/webview_flutter/ios"SPEC CHECKSUMS:- apple_maps_flutter: 45925bdf704b86f713fcf6979ee1999d17b2a6e0- cryptography_flutter: a2c541ba25ff28549f989f856dde126c961defcd+ Firebase: b28e55c60efd98963cd9011fe2fac5a10c2ba124+ firebase_messaging: b8543d17dd9825f4f24a585477f77db103e5228e+ FirebaseAnalytics: 7386fc2176e3f93ad8ef34b5b1f2b33a891e4962+ FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae+ FirebaseCore: e610482f64097b0e9f056cd97bc6b33dfabcbb6a+ FirebaseCoreDiagnostics: 4a773a47bd83bbd5a9b1ccf1ce7caa8b2d535e67+ FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850+ FirebaseInstallations: 2119fb3e46b0a88bfdbf12562f855ee3252462fa+ FirebaseInstanceID: cef67c4967c7cecb56ea65d8acbb4834825c587b+ FirebaseMessaging: 58cb17277641a0084d98d4951ba1f1fb0588c8c6Flutter: 0e3d915762c693b495b44d77113d4970485de6ecflutter_geofence: 08e5427c56c540ffac97425b8e10dd598912fb3d- flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186- share: 0b2c3e82132f5888bccca3351c504d0003b3b410- url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef- url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313- url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c+ GoogleAppMeasurement: 4c644d86835d827bab30ab6aabb9ecaf1f500735+ GoogleDataTransport: f6f8eba931df03ebd2232ff4645aa85f8f47b5ab+ GoogleDataTransportCCTSupport: d70a561f7d236af529fee598835caad5e25f6d3d+ GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1+ nanopb: c43f40fadfe79e8b8db116583945847910cbabc9+ permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6+ PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6+ Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7+ shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d+ shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087+ shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96PODFILE CHECKSUM: 4923279f5a690dada6ed755b078b8c49ecbeeddadiff --git a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj b/console/generic_app/ios/Runner.xcodeproj/project.pbxprojindex 2701f7c4e..91b737577 100644--- a/console/generic_app/ios/Runner.xcodeproj/project.pbxproj+++ b/console/generic_app/ios/Runner.xcodeproj/project.pbxproj@@ -10,6 +10,7 @@1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };+ 87680EB324B375E6008CC803 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 87680EB224B375E6008CC803 /* GoogleService-Info.plist */; };97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };@@ -40,6 +41,7 @@74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };+ 87680EB224B375E6008CC803 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };@@ -93,6 +95,7 @@97C146E51CF9000F007C117D = {isa = PBXGroup;children = (+ 87680EB224B375E6008CC803 /* GoogleService-Info.plist */,9740EEB11CF90186004384FC /* Flutter */,97C146F01CF9000F007C117D /* Runner */,97C146EF1CF9000F007C117D /* Products */,@@ -198,6 +201,7 @@files = (97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,+ 87680EB324B375E6008CC803 /* GoogleService-Info.plist in Resources */,97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,);@@ -264,23 +268,23 @@inputPaths = ("${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh","${PODS_ROOT}/../Flutter/Flutter.framework",- "${BUILT_PRODUCTS_DIR}/apple_maps_flutter/apple_maps_flutter.framework",- "${BUILT_PRODUCTS_DIR}/cryptography_flutter/cryptography_flutter.framework",+ "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",+ "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",+ "${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework","${BUILT_PRODUCTS_DIR}/flutter_geofence/flutter_geofence.framework",- "${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",- "${BUILT_PRODUCTS_DIR}/share/share.framework",- "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",+ "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",+ "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework","${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",);name = "[CP] Embed Pods Frameworks";outputPaths = ("${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/apple_maps_flutter.framework",- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cryptography_flutter.framework",+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_geofence.framework",- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework",- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework","${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",);runOnlyForDeploymentPostprocessing = 0;@@ -364,7 +368,7 @@GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;GCC_WARN_UNUSED_FUNCTION = YES;GCC_WARN_UNUSED_VARIABLE = YES;- IPHONEOS_DEPLOYMENT_TARGET = 8.0;+ IPHONEOS_DEPLOYMENT_TARGET = 12.4;MTL_ENABLE_DEBUG_INFO = NO;SDKROOT = iphoneos;SUPPORTED_PLATFORMS = iphoneos;@@ -392,7 +396,7 @@"$(inherited)","$(PROJECT_DIR)/Flutter",);- PRODUCT_BUNDLE_IDENTIFIER = io.openremote.genericApp;+ PRODUCT_BUNDLE_IDENTIFIER = io.openremote.app;PRODUCT_NAME = "$(TARGET_NAME)";SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";SWIFT_VERSION = 5.0;@@ -448,7 +452,7 @@GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;GCC_WARN_UNUSED_FUNCTION = YES;GCC_WARN_UNUSED_VARIABLE = YES;- IPHONEOS_DEPLOYMENT_TARGET = 8.0;+ IPHONEOS_DEPLOYMENT_TARGET = 12.4;MTL_ENABLE_DEBUG_INFO = YES;ONLY_ACTIVE_ARCH = YES;SDKROOT = iphoneos;@@ -498,7 +502,7 @@GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;GCC_WARN_UNUSED_FUNCTION = YES;GCC_WARN_UNUSED_VARIABLE = YES;- IPHONEOS_DEPLOYMENT_TARGET = 8.0;+ IPHONEOS_DEPLOYMENT_TARGET = 12.4;MTL_ENABLE_DEBUG_INFO = NO;SDKROOT = iphoneos;SUPPORTED_PLATFORMS = iphoneos;@@ -527,7 +531,7 @@"$(inherited)","$(PROJECT_DIR)/Flutter",);- PRODUCT_BUNDLE_IDENTIFIER = io.openremote.genericApp;+ PRODUCT_BUNDLE_IDENTIFIER = io.openremote.app;PRODUCT_NAME = "$(TARGET_NAME)";SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";SWIFT_OPTIMIZATION_LEVEL = "-Onone";@@ -555,7 +559,7 @@"$(inherited)","$(PROJECT_DIR)/Flutter",);- PRODUCT_BUNDLE_IDENTIFIER = io.openremote.genericApp;+ PRODUCT_BUNDLE_IDENTIFIER = io.openremote.app;PRODUCT_NAME = "$(TARGET_NAME)";SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";SWIFT_VERSION = 5.0;diff --git a/console/generic_app/ios/Runner/AppDelegate.swift b/console/generic_app/ios/Runner/AppDelegate.swiftindex c295d8275..0f60691a8 100644--- a/console/generic_app/ios/Runner/AppDelegate.swift+++ b/console/generic_app/ios/Runner/AppDelegate.swift@@ -9,7 +9,7 @@ import Flutter) -> Bool {GeneratedPluginRegistrant.register(with: self)- [UNUserNotificationCenter currentNotificationCenter].delegate = (id) self;+ UNUserNotificationCenter.current().delegate = self;return super.application(application, didFinishLaunchingWithOptions: launchOptions)}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 d36b1fab2..a4fe4b786 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,122 +1,122 @@{"images" : [{- "size" : "20x20",+ "filename" : "Icon-40.png","idiom" : "iphone",- "filename" : "[email protected]",- "scale" : "2x"+ "scale" : "2x",+ "size" : "20x20"},{- "size" : "20x20",+ "filename" : "Icon-60.png","idiom" : "iphone",- "filename" : "[email protected]",- "scale" : "3x"+ "scale" : "3x",+ "size" : "20x20"},{- "size" : "29x29",+ "filename" : "Icon-29.png","idiom" : "iphone",- "filename" : "[email protected]",- "scale" : "1x"+ "scale" : "1x",+ "size" : "29x29"},{- "size" : "29x29",+ "filename" : "Icon-58.png","idiom" : "iphone",- "filename" : "[email protected]",- "scale" : "2x"+ "scale" : "2x",+ "size" : "29x29"},{- "size" : "29x29",+ "filename" : "Icon-87.png","idiom" : "iphone",- "filename" : "[email protected]",- "scale" : "3x"+ "scale" : "3x",+ "size" : "29x29"},{- "size" : "40x40",+ "filename" : "Icon-80.png","idiom" : "iphone",- "filename" : "[email protected]",- "scale" : "2x"+ "scale" : "2x",+ "size" : "40x40"},{- "size" : "40x40",+ "filename" : "Icon-120.png","idiom" : "iphone",- "filename" : "[email protected]",- "scale" : "3x"+ "scale" : "3x",+ "size" : "40x40"},{- "size" : "60x60",+ "filename" : "Icon-121.png","idiom" : "iphone",- "filename" : "[email protected]",- "scale" : "2x"+ "scale" : "2x",+ "size" : "60x60"},{- "size" : "60x60",+ "filename" : "Icon-180.png","idiom" : "iphone",- "filename" : "[email protected]",- "scale" : "3x"+ "scale" : "3x",+ "size" : "60x60"},{- "size" : "20x20",+ "filename" : "Icon-20.png","idiom" : "ipad",- "filename" : "[email protected]",- "scale" : "1x"+ "scale" : "1x",+ "size" : "20x20"},{- "size" : "20x20",+ "filename" : "Icon-41.png","idiom" : "ipad",- "filename" : "[email protected]",- "scale" : "2x"+ "scale" : "2x",+ "size" : "20x20"},{- "size" : "29x29",+ "filename" : "Icon-30.png","idiom" : "ipad",- "filename" : "[email protected]",- "scale" : "1x"+ "scale" : "1x",+ "size" : "29x29"},{- "size" : "29x29",+ "filename" : "Icon-59.png","idiom" : "ipad",- "filename" : "[email protected]",- "scale" : "2x"+ "scale" : "2x",+ "size" : "29x29"},{- "size" : "40x40",+ "filename" : "Icon-42.png","idiom" : "ipad",- "filename" : "[email protected]",- "scale" : "1x"+ "scale" : "1x",+ "size" : "40x40"},{- "size" : "40x40",+ "filename" : "Icon-81.png","idiom" : "ipad",- "filename" : "[email protected]",- "scale" : "2x"+ "scale" : "2x",+ "size" : "40x40"},{- "size" : "76x76",+ "filename" : "Icon-76.png","idiom" : "ipad",- "filename" : "[email protected]",- "scale" : "1x"+ "scale" : "1x",+ "size" : "76x76"},{- "size" : "76x76",+ "filename" : "Icon-152.png","idiom" : "ipad",- "filename" : "[email protected]",- "scale" : "2x"+ "scale" : "2x",+ "size" : "76x76"},{- "size" : "83.5x83.5",+ "filename" : "Icon-167.png","idiom" : "ipad",- "filename" : "[email protected]",- "scale" : "2x"+ "scale" : "2x",+ "size" : "83.5x83.5"},{- "size" : "1024x1024",+ "filename" : "Icon-1024.png","idiom" : "ios-marketing",- "filename" : "[email protected]",- "scale" : "1x"+ "scale" : "1x",+ "size" : "1024x1024"}],"info" : {- "version" : 1,- "author" : "xcode"+ "author" : "xcode",+ "version" : 1}}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.pngnew file mode 100644index 000000000..d95d9a6daBinary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.png 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.pngnew file mode 100644index 000000000..70c97f5d3Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120.png 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.pngnew file mode 100644index 000000000..70c97f5d3Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-121.png 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.pngnew file mode 100644index 000000000..554e170a6Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-152.png 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.pngnew file mode 100644index 000000000..d38064c64Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-167.png 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.pngnew file mode 100644index 000000000..91882db4cBinary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-180.png 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.pngnew file mode 100644index 000000000..aa378c4abBinary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.png 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.pngnew file mode 100644index 000000000..c4b91e3caBinary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.png 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.pngnew file mode 100644index 000000000..c4b91e3caBinary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-30.png 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.pngnew file mode 100644index 000000000..6ec8cb850Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.png 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.pngnew file mode 100644index 000000000..6ec8cb850Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-41.png 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.pngnew file mode 100644index 000000000..6ec8cb850Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-42.png 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.pngnew file mode 100644index 000000000..d4bb86ba9Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58.png 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.pngnew file mode 100644index 000000000..d4bb86ba9Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-59.png 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.pngnew file mode 100644index 000000000..2bcdc4a44Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60.png 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.pngnew file mode 100644index 000000000..451148155Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png 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.pngnew file mode 100644index 000000000..5b0b93d63Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80.png 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.pngnew file mode 100644index 000000000..5b0b93d63Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-81.png 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.pngnew file mode 100644index 000000000..1481b3d38Binary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-87.png 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 dc9ada472..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 28c6bf030..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 2ccbfd967..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 f091b6b0b..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 4cde12118..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 d0ef06e7e..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 dcdc2306c..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 2ccbfd967..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 c8f9ed8f5..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 a6d6b8609..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 a6d6b8609..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 75b2d164a..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 c4df70d39..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 6a84f41e1..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 d0e1f5853..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/Contents.json b/console/generic_app/ios/Runner/Assets.xcassets/Contents.jsonnew file mode 100644index 000000000..73c00596a--- /dev/null+++ b/console/generic_app/ios/Runner/Assets.xcassets/Contents.json@@ -0,0 +1,6 @@+{+ "info" : {+ "author" : "xcode",+ "version" : 1+ }+}diff --git a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.pngdeleted file mode 100644index 9da19eaca..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]deleted file mode 100644index 9da19eaca..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] b/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]deleted file mode 100644index 9da19eaca..000000000Binary files a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] and /dev/null differdiff --git a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.mddeleted file mode 100644index 89c2725b7..000000000--- a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md+++ /dev/null@@ -1,5 +0,0 @@-# Launch Screen Assets--You can customize the launch screen with your own desired assets by replacing the image files in this directory.--You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.\ No newline at end of filediff --git a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/console/generic_app/ios/Runner/Assets.xcassets/or_logo.imageset/Contents.jsonsimilarity index 58%rename from console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.jsonrename to console/generic_app/ios/Runner/Assets.xcassets/or_logo.imageset/Contents.jsonindex 0bedcf2fd..1c5dd9b53 100644--- a/console/generic_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json+++ b/console/generic_app/ios/Runner/Assets.xcassets/or_logo.imageset/Contents.json@@ -2,22 +2,20 @@"images" : [{"idiom" : "universal",- "filename" : "LaunchImage.png","scale" : "1x"},{"idiom" : "universal",- "filename" : "[email protected]","scale" : "2x"},{+ "filename" : "Icon-512.png","idiom" : "universal",- "filename" : "[email protected]","scale" : "3x"}],"info" : {- "version" : 1,- "author" : "xcode"+ "author" : "xcode",+ "version" : 1}}diff --git a/console/generic_app/ios/Runner/Assets.xcassets/or_logo.imageset/Icon-512.png b/console/generic_app/ios/Runner/Assets.xcassets/or_logo.imageset/Icon-512.pngnew file mode 100644index 000000000..58f43cb8bBinary files /dev/null and b/console/generic_app/ios/Runner/Assets.xcassets/or_logo.imageset/Icon-512.png differdiff --git a/console/generic_app/lib/l10n/intl_en.arb b/console/generic_app/lib/l10n/intl_en.arbnew file mode 100644index 000000000..f8254f2bb--- /dev/null+++ b/console/generic_app/lib/l10n/intl_en.arb@@ -0,0 +1,6 @@+{+ "connectToYourApplication": "Connect to your application",+ "project": "Project",+ "realm": "Realm",+ "connect": "Connect"+}\ No newline at end of filediff --git a/console/generic_app/lib/l10n/intl_nl.arb b/console/generic_app/lib/l10n/intl_nl.arbnew file mode 100644index 000000000..52cc752f2--- /dev/null+++ b/console/generic_app/lib/l10n/intl_nl.arb@@ -0,0 +1,6 @@+{+ "connectToYourApplication": "Verbind met jouw applicatie",+ "project": "Project",+ "realm": "Realm",+ "connect": "Verbind"+}\ No newline at end of filediff --git a/console/generic_app/lib/main.dart b/console/generic_app/lib/main.dartindex 0ff096fa0..b7de2d015 100644--- a/console/generic_app/lib/main.dart+++ b/console/generic_app/lib/main.dart@@ -1,5 +1,7 @@import 'package:flutter/material.dart';import 'package:flutter/services.dart';+import 'package:flutter_localizations/flutter_localizations.dart';+import 'generated/l10n.dart';import 'package:generic_app/ui/ProjectPage.dart';@@ -17,65 +19,16 @@ class ORApp extends StatelessWidget {return MaterialApp(title: 'OR App',theme: ThemeData(- // This is the theme of your application.- //- // Try running your application with "flutter run". You'll see the- // application has a blue toolbar. Then, without quitting the app, try- // changing the primarySwatch below to Colors.green and then invoke- // "hot reload" (press "r" in the console where you ran "flutter run",- // or simply save your changes to "hot reload" in a Flutter IDE).- // Notice that the counter didn't reset back to zero; the application- // is not restarted.- primarySwatch: Colors.blue,+ primarySwatch: Colors.green,),+ localizationsDelegates: [+ S.delegate,+ GlobalMaterialLocalizations.delegate,+ GlobalWidgetsLocalizations.delegate,+ GlobalCupertinoLocalizations.delegate,+ ],+ supportedLocales: S.delegate.supportedLocales,home: ProjectPage(),);}}--class MyHomePage extends StatefulWidget {- MyHomePage({Key key, this.title}) : super(key: key);-- // This widget is the home page of your application. It is stateful, meaning- // that it has a State object (defined below) that contains fields that affect- // how it looks.-- // This class is the configuration for the state. It holds the values (in this- // case the title) provided by the parent (in this case the App widget) and- // used by the build method of the State. Fields in a Widget subclass are- // always marked "final".-- final String title;-- @override- _MyHomePageState createState() => _MyHomePageState();-}--class _MyHomePageState extends State<MyHomePage> {-- @override- void initState() {- // TODO: implement initState- super.initState();--- }-- @override- Widget build(BuildContext context) {- // This method is rerun every time setState is called, for instance as done- // by the _incrementCounter method above.- //- // The Flutter framework has been optimized to make rerunning build methods- // fast, so that you can just rebuild anything that needs updating rather- // than having to individually change instances of widgets.- return Scaffold(- appBar: AppBar(- // Here we take the value from the MyHomePage object that was created by- // the App.build method, and use it to set our appbar title.- title: Text(widget.title),- ),- body: Container()- );- }-}diff --git a/console/generic_app/lib/ui/ProjectPage.dart b/console/generic_app/lib/ui/ProjectPage.dartindex 8441edf10..321a2f216 100644--- a/console/generic_app/lib/ui/ProjectPage.dart+++ b/console/generic_app/lib/ui/ProjectPage.dart@@ -1,5 +1,6 @@import 'package:flutter/material.dart';import 'package:generic_app/config/CurrentConsoleAppConfig.dart';+import 'package:generic_app/generated/l10n.dart';import 'package:generic_app/models/ConsoleAppConfig.dart';import 'package:generic_app/network/ApiManager.dart';import 'package:generic_app/ui/WebViewPage.dart';@@ -12,17 +13,10 @@ class ProjectPage extends StatefulWidget {}class _ProjectPageState extends State<ProjectPage> {- bool _isLoading;String _projectName;String _realmName;BuildContext _innerContext;- @override- void initState() {- super.initState();- _isLoading = false;- }-@overrideWidget build(BuildContext context) {return Scaffold(body: Builder(builder: (BuildContext innerContext) {@@ -34,34 +28,42 @@ class _ProjectPageState extends State<ProjectPage> {alignment: Alignment.center,child: Column(children: <Widget>[Container(- padding: EdgeInsets.only(top: 25, left: 20, right: 20),- height: MediaQuery.of(context).size.height / 2,- child: Column(children: <Widget>[- Expanded(- child: Image.asset(- 'assets/images/logo-mobile.png',- fit: BoxFit.contain)),- Expanded(- child: Image.asset('assets/images/logo.png',- fit: BoxFit.contain))- ])),+ padding: EdgeInsets.only(top: 25, left: 20, right: 20),+ height: MediaQuery.of(context).size.height / 2,+ child: Expanded(+ child: Image.asset('assets/images/or_logo.png',+ fit: BoxFit.contain)),+ ),Container(+ color: Colors.white,+ height: MediaQuery.of(context).size.height / 2,child: Column(children: <Widget>[+ Align(+ alignment: Alignment.centerLeft,+ child: Container(+ padding: EdgeInsets.only(+ top: 25, left: 25, right: 25),+ child: Text(+ S.of(context).connectToYourApplication,+ style: TextStyle(+ fontWeight: FontWeight.bold,+ fontSize: 18,+ color: Colors.black54),+ ),+ )),Container(child: TextField(cursorColor: CurrentConsoleAppConfig.instance.primaryColor,decoration: InputDecoration(- labelText: 'Project',- labelStyle: TextStyle(- color: CurrentConsoleAppConfig- .instance.primaryColor),- focusedBorder: UnderlineInputBorder(- borderSide: BorderSide(- color: CurrentConsoleAppConfig- .instance.primaryColor),- ),+ 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) {@@ -77,15 +79,14 @@ class _ProjectPageState extends State<ProjectPage> {cursorColor: CurrentConsoleAppConfig.instance.primaryColor,decoration: InputDecoration(- labelText: 'Realm',- labelStyle: TextStyle(- color: CurrentConsoleAppConfig- .instance.primaryColor),- focusedBorder: UnderlineInputBorder(- borderSide: BorderSide(- color: CurrentConsoleAppConfig- .instance.primaryColor),- )),+ 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) {_realmName = inputText;@@ -108,25 +109,20 @@ class _ProjectPageState extends State<ProjectPage> {onPressed: () {_getConsoleAppConfig();},- child: Text("Press")),+ child: Text(S.of(context).connect)),),padding: EdgeInsets.all(25),)],),)- ])- )- )- );- })- );+ ]))));+ }));}void _getConsoleAppConfig() {var apiManager =- new ApiManager("http://192.168.2.10:8080/api/${_realmName}");-// new ApiManager("https://${_projectName}.openremote.io/${_realmName}");+ new ApiManager("https://$_projectName.openremote.io/$_realmName");apiManager.get(["app", "config"], ConsoleAppConfig.fromJson).then((value) {print(value);CurrentConsoleAppConfig.instance.updateConfig(value, _projectName);@@ -137,7 +133,9 @@ class _ProjectPageState extends State<ProjectPage> {initialUrl: CurrentConsoleAppConfig.instance.url,)));}).catchError((onError) => Scaffold.of(_innerContext).showSnackBar(- SnackBar(content: Text("error")),+ SnackBar(+ content: Text(+ "Error occurred getting app config. Check your input and try again")),));}}diff --git a/console/generic_app/pubspec.lock b/console/generic_app/pubspec.lockindex 902a2887b..7f726b7ad 100644--- a/console/generic_app/pubspec.lock+++ b/console/generic_app/pubspec.lock@@ -188,6 +188,11 @@ packages:url: "https://pub.dartlang.org"source: hostedversion: "0.2.0"+ flutter_localizations:+ dependency: "direct main"+ description: flutter+ source: sdk+ version: "0.0.0"flutter_test:dependency: "direct dev"description: flutter@@ -247,6 +252,13 @@ packages:url: "https://pub.dartlang.org"source: hostedversion: "2.1.12"+ intl:+ dependency: transitive+ description:+ name: intl+ url: "https://pub.dartlang.org"+ source: hosted+ version: "0.16.1"io:dependency: transitivedescription:diff --git a/console/generic_app/pubspec.yaml b/console/generic_app/pubspec.yamlindex a4054f202..617f28591 100644--- a/console/generic_app/pubspec.yaml+++ b/console/generic_app/pubspec.yaml@@ -19,6 +19,8 @@ environment:dependencies:flutter:sdk: flutter+ flutter_localizations:+ sdk: flutter# The following adds the Cupertino Icons font to your application.# Use with the CupertinoIcons class for iOS style icons.@@ -55,3 +57,5 @@ flutter:# To add assets to your application, add an assets section, like this:assets:- assets/images/+flutter_intl:+ enabled: true