watch os compatibility

BSVogler · Sep 18, 2019 · 7d33939 · 7d33939
1 parent 3e5597c
commit 7d33939
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/moodmeter.xcodeproj/project.pbxproj b/moodmeter.xcodeproj/project.pbxproj
@@ -661,7 +661,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.benediktsvogler.moodmeterwatch.watchkitapp.watchkitextension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.benediktsvogler.moodmeter.watchkitapp.watchkitextension;
 				PRODUCT_NAME = "Moodmeter WatchKit Extension";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
@@ -685,7 +685,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.benediktsvogler.moodmeterwatch.watchkitapp.watchkitextension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.benediktsvogler.moodmeter.watchkitapp.watchkitextension;
 				PRODUCT_NAME = "Moodmeter WatchKit Extension";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
@@ -705,7 +705,7 @@
 				DEVELOPMENT_TEAM = 8DQDR268Z4;
 				IBSC_MODULE = moodmeterwatch_WatchKit_Extension;
 				INFOPLIST_FILE = "moodmeterwatch WatchKit App/Info.plist";
-				PRODUCT_BUNDLE_IDENTIFIER = com.benediktsvogler.moodmeterwatch.watchkitapp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.benediktsvogler.moodmeter.watchkitapp;
 				PRODUCT_NAME = "Moodmeter WatchKit App";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
@@ -725,7 +725,7 @@
 				DEVELOPMENT_TEAM = 8DQDR268Z4;
 				IBSC_MODULE = moodmeterwatch_WatchKit_Extension;
 				INFOPLIST_FILE = "moodmeterwatch WatchKit App/Info.plist";
-				PRODUCT_BUNDLE_IDENTIFIER = com.benediktsvogler.moodmeterwatch.watchkitapp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.benediktsvogler.moodmeter.watchkitapp;
 				PRODUCT_NAME = "Moodmeter WatchKit App";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;

diff --git a/moodmeter/Model/Model.swift b/moodmeter/Model/Model.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import Alamofire
+import UIKit.UIColor
 
 typealias Mood = Int
 

diff --git a/moodmeterwatch WatchKit Extension/FaceInterfaceController.swift b/moodmeterwatch WatchKit Extension/FaceInterfaceController.swift
@@ -93,8 +93,8 @@ class FaceInterfaceController: WKInterfaceController {
 	}
 
 	func refreshDisplay(){
-		moodLabel.setText(Face.getSmiley(mood: face.mood))
-		background.setBackgroundColor(Face.getColor(mood: face.mood))
+		moodLabel.setText(face.mood.getSmiley())
+		background.setBackgroundColor(face.mood.getColor())
 //		let filter = scenekitscene.scene?.rootNode.childNodes.filter({ $0.name == "head" }).first
 //		let material = SCNMaterial.()
 //		material.diffuse.contents = NSColor()

diff --git a/moodmeterwatch WatchKit Extension/Info.plist b/moodmeterwatch WatchKit Extension/Info.plist
@@ -25,7 +25,7 @@
 		<key>NSExtensionAttributes</key>
 		<dict>
 			<key>WKAppBundleIdentifier</key>
-			<string>com.benediktsvogler.moodmeterwatch.watchkitapp</string>
+			<string>com.benediktsvogler.moodmeter.watchkitapp</string>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.watchkit</string>