Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Last fixes to app. Project screen shifts when keyboard covers textfield

Michael Rademakerc4acf4227766
diff --git a/console/iOS/GenericApp/GenericApp.xcodeproj/project.pbxproj b/console/iOS/GenericApp/GenericApp.xcodeproj/project.pbxproj
index f4c88ffbf..7bb47d8c6 100644
--- a/console/iOS/GenericApp/GenericApp.xcodeproj/project.pbxproj
+++ b/console/iOS/GenericApp/GenericApp.xcodeproj/project.pbxproj
@@ -71,12 +71,12 @@
/* Begin PBXFileReference section */
3B0E05618605D241D5A82AA3 /* Pods-NotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.debug.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.debug.xcconfig"; sourceTree = "<group>"; };
46FD90D41833A0E2C4C7DDA6 /* Pods-NotificationService.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.release.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.release.xcconfig"; sourceTree = "<group>"; };
+ 4C38E9C02548089A00E381C6 /* OpenRemote.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OpenRemote.entitlements; sourceTree = "<group>"; };
+ 4C38E9C12548090200E381C6 /* NotificationService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NotificationService.entitlements; sourceTree = "<group>"; };
4C81AA632546B251006ED5DD /* ProjectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectViewController.swift; sourceTree = "<group>"; };
4C81AADC2546EB28006ED5DD /* ORTextInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ORTextInput.swift; sourceTree = "<group>"; };
- 4C81AAE0254709EC006ED5DD /* NotificationService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NotificationService.entitlements; sourceTree = "<group>"; };
4C81AAE52547124D006ED5DD /* UIColor+Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Utils.swift"; sourceTree = "<group>"; };
4C81AB2C25472C7F006ED5DD /* String+Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Utils.swift"; sourceTree = "<group>"; };
- 4CEDA259254042A900C47E3B /* OpenRemote.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OpenRemote.entitlements; sourceTree = "<group>"; };
4CEDA25C25405B1E00C47E3B /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
4CEDA27A2540690300C47E3B /* ApiManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApiManager.swift; sourceTree = "<group>"; };
4CEDA27D25406A4400C47E3B /* ORAppConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ORAppConfig.swift; sourceTree = "<group>"; };
@@ -204,12 +204,12 @@
878D2D0B249A490300011484 /* GenericApp */ = {
isa = PBXGroup;
children = (
+ 4C38E9C02548089A00E381C6 /* OpenRemote.entitlements */,
4CEDA29C2540749B00C47E3B /* Utils */,
4CEDA28E2540747400C47E3B /* ConsoleProviders */,
4CEDA279254068DD00C47E3B /* Network */,
4CEDA264254068D700C47E3B /* Models */,
4CEDA25C25405B1E00C47E3B /* GoogleService-Info.plist */,
- 4CEDA259254042A900C47E3B /* OpenRemote.entitlements */,
878D2D34249A50E500011484 /* UI */,
878D2D0C249A490300011484 /* AppDelegate.swift */,
878D2D12249A490400011484 /* Assets.xcassets */,
@@ -232,9 +232,9 @@
878D2D25249A498900011484 /* NotificationService */ = {
isa = PBXGroup;
children = (
- 4C81AAE0254709EC006ED5DD /* NotificationService.entitlements */,
878D2D26249A498900011484 /* NotificationService.swift */,
878D2D28249A498900011484 /* Info.plist */,
+ 4C38E9C12548090200E381C6 /* NotificationService.entitlements */,
);
path = NotificationService;
sourceTree = "<group>";
@@ -322,7 +322,7 @@
};
};
buildConfigurationList = 878D2D04249A490300011484 /* Build configuration list for PBXProject "GenericApp" */;
- compatibilityVersion = "Xcode 9.3";
+ compatibilityVersion = "Xcode 10.0";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
@@ -614,8 +614,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = GenericApp/OpenRemote.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 17;
- DEVELOPMENT_ASSET_PATHS = "\"GenericApp/Preview Content\"";
+ CURRENT_PROJECT_VERSION = 20;
+ DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 4AC88KZHJZ;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = GenericApp/Info.plist;
@@ -639,8 +639,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = GenericApp/OpenRemote.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 17;
- DEVELOPMENT_ASSET_PATHS = "\"GenericApp/Preview Content\"";
+ CURRENT_PROJECT_VERSION = 20;
+ DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 4AC88KZHJZ;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = GenericApp/Info.plist;
@@ -662,6 +662,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = 4AC88KZHJZ;
INFOPLIST_FILE = NotificationService/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -669,11 +670,12 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
+ MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = io.openremote.app.NotificationService;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
- TARGETED_DEVICE_FAMILY = "1,2";
+ TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
};
@@ -683,6 +685,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
+ CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = 4AC88KZHJZ;
INFOPLIST_FILE = NotificationService/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -690,11 +693,12 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
+ MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = io.openremote.app.NotificationService;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
- TARGETED_DEVICE_FAMILY = "1,2";
+ TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
};
diff --git a/console/iOS/GenericApp/GenericApp/AppDelegate.swift b/console/iOS/GenericApp/GenericApp/AppDelegate.swift
index b581c357e..7a1d9fa6c 100644
--- a/console/iOS/GenericApp/GenericApp/AppDelegate.swift
+++ b/console/iOS/GenericApp/GenericApp/AppDelegate.swift
@@ -9,6 +9,7 @@
import UIKit
import Firebase
import CoreLocation
+import IQKeyboardManagerSwift
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate, URLSessionDelegate {
@@ -23,6 +24,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, URLSessionDelegate {
var fcmToken: String?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+ IQKeyboardManager.shared.enable = true
+
UNUserNotificationCenter.current().delegate = self
// if the app was launched because of geofencing
diff --git a/console/iOS/GenericApp/GenericApp/Info.plist b/console/iOS/GenericApp/GenericApp/Info.plist
index fca202f5b..52c085a24 100644
--- a/console/iOS/GenericApp/GenericApp/Info.plist
+++ b/console/iOS/GenericApp/GenericApp/Info.plist
@@ -18,6 +18,8 @@
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
+ <key>ITSAppUsesNonExemptEncryption</key>
+ <false/>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSRequiresIPhoneOS</key>
diff --git a/console/iOS/GenericApp/GenericApp/OpenRemote.entitlements b/console/iOS/GenericApp/GenericApp/OpenRemote.entitlements
index e69de29bb..dd1421e31 100644
--- a/console/iOS/GenericApp/GenericApp/OpenRemote.entitlements
+++ b/console/iOS/GenericApp/GenericApp/OpenRemote.entitlements
@@ -0,0 +1,12 @@
+<?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>aps-environment</key>
+ <string>development</string>
+ <key>com.apple.security.application-groups</key>
+ <array>
+ <string>group.io.openremote.app</string>
+ </array>
+</dict>
+</plist>
diff --git a/console/iOS/GenericApp/NotificationService/Info.plist b/console/iOS/GenericApp/NotificationService/Info.plist
index 7db9ec9cb..e28de53ce 100644
--- a/console/iOS/GenericApp/NotificationService/Info.plist
+++ b/console/iOS/GenericApp/NotificationService/Info.plist
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
- <string>1.0</string>
+ <string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
- <string>1</string>
+ <string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
diff --git a/console/iOS/GenericApp/NotificationService/NotificationService.entitlements b/console/iOS/GenericApp/NotificationService/NotificationService.entitlements
index e69de29bb..f40752220 100644
--- a/console/iOS/GenericApp/NotificationService/NotificationService.entitlements
+++ b/console/iOS/GenericApp/NotificationService/NotificationService.entitlements
@@ -0,0 +1,10 @@
+<?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>com.apple.security.application-groups</key>
+ <array>
+ <string>group.io.openremote.app</string>
+ </array>
+</dict>
+</plist>
diff --git a/console/iOS/GenericApp/Podfile b/console/iOS/GenericApp/Podfile
index 30dbc6695..b9d612a4f 100644
--- a/console/iOS/GenericApp/Podfile
+++ b/console/iOS/GenericApp/Podfile
@@ -16,6 +16,7 @@ target 'GenericApp' do
pod 'MaterialComponents/TextFields'
pod 'MaterialComponents/Buttons'
pod 'Popover'
+ pod 'IQKeyboardManagerSwift'
end
target 'NotificationService' do