Skip to content

armgit / core

Public Imported from GitHub
0

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

Fixed issue with button icon colour not using app console config colour

Michael Rademaker2992b554d7e5
diff --git a/console/iOS/GenericApp/GenericApp.xcodeproj/project.pbxproj b/console/iOS/GenericApp/GenericApp.xcodeproj/project.pbxproj
index b19eb3833..d307e0977 100644
--- a/console/iOS/GenericApp/GenericApp.xcodeproj/project.pbxproj
+++ b/console/iOS/GenericApp/GenericApp.xcodeproj/project.pbxproj
@@ -618,7 +618,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = GenericApp/OpenRemote.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 22;
+ CURRENT_PROJECT_VERSION = 23;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 4AC88KZHJZ;
ENABLE_PREVIEWS = YES;
@@ -644,7 +644,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = GenericApp/OpenRemote.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 22;
+ CURRENT_PROJECT_VERSION = 23;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 4AC88KZHJZ;
ENABLE_PREVIEWS = YES;
@@ -668,7 +668,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 22;
+ CURRENT_PROJECT_VERSION = 23;
DEVELOPMENT_TEAM = 4AC88KZHJZ;
INFOPLIST_FILE = NotificationService/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
@@ -692,7 +692,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 22;
+ CURRENT_PROJECT_VERSION = 23;
DEVELOPMENT_TEAM = 4AC88KZHJZ;
INFOPLIST_FILE = NotificationService/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
diff --git a/console/iOS/GenericApp/GenericApp/Assets.xcassets/ic_menu.imageset/Contents.json b/console/iOS/GenericApp/GenericApp/Assets.xcassets/ic_menu.imageset/Contents.json
index de8dddef8..dd9acdc55 100644
--- a/console/iOS/GenericApp/GenericApp/Assets.xcassets/ic_menu.imageset/Contents.json
+++ b/console/iOS/GenericApp/GenericApp/Assets.xcassets/ic_menu.imageset/Contents.json
@@ -17,5 +17,8 @@
"info" : {
"author" : "xcode",
"version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
}
}
diff --git a/console/iOS/GenericApp/GenericApp/UI/ORViewController.swift b/console/iOS/GenericApp/GenericApp/UI/ORViewController.swift
index 1aaf57879..4ad6dd1de 100644
--- a/console/iOS/GenericApp/GenericApp/UI/ORViewController.swift
+++ b/console/iOS/GenericApp/GenericApp/UI/ORViewController.swift
@@ -121,6 +121,10 @@ class ORViewcontroller : UIViewController {
menuButton?.setImage(#imageLiteral(resourceName: "ic_menu"), for: .highlighted)
menuButton?.isHidden = true
+ if let secondColor = appConfig?.secondaryColor {
+ menuButton?.tintColor = UIColor(hexaRGB: secondColor)
+ }
+
view.addSubview(menuButton!)
view.bringSubviewToFront(menuButton!)