diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/account_menu.imageset/Contents.json b/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/account_menu.imageset/Contents.json new file mode 100644 index 0000000..ed54ebd --- /dev/null +++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/account_menu.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "account_menu.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "auto-scaling" : "auto" + } +} \ No newline at end of file diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/account_menu.imageset/account_menu.pdf b/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/account_menu.imageset/account_menu.pdf new file mode 100644 index 0000000..05ffc99 Binary files /dev/null and b/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/account_menu.imageset/account_menu.pdf differ diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/wellness_menu.imageset/Contents.json b/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/wellness_menu.imageset/Contents.json new file mode 100644 index 0000000..c02751b --- /dev/null +++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/wellness_menu.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "wellness_menu.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "auto-scaling" : "auto" + } +} \ No newline at end of file diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/wellness_menu.imageset/wellness_menu.pdf b/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/wellness_menu.imageset/wellness_menu.pdf new file mode 100644 index 0000000..09afdc6 Binary files /dev/null and b/SynchronyFinancial/SynchronyFinancial WatchKit App/Assets.xcassets/wellness_menu.imageset/wellness_menu.pdf differ diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard index 365e83e..db708d7 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard +++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard @@ -1,47 +1,71 @@ - + + + + - - + + + - - + + - - - - - - - - + - - - - - + + - + - + - - + + - + + + + - + - - + + - + + + + - + diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/InterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/InterfaceController.swift deleted file mode 100644 index 3b91734..0000000 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/InterfaceController.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// InterfaceController.swift -// SynchronyFinancial WatchKit Extension -// -// Created by Alan Maynard on 11/15/18. -// Copyright © 2018 Alan Maynard. All rights reserved. -// - -import WatchKit -import Foundation - - -class InterfaceController: WKInterfaceController { - - override func awake(withContext context: Any?) { - super.awake(withContext: context) - - // Configure interface objects here. - } - - override func willActivate() { - // This method is called when watch view controller is about to be visible to user - super.willActivate() - } - - override func didDeactivate() { - // This method is called when watch view controller is no longer visible - super.didDeactivate() - } - -} diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/MainMenuInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/MainMenuInterfaceController.swift new file mode 100644 index 0000000..de0e471 --- /dev/null +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/MainMenuInterfaceController.swift @@ -0,0 +1,41 @@ +// +// MainMenuInterfaceController.swift +// SynchronyFinancial WatchKit Extension +// +// Created by Alan Maynard on 11/21/18. +// Copyright © 2018 Alan Maynard. All rights reserved. +// + +import WatchKit +import Foundation + +class MainMenuInterfaceController: WKInterfaceController { + @IBOutlet weak var accountsButton: WKInterfaceButton! + @IBOutlet weak var wellnessButton: WKInterfaceButton! + + override func awake(withContext context: Any?) { + super.awake(withContext: context) + + // Configure interface objects here. + } + + override func willActivate() { + // This method is called when watch view controller is about to be visible to user + super.willActivate() + } + + override func didDeactivate() { + // This method is called when watch view controller is no longer visible + super.didDeactivate() + } + + override func contextForSegue(withIdentifier segueIdentifier: String) -> Any? { + if segueIdentifier == "toAccounts" { + // we will probably want to do some setup prior to presenting Accounts + } else if segueIdentifier == "toWellness" { + // we will probably want to do some setup prior to presenting Wellness + } + + return nil + } +} diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/NotificationController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/NotificationController.swift deleted file mode 100644 index e29845a..0000000 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/NotificationController.swift +++ /dev/null @@ -1,38 +0,0 @@ -// -// NotificationController.swift -// SynchronyFinancial WatchKit Extension -// -// Created by Alan Maynard on 11/15/18. -// Copyright © 2018 Alan Maynard. All rights reserved. -// - -import WatchKit -import Foundation -import UserNotifications - - -class NotificationController: WKUserNotificationInterfaceController { - - override init() { - // Initialize variables here. - super.init() - - // Configure interface objects here. - } - - override func willActivate() { - // This method is called when watch view controller is about to be visible to user - super.willActivate() - } - - override func didDeactivate() { - // This method is called when watch view controller is no longer visible - super.didDeactivate() - } - - override func didReceive(_ notification: UNNotification) { - // This method is called when a notification needs to be presented. - // Implement it if you use a dynamic notification interface. - // Populate your dynamic notification interface as quickly as possible. - } -} diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PushNotificationPayload.apns b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PushNotificationPayload.apns deleted file mode 100644 index 5ac5526..0000000 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PushNotificationPayload.apns +++ /dev/null @@ -1,20 +0,0 @@ -{ - "aps": { - "alert": { - "body": "Test message", - "title": "Optional title", - "subtitle": "Optional subtitle" - }, - "category": "myCategory", - "thread-id":"5280" - }, - - "WatchKit Simulator Actions": [ - { - "title": "First Button", - "identifier": "firstButtonAction" - } - ], - - "customKey": "Use this file to define a testing payload for your notifications. The aps dictionary specifies the category, alert text and title. The WatchKit Simulator Actions array can provide info for one or more action buttons in addition to the standard Dismiss button. Any other top level keys are custom payload. If you have multiple such JSON files in your project, you'll be able to select them when choosing to debug the notification interface of your Watch App." -} diff --git a/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj b/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj index 037ded6..ba4ef0a 100644 --- a/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj +++ b/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj @@ -8,18 +8,16 @@ /* Begin PBXBuildFile section */ 281283568A34D3C5D9C7B383 /* libPods-SynchronyFinancial WatchKit Extension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAA6D46F907ADAABF49FD409 /* libPods-SynchronyFinancial WatchKit Extension.a */; }; + 673F396E21A644570051469E /* MainMenuInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 673F396C21A644460051469E /* MainMenuInterfaceController.swift */; }; + 673F397021A652A00051469E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 673F396F21A652A00051469E /* Assets.xcassets */; }; 67BAC269219E254700713FEF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67BAC268219E254700713FEF /* AppDelegate.swift */; }; - 67BAC26B219E254700713FEF /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67BAC26A219E254700713FEF /* ViewController.swift */; }; 67BAC26E219E254700713FEF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 67BAC26C219E254700713FEF /* Main.storyboard */; }; 67BAC270219E254800713FEF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 67BAC26F219E254800713FEF /* Assets.xcassets */; }; 67BAC273219E254800713FEF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 67BAC271219E254800713FEF /* LaunchScreen.storyboard */; }; 67BAC278219E254800713FEF /* SynchronyFinancial WatchKit App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 67BAC277219E254800713FEF /* SynchronyFinancial WatchKit App.app */; }; 67BAC27E219E254800713FEF /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 67BAC27C219E254800713FEF /* Interface.storyboard */; }; - 67BAC280219E254800713FEF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 67BAC27F219E254800713FEF /* Assets.xcassets */; }; 67BAC287219E254900713FEF /* SynchronyFinancial WatchKit Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 67BAC286219E254900713FEF /* SynchronyFinancial WatchKit Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 67BAC28C219E254900713FEF /* InterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67BAC28B219E254900713FEF /* InterfaceController.swift */; }; 67BAC28E219E254900713FEF /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67BAC28D219E254900713FEF /* ExtensionDelegate.swift */; }; - 67BAC290219E254900713FEF /* NotificationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67BAC28F219E254900713FEF /* NotificationController.swift */; }; 67BAC292219E254900713FEF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 67BAC291219E254900713FEF /* Assets.xcassets */; }; A023013199652496572E43E0 /* libPods-SynchronyFinancial.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FC287DF4ECF0A5ECBD80C136 /* libPods-SynchronyFinancial.a */; }; BBECE7F685B263BB9794F863 /* libPods-SynchronyFinancial WatchKit App.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EA10823B2E5A7A4FEF31740 /* libPods-SynchronyFinancial WatchKit App.a */; }; @@ -68,25 +66,23 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 673F396C21A644460051469E /* MainMenuInterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenuInterfaceController.swift; sourceTree = ""; }; + 673F396F21A652A00051469E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 1BEF4B8BF190D117CA6104E5 /* Pods-SynchronyFinancial WatchKit App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SynchronyFinancial WatchKit App.release.xcconfig"; path = "Pods/Target Support Files/Pods-SynchronyFinancial WatchKit App/Pods-SynchronyFinancial WatchKit App.release.xcconfig"; sourceTree = ""; }; 250BDAF6AD4E1CCA82995E30 /* Pods-SynchronyFinancial WatchKit Extension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SynchronyFinancial WatchKit Extension.release.xcconfig"; path = "Pods/Target Support Files/Pods-SynchronyFinancial WatchKit Extension/Pods-SynchronyFinancial WatchKit Extension.release.xcconfig"; sourceTree = ""; }; 396A16E056D05DEC937A07DA /* Pods-SynchronyFinancial.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SynchronyFinancial.release.xcconfig"; path = "Pods/Target Support Files/Pods-SynchronyFinancial/Pods-SynchronyFinancial.release.xcconfig"; sourceTree = ""; }; 4EA10823B2E5A7A4FEF31740 /* libPods-SynchronyFinancial WatchKit App.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SynchronyFinancial WatchKit App.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 67BAC265219E254700713FEF /* SynchronyFinancial.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SynchronyFinancial.app; sourceTree = BUILT_PRODUCTS_DIR; }; 67BAC268219E254700713FEF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 67BAC26A219E254700713FEF /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 67BAC26D219E254700713FEF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 67BAC26F219E254800713FEF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 67BAC272219E254800713FEF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 67BAC274219E254800713FEF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 67BAC277219E254800713FEF /* SynchronyFinancial WatchKit App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SynchronyFinancial WatchKit App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 67BAC27D219E254800713FEF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = ""; }; - 67BAC27F219E254800713FEF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 67BAC281219E254800713FEF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 67BAC286219E254900713FEF /* SynchronyFinancial WatchKit Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SynchronyFinancial WatchKit Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; - 67BAC28B219E254900713FEF /* InterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InterfaceController.swift; sourceTree = ""; }; 67BAC28D219E254900713FEF /* ExtensionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionDelegate.swift; sourceTree = ""; }; - 67BAC28F219E254900713FEF /* NotificationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationController.swift; sourceTree = ""; }; 67BAC291219E254900713FEF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 67BAC293219E254900713FEF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 67BAC294219E254900713FEF /* PushNotificationPayload.apns */ = {isa = PBXFileReference; lastKnownFileType = text; path = PushNotificationPayload.apns; sourceTree = ""; }; @@ -151,7 +147,6 @@ isa = PBXGroup; children = ( 67BAC268219E254700713FEF /* AppDelegate.swift */, - 67BAC26A219E254700713FEF /* ViewController.swift */, 67BAC26C219E254700713FEF /* Main.storyboard */, 67BAC26F219E254800713FEF /* Assets.xcassets */, 67BAC271219E254800713FEF /* LaunchScreen.storyboard */, @@ -164,7 +159,7 @@ isa = PBXGroup; children = ( 67BAC27C219E254800713FEF /* Interface.storyboard */, - 67BAC27F219E254800713FEF /* Assets.xcassets */, + 673F396F21A652A00051469E /* Assets.xcassets */, 67BAC281219E254800713FEF /* Info.plist */, ); path = "SynchronyFinancial WatchKit App"; @@ -173,12 +168,10 @@ 67BAC28A219E254900713FEF /* SynchronyFinancial WatchKit Extension */ = { isa = PBXGroup; children = ( - 67BAC28B219E254900713FEF /* InterfaceController.swift */, + 673F396C21A644460051469E /* MainMenuInterfaceController.swift */, 67BAC28D219E254900713FEF /* ExtensionDelegate.swift */, - 67BAC28F219E254900713FEF /* NotificationController.swift */, 67BAC291219E254900713FEF /* Assets.xcassets */, 67BAC293219E254900713FEF /* Info.plist */, - 67BAC294219E254900713FEF /* PushNotificationPayload.apns */, ); path = "SynchronyFinancial WatchKit Extension"; sourceTree = ""; @@ -322,7 +315,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 67BAC280219E254800713FEF /* Assets.xcassets in Resources */, + 673F397021A652A00051469E /* Assets.xcassets in Resources */, 67BAC27E219E254800713FEF /* Interface.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -411,7 +404,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 67BAC26B219E254700713FEF /* ViewController.swift in Sources */, 67BAC269219E254700713FEF /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -420,9 +412,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 67BAC290219E254900713FEF /* NotificationController.swift in Sources */, 67BAC28E219E254900713FEF /* ExtensionDelegate.swift in Sources */, - 67BAC28C219E254900713FEF /* InterfaceController.swift in Sources */, + 673F396E21A644570051469E /* MainMenuInterfaceController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SynchronyFinancial/SynchronyFinancial/ViewController.swift b/SynchronyFinancial/SynchronyFinancial/ViewController.swift deleted file mode 100644 index d80e182..0000000 --- a/SynchronyFinancial/SynchronyFinancial/ViewController.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// ViewController.swift -// SynchronyFinancial -// -// Created by Alan Maynard on 11/15/18. -// Copyright © 2018 Alan Maynard. All rights reserved. -// - -import UIKit - -class ViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - // Do any additional setup after loading the view, typically from a nib. - } - - -} -