Merge pull request #210 from ttt246/feature/ios_watch_app_103

WatchApp/WatchApp Watch App/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

WatchApp/WatchApp Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

WatchApp/WatchApp Watch App/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

WatchApp/WatchApp Watch App/Components/ChatMessageRow.swift

@@ -1,57 +1,92 @@
-//
-//  MessageView.swift
-//  WatchApp Watch App
-//
-//  Created by DarkHorse on 7/1/23.
-//
-
 import SwiftUI
 
+public enum TypeChat: String {
+    case SEND = "SEND"
+    case RECEIVE = "RECEIVE"
+    case WIDGET = "WIDGET"
+}
+
+public enum TypeWidget: String {
+    case EMPTY = "EMPTY"
+    case CONTACT = "CONTACT"
+    case IMAGE = "IMAGE"
+}
+
 struct ChatMessage: Hashable {
+    let type: TypeChat
     let message: String
-    let isUser: Bool
+    let widgetType: TypeWidget
+    let widgetDesc: String
 }
 
 struct ChatBubble: Shape {
-    let isUser: Bool
-
     func path(in rect: CGRect) -> Path {
         let path = UIBezierPath(roundedRect: rect,
-                                byRoundingCorners: [.topLeft, .topRight, isUser ? .bottomLeft : .bottomRight],
-                                cornerRadii: CGSize(width: 3, height: 3))
+                                byRoundingCorners: [.allCorners],
+                                cornerRadii: CGSize(width: 9, height: 9))
         return Path(path.cgPath)
     }
 }
 
 struct ChatMessageRow: View {
-    let message: ChatMessage
+    let chatItem: ChatMessage
 
     var body: some View {
         HStack {
-            if message.isUser {
+            switch chatItem.type {
+            case TypeChat.SEND:
                 Spacer()
-                Text(message.message)
+                Text(chatItem.message)
                     .font(.system(size: 15))
                     .foregroundColor(.white)
                     .padding(5)
-                    .background(Color.blue)
-                    .clipShape(ChatBubble(isUser: message.isUser))
-            } else {
-                Text(message.message)
-                    .italic()
+                    .background(Color.green)
+                    .clipShape(ChatBubble())
+            case TypeChat.RECEIVE:
+                Text(chatItem.message)
                     .font(.system(size: 15))
                     .foregroundColor(.black)
                     .padding(5)
                     .background(Color.primary)
-                    .clipShape(ChatBubble(isUser: message.isUser))
+                    .clipShape(ChatBubble())
                 Spacer()
+            case TypeChat.WIDGET:
+                switch chatItem.widgetType {
+                case TypeWidget.CONTACT:
+                    let contact = convertStringToContact(jsonData: chatItem.widgetDesc)
+                    NavigationLink(destination: ContactView(contact: contact)){
+                        ContactRow(contact: contact)
+                    }
+                case TypeWidget.IMAGE:
+                    ImageRow()
+                default:
+                    EmptyView()
+                }
             }
-        }.listRowBackground(Color.clear)
+        }.padding(5)
+    }
+}
+
+func convertStringToContact(jsonData: String) -> Contact {
+    do {
+        let jsonData = jsonData.data(using: .utf8)!
+        let contact = try JSONDecoder().decode(Contact.self, from: jsonData)
+
+        return contact
+    } catch {
+        print("Error converting JSON string to object: \(error)")
     }
+    return Contact(contactId: "", displayName: "Empty", phoneNumbers: [])
 }
 
 struct ChatMessageRow_Previews: PreviewProvider {
     static var previews: some View {
-        ChatMessageRow(message: ChatMessage(message: "Hello!", isUser: false))
+        ChatMessageRow(chatItem:ChatMessage(
+                type: TypeChat.WIDGET,
+                message: "Hello!",
+                widgetType: TypeWidget.IMAGE,
+                widgetDesc: "Nothing"
+            )
+        )
     }
 }

WatchApp/WatchApp Watch App/Components/ContactRow.swift

@@ -0,0 +1,53 @@
+import SwiftUI
+
+class Contact : Codable {
+    var contactId: String
+    var displayName: String
+    var phoneNumbers: [String]
+
+    init(contactId: String, displayName: String, phoneNumbers: [String]) {
+        self.contactId = contactId
+        self.displayName = displayName
+        self.phoneNumbers = phoneNumbers
+    }
+}
+
+struct ContactBubble: Shape {
+    func path(in rect: CGRect) -> Path {
+        let path = UIBezierPath(roundedRect: rect,
+                                byRoundingCorners: [.allCorners],
+                                cornerRadii: CGSize(width: 9, height: 9))
+        return Path(path.cgPath)
+    }
+}
+
+struct ContactRow: View {
+    let contact: Contact
+
+    var body: some View {
+        HStack {
+            Text(contact.displayName)
+                .italic()
+                .font(.system(size: 15))
+                .foregroundColor(.white)
+                .padding(5)
+            Spacer()
+            Image(systemName: "phone.fill")
+                    .resizable()
+                    .frame(width: 17, height: 17)
+                    .foregroundColor(.white)
+        }
+        .background(Color.clear)
+        .clipShape(ContactBubble())
+    }
+}
+
+struct Contact_Previews: PreviewProvider {
+    static var previews: some View {
+        ContactRow(contact: Contact(
+            contactId: "5",
+            displayName: "Peter Luo",
+            phoneNumbers: ["123-234-345"])
+        )
+    }
+}

WatchApp/WatchApp Watch App/Components/ImageRow.swift

@@ -0,0 +1,21 @@
+import SwiftUI
+
+struct ImageRow: View {
+    var body: some View {
+        HStack {
+            AsyncImage(url: URL(string: "https://firebasestorage.googleapis.com/v0/b/test3-83ffc.appspot.com/o/images%2F00c08a46-8812-4b3c-ad9f-72d8d04a9368?alt=media&token=cacba50a-0241-445a-892b-5a0661aaaa19")) { image in
+                image.resizable().aspectRatio(contentMode: .fit)
+            } placeholder: {
+                ProgressView()
+            }
+        }.padding(5).background(Color.white).clipShape(ChatBubble())
+    }
+}
+
+
+
+struct ImageRow_Previews: PreviewProvider {
+    static var previews: some View {
+        ImageRow()
+    }
+}

WatchApp/WatchApp Watch App/MainView.swift

@@ -1,22 +1,10 @@
-//
-//  MainView.swift
-//  WatchApp Watch App
-//
-//  Created by DarkHorse on 7/1/23.
-//
-
 import SwiftUI
 
 struct MainView: View {
-    @State private var isPresented = false
     
     var body: some View {
-        ZStack {
-            if isPresented {
-                SettingView(isPresented: $isPresented)
-            } else {
-                ChatView(isPresented: $isPresented)
-            }
+        NavigationView {
+            ChatView()
         }
     }
 }

WatchApp/WatchApp Watch App/Pages/ChatView.swift

@@ -1,105 +1,212 @@
-//
-//  ContentView.swift
-//  WatchApp Watch App
-//
-//  Created by Hideki Sato on 6/27/23.
-//
-
 import SwiftUI
 import KeychainSwift
 
+struct ContactResponse : Codable {
+    let message : [String]
+    let result : [Contact]
+    let status_code : Int
+}
+
 struct ChatView: View {
-    @Binding var isPresented: Bool
     @State private var messages: [ChatMessage] = []
-    @State private var newMessage = ""
-    @State private var uuid: String = "956a11be45cba4a4"
+    @State private var newMessage: String = ""
+    @State private var uuid: String = Constants.DEFAULT_UUID
+    @State private var isStarted = false
     
     var body: some View {
         VStack{
-            Button(action: {
-                self.isPresented = true
-            }) {
-                Image(systemName: "gearshape.fill")
-                    .resizable()
-                    .frame(width: 15, height: 15)
-            }
-            .frame(width: 50, height: 30)
-            .background(Color.clear).buttonStyle(PlainButtonStyle()).padding(.trailing)
-            
-            List {
-                ForEach(messages, id: \.self) { message in
-                    ChatMessageRow(message:message)
+            ScrollView {
+                    LazyVStack(spacing: 0) {
+                        ForEach(messages, id: \.self) { message in
+                            ChatMessageRow(chatItem: message)
+                        }
+                    }
                 }
-            }.listStyle(PlainListStyle()).padding(.bottom, 10)
-            
-            
+                .frame(maxHeight: .infinity).padding(.bottom, 10)
             HStack() {
-                TextField("Message...", text: $newMessage).frame(width: 120.0, height: 0)
+                Button(action: {}) {
+                    NavigationLink(destination: SettingView()){
+                        Image(systemName: "gearshape.fill")
+                            .font(.system(size: 20))
+                            .frame(maxWidth: .infinity)
+                    }
+                }.frame(width: 45, height: 45)
+                    .cornerRadius(5).buttonStyle(PlainButtonStyle())
+                
+                TextField("", text: $newMessage, onEditingChanged: { (isChanged) in
+                    if isStarted && !isChanged {
+                        isStarted = false
+                        print(newMessage)
+                    }
+                }).frame(height: 45)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 6)
+                            .stroke(Color.white, lineWidth: 1)
+                    )
                 Button(action: {
-                    let keychain = KeychainSwift()
+                    
+                    sendNotification()
+                }) {
+                    Image(systemName: "paperplane.fill")
+                        .font(.system(size: 20))
+                        .frame(maxWidth: .infinity)
+                }.frame(width: 45, height: 45)
+                    .cornerRadius(5)
+            }
+        }.edgesIgnoringSafeArea(.bottom)
+    }
+
+    func sendNotification() {
+        if newMessage == "" {
+            return
+        }
+        // Try to get the UUID from the keychain
+        let keychain = KeychainSwift()
 
-                    // Try to get the UUID from the keychain
-                    if keychain.get("uuid") == "" {
-                        let uuid = "956a11be45cba4a4"
-                        keychain.set(uuid, forKey: "uuid")
+        if keychain.get("uuid") == "" {
+            let uuid = "956a11be45cba4a4"
+            keychain.set(uuid, forKey: "uuid")
+        }
+        
+        // Add sent message to chat list
+        let message = ChatMessage(
+            type: TypeChat.SEND,
+            message: newMessage,
+            widgetType: TypeWidget.EMPTY,
+            widgetDesc: ""
+        )
+        messages.append(message)
+
+        if let url = URL(string: Constants.URL_SEND_NOTIFICATION) {
+            var request = URLRequest(url: url)
+            request.httpMethod = "POST"
+            request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+
+            let postData: [String: Any] = ["confs": Constants.getConfs(uuid: uuid), "message": newMessage]
+
+            do {
+                let jsonPostData = try JSONSerialization.data(withJSONObject: postData, options: .prettyPrinted)
+                URLSession.shared.uploadTask(with: request, from: jsonPostData) { data, response, error in
+                    guard error == nil, let data = data else {
+                        print("Error: \(error?.localizedDescription ?? "Unknown error")")
+                        return
                     }
-                    
-                    let userMessage = ChatMessage(message: newMessage, isUser: true)
-                    messages.append(userMessage)
-                    
-                    // Replace this URL with your server's URL
-                    if let url = URL(string: "https://ttt246-brain.hf.space/sendNotification") {
-                        var request = URLRequest(url: url)
-                        request.httpMethod = "POST" // Change this to any HTTP method you want
-                        request.addValue("application/json", forHTTPHeaderField: "Content-Type") // Add any necessary headers
-                        
-                        let confsData: [String: Any] = [
-                            "openai_key": "",
-                            "pinecone_key": "",
-                            "pinecone_env": "",
-                            "firebase_key": "",
-                            "token":"cI3EvimJQv-G5imdWrBprf:APA91bEZ5u6uq9Yq4a6NglN0L9pVM7p-rlxKB_FikbfKlzHnZT5GeAjxF0deuPT2GurS8bK6JTE2XPZLQqbsrtjxeRGhGOH5INoQ7MrRlr4TR3xFswKxJSkfi1aBUWDaLGALeirZ7GuZ",
-                            "uuid": uuid,
-                            "settings": [
-                                "temperature": 0.6
-                            ]
-                        ]
-                        
-                        let postData: [String: Any] = ["confs": confsData, "message": newMessage]
-                        
-                        do {
-                            let jsonData = try JSONSerialization.data(withJSONObject: postData, options: .prettyPrinted)
-                            URLSession.shared.uploadTask(with: request, from: jsonData) { data, response, error in
-                                guard error == nil, let data = data else {
-                                    print("Error: \(error?.localizedDescription ?? "Unknown error")")
-                                    return
-                                }
-                                
-                                do {
-                                    // Here we are converting data into JSON using JSONSerialization
-                                    if let jsonResult = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-                                        if let result = jsonResult["result"] as? [String: Any], let content = result["content"] as? String {
-                                            DispatchQueue.main.async {
-                                                let serverResponse = ChatMessage(message: content, isUser: false)
-                                                messages.append(serverResponse)
+
+                    do {
+                        if let jsonResult = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            if let result = jsonResult["result"] as? [String: Any], let program = result["program"] as? String {
+
+                                /**
+                                 * Analyzed user's query are classified in this switch code.
+                                 * Currently available command types are contact, image and message.
+                                 */
+                                switch program {
+                                case Constants.RESPONSE_TYPE_CONTACT:
+                                    if let strList = result["content"] as? String {
+                                        DispatchQueue.main.async {
+                                            let cleanedStr = strList.filter("0123456789,".contains)
+                                            let strArray = cleanedStr.components(separatedBy: ",")
+                                            searchContacts(contactIds: strArray)
+                                        }
+                                    }
+                                    
+                                case Constants.RESPONSE_TYPE_IMAGE:
+                                    if let content = result["content"] as? [String: Any] {
+                                        DispatchQueue.main.async {
+                                            if let imageName = content["image_name"] as? String {
+                                                let message = ChatMessage(
+                                                    type: TypeChat.WIDGET,
+                                                    message: imageName,
+                                                    widgetType: TypeWidget.IMAGE,
+                                                    widgetDesc: ""
+                                                )
+                                                messages.append(message)
                                             }
                                         }
                                     }
-                                } catch {
-                                    print("JSONSerialization error: \(error.localizedDescription)")
+                                    
+                                default:
+                                    if let content = result["content"] as? String {
+                                        DispatchQueue.main.async {
+                                            let message = ChatMessage(
+                                                type: TypeChat.RECEIVE,
+                                                message: content,
+                                                widgetType: TypeWidget.EMPTY,
+                                                widgetDesc: ""
+                                            )
+                                            messages.append(message)
+                                        }
+                                    }
                                 }
-                                
-                            }.resume()
-                        } catch {
-                            print("Error: \(error.localizedDescription)")
+                            }
                         }
+                    } catch {
+                        print("JSONSerialization error: \(error.localizedDescription)")
                     }
-                    newMessage = ""
-                }) {
-                    Image(systemName: "paperplane.fill")
-                }.frame(width: 50.0, height: 35)
+
+                }.resume()
+            } catch {
+                print("Error: \(error.localizedDescription)")
+            }
+        }
+        newMessage = ""
+    }
+    
+    func searchContacts(contactIds: Array<String>) {
+        
+        let keychain = KeychainSwift()
+
+        // Try to get the UUID from the keychain
+        if keychain.get("uuid") == "" {
+            let uuid = "ac2293beb9f3b1ca"
+            keychain.set(uuid, forKey: "uuid")
+        }
+        
+        // Send Http request with POST method
+        if let url = URL(string: Constants.URL_GET_CONTACTS_BY_IDS) {
+            var request = URLRequest(url: url)
+            request.httpMethod = "POST"
+            request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+            
+            let postData: [String: Any] = ["confs": Constants.getConfs(uuid: uuid), "contactIds": contactIds]
+            
+            do {
+                let postJsonData = try JSONSerialization.data(withJSONObject: postData, options: .prettyPrinted)
+                URLSession.shared.uploadTask(with: request, from: postJsonData) { data, response, error in
+                    guard error == nil, let data = data else {
+                        print("Error: \(error?.localizedDescription ?? "Unknown error")")
+                        return
+                    }
+                    
+                    do {
+                        let decoder = JSONDecoder()
+                        let contactResponse = try decoder.decode(ContactResponse.self, from: data)
+                        let contacts = contactResponse.result
+                        for contact in contacts {
+                            do {
+                                let jsonContact = try JSONEncoder().encode(contact)
+                                if let strContact = String(data: jsonContact, encoding: .utf8) {
+                                    let message = ChatMessage(
+                                        type: TypeChat.WIDGET,
+                                        message: "",
+                                        widgetType: TypeWidget.CONTACT,
+                                        widgetDesc: strContact
+                                    )
+                                    messages.append(message)
+                                }
+                            } catch {
+                                print("Error converting to JSON string: \(error)")
+                            }
+                        }
+                    } catch {
+                        print("JSONDecoding error: \(error.localizedDescription)")
+                    }
+                }.resume()
+            } catch {
+                print("Error: \(error.localizedDescription)")
             }
-        }.padding().edgesIgnoringSafeArea(.all)
+        }
+        newMessage = ""
     }
 }
 
@@ -107,6 +214,6 @@ struct ChatView: View {
 
 struct ChatView_Previews: PreviewProvider {
     static var previews: some View {
-        ChatView(isPresented: .constant(false))
+        ChatView()
     }
 }

WatchApp/WatchApp Watch App/Pages/ContactView.swift

@@ -0,0 +1,33 @@
+import SwiftUI
+
+struct ContactView: View {
+    @State var contact: Contact
+    
+    var body: some View {
+        VStack {
+            Text(contact.displayName).padding()
+                .bold()
+                .foregroundColor(.white)
+                .font(.system(size: 18))
+                .padding()
+            List {
+                ForEach(contact.phoneNumbers, id: \.self) { phone in
+                    Text(phone)
+                        .foregroundColor(.white)
+                        .font(.system(size: 15))
+                        .padding()
+                }
+            }.listStyle(PlainListStyle()).padding(.bottom, 10)
+        }
+    }
+}
+
+struct ContactView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContactView(contact: Contact(
+            contactId: "5",
+            displayName: "Peter Luo",
+            phoneNumbers: ["123-234-345"])
+        )
+    }
+}

WatchApp/WatchApp Watch App/Pages/SettingView.swift

@@ -1,16 +1,8 @@
-//
-//  SettingView.swift
-//  WatchApp Watch App
-//
-//  Created by DarkHorse on 7/1/23.
-//
-
 import SwiftUI
 import KeychainSwift
 
 struct SettingView: View {
-    @Binding var isPresented: Bool
-    @State private var uuid: String = "956a11be45cba4a4"
+    @State private var uuid: String = Constants.DEFAULT_UUID
     
     var body: some View {
         VStack {
@@ -23,15 +15,12 @@ struct SettingView: View {
                 Button(action: {
                     let keychain = KeychainSwift()
                     keychain.set("\($uuid)", forKey: "uuid")
-                    self.isPresented = false
                 }) {
-                    Text("Yes")
+                    Text("Save")
                 }
                 Spacer()
-                Button(action: {
-                    self.isPresented = false
-                }) {
-                    Text("No")
+                Button(action: {}) {
+                    Text("Cancel")
                 }
                 Spacer()
             }
@@ -41,6 +30,6 @@ struct SettingView: View {
 
 struct SettingView_Previews: PreviewProvider {
     static var previews: some View {
-        SettingView(isPresented: .constant(true))
+        SettingView()
     }
 }

WatchApp/WatchApp Watch App/Values/Constants.swift

@@ -0,0 +1,27 @@
+import Foundation
+
+struct Constants {
+    static let DEFAULT_UUID = "ac2293beb9f3b1ca"
+    
+    static let BASE_URL = "https://ttt246-brain.hf.space/"
+    static let URL_SEND_NOTIFICATION = BASE_URL + "sendNotification"
+    static let URL_GET_CONTACTS_BY_IDS = BASE_URL + "contacts/get_by_ids"
+    
+    static let RESPONSE_TYPE_CONTACT = "contact"
+    static let RESPONSE_TYPE_IMAGE = "image"
+    
+    static func getConfs(uuid: String) -> [String: Any] {
+        return [
+            "openai_key": "",
+            "pinecone_key": "",
+            "pinecone_env": "",
+            "firebase_key": "",
+            "token":"cI3EvimJQv-G5imdWrBprf:APA91bEZ5u6uq9Yq4a6NglN0L9pVM7p-rlxKB_FikbfKlzHnZT5GeAjxF0deuPT2GurS8bK6JTE2XPZLQqbsrtjxeRGhGOH5INoQ7MrRlr4TR3xFswKxJSkfi1aBUWDaLGALeirZ7GuZ",
+            "uuid": uuid,
+            "settings": [
+                "temperature": 0.6
+            ]
+        ]
+    }
+}
+

WatchApp/WatchApp Watch App/Values/File.swift

@@ -0,0 +1,8 @@
+//
+//  File.swift
+//  WatchApp Watch App
+//
+//  Created by DarkHorse on 7/9/23.
+//
+
+import Foundation

WatchApp/WatchApp Watch App/Values/Strings.swift

@@ -0,0 +1,5 @@
+import SwiftUI
+
+struct String {
+    static let app: String = CGSt("RisingWatch")
+}

WatchApp/WatchApp.xcodeproj/project.pbxproj

@@ -17,6 +17,10 @@
 		FE673FCE2A5022C9003EF230 /* ChatMessageRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE673FCD2A5022C9003EF230 /* ChatMessageRow.swift */; };
 		FE673FD02A504903003EF230 /* SettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE673FCF2A504903003EF230 /* SettingView.swift */; };
 		FE673FD32A504EAF003EF230 /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE673FD22A504EAF003EF230 /* MainView.swift */; };
+		FE673FD52A5413F5003EF230 /* ContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE673FD42A5413F5003EF230 /* ContactView.swift */; };
+		FE8CB8F52A5B0F5F002CBC44 /* ImageRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE8CB8F42A5B0F5F002CBC44 /* ImageRow.swift */; };
+		FE8CB8F72A5BD51A002CBC44 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE8CB8F62A5BD51A002CBC44 /* Constants.swift */; };
+		FED5B74B2A5833E30040DF09 /* ContactRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED5B74A2A5833E20040DF09 /* ContactRow.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -70,6 +74,10 @@
 		FE673FCD2A5022C9003EF230 /* ChatMessageRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMessageRow.swift; sourceTree = "<group>"; };
 		FE673FCF2A504903003EF230 /* SettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingView.swift; sourceTree = "<group>"; };
 		FE673FD22A504EAF003EF230 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
+		FE673FD42A5413F5003EF230 /* ContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactView.swift; sourceTree = "<group>"; };
+		FE8CB8F42A5B0F5F002CBC44 /* ImageRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageRow.swift; sourceTree = "<group>"; };
+		FE8CB8F62A5BD51A002CBC44 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
+		FED5B74A2A5833E20040DF09 /* ContactRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactRow.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -122,6 +130,7 @@
 		FE56FAE52A4C5810008410B4 /* WatchApp Watch App */ = {
 			isa = PBXGroup;
 			children = (
+				FE8CB8EB2A5AFFCF002CBC44 /* Values */,
 				FE673FCC2A502280003EF230 /* Components */,
 				FE673FD12A504913003EF230 /* Pages */,
 				FE673FD22A504EAF003EF230 /* MainView.swift */,
@@ -151,6 +160,8 @@
 			isa = PBXGroup;
 			children = (
 				FE673FCD2A5022C9003EF230 /* ChatMessageRow.swift */,
+				FED5B74A2A5833E20040DF09 /* ContactRow.swift */,
+				FE8CB8F42A5B0F5F002CBC44 /* ImageRow.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -160,10 +171,19 @@
 			children = (
 				FE673FCF2A504903003EF230 /* SettingView.swift */,
 				FE56FAE82A4C5810008410B4 /* ChatView.swift */,
+				FE673FD42A5413F5003EF230 /* ContactView.swift */,
 			);
 			path = Pages;
 			sourceTree = "<group>";
 		};
+		FE8CB8EB2A5AFFCF002CBC44 /* Values */ = {
+			isa = PBXGroup;
+			children = (
+				FE8CB8F62A5BD51A002CBC44 /* Constants.swift */,
+			);
+			path = Values;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -326,10 +346,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				FE8CB8F52A5B0F5F002CBC44 /* ImageRow.swift in Sources */,
+				FE8CB8F72A5BD51A002CBC44 /* Constants.swift in Sources */,
 				FE673FCE2A5022C9003EF230 /* ChatMessageRow.swift in Sources */,
+				FE673FD52A5413F5003EF230 /* ContactView.swift in Sources */,
 				FE673FD02A504903003EF230 /* SettingView.swift in Sources */,
 				FE56FB142A4C80A5008410B4 /* ChatView.swift in Sources */,
 				FE673FD32A504EAF003EF230 /* MainView.swift in Sources */,
+				FED5B74B2A5833E30040DF09 /* ContactRow.swift in Sources */,
 				FE56FAE72A4C5810008410B4 /* WatchAppApp.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -484,7 +508,6 @@
 		FE56FB082A4C5814008410B4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
@@ -513,7 +536,6 @@
 		FE56FB092A4C5814008410B4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;

WatchApp/WatchApp.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,5 @@
+<?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/>
+</plist>

WatchApp/WatchApp.xcodeproj/project.xcworkspace/xcuserdata/darkhorse.xcuserdatad/WorkspaceSettings.xcsettings

@@ -0,0 +1,14 @@
+<?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>BuildLocationStyle</key>
+	<string>UseAppPreferences</string>
+	<key>CustomBuildLocationType</key>
+	<string>RelativeToDerivedData</string>
+	<key>DerivedDataLocationStyle</key>
+	<string>Default</string>
+	<key>ShowSharedSchemesAutomaticallyEnabled</key>
+	<true/>
+</dict>
+</plist>

WatchApp/WatchApp.xcodeproj/xcuserdata/darkhorse.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,4 +3,22 @@
    uuid = "78398B09-67A6-447A-BDF1-6FF7D60370C3"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "CD74F7A6-629E-4D64-B2EF-98510C1B484E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "WatchApp Watch App/MainView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "13"
+            endingLineNumber = "13"
+            landmarkName = "previews"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

WatchApp/WatchApp.xcodeproj/xcuserdata/darkhorse.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -4,6 +4,69 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
+		<key>Promises (Playground) 1.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>Promises (Playground) 2.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>4</integer>
+		</dict>
+		<key>Promises (Playground) 3.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
+		<key>Promises (Playground) 4.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>6</integer>
+		</dict>
+		<key>Promises (Playground) 5.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>7</integer>
+		</dict>
+		<key>Promises (Playground) 6.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>Promises (Playground) 7.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>8</integer>
+		</dict>
+		<key>Promises (Playground) 8.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>9</integer>
+		</dict>
+		<key>Promises (Playground).xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
 		<key>WatchApp Watch App.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>