diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json index 72bc5dc..d2c2960 100644 --- a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,75 +1,92 @@ { "images" : [ { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-29@2x.png", - "scale" : "2x" - }, - { - "size" : "24x24", + "filename" : "Logo-24@2x.png", "idiom" : "watch", - "filename" : "Icon-24@2x.png", - "scale" : "2x", "role" : "notificationCenter", + "scale" : "2x", + "size" : "24x24", "subtype" : "38mm" }, { - "size" : "27.5x27.5", + "filename" : "Logo-27-5@2x.png", "idiom" : "watch", - "filename" : "Icon-27.5@2x.png", - "scale" : "2x", "role" : "notificationCenter", + "scale" : "2x", + "size" : "27.5x27.5", "subtype" : "42mm" }, { - "size" : "29x29", + "filename" : "Logo-29@2x.png", "idiom" : "watch", "role" : "companionSettings", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "Logo-24@3x.png", "idiom" : "watch", - "filename" : "Icon-29@3x.png", "role" : "companionSettings", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "Logo-40@2x.png", "idiom" : "watch", - "filename" : "Icon-40@2x.png", - "scale" : "2x", "role" : "appLauncher", + "scale" : "2x", + "size" : "40x40", "subtype" : "38mm" }, { - "size" : "44x44", + "filename" : "Logo-44@2x.png", "idiom" : "watch", - "filename" : "Icon-44@2x.png", + "role" : "appLauncher", "scale" : "2x", - "role" : "longLook", - "subtype" : "42mm" + "size" : "44x44", + "subtype" : "40mm" }, { - "size" : "86x86", + "filename" : "Logo-50@2x.png", "idiom" : "watch", - "filename" : "Icon-86@2x.png", + "role" : "appLauncher", "scale" : "2x", + "size" : "50x50", + "subtype" : "44mm" + }, + { + "filename" : "Logo-86@2x.png", + "idiom" : "watch", "role" : "quickLook", + "scale" : "2x", + "size" : "86x86", "subtype" : "38mm" }, { - "size" : "98x98", + "filename" : "Logo-98@2x.png", "idiom" : "watch", - "filename" : "Icon-98@2x.png", - "scale" : "2x", "role" : "quickLook", + "scale" : "2x", + "size" : "98x98", "subtype" : "42mm" + }, + { + "filename" : "Logo-108@2x.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "108x108", + "subtype" : "44mm" + }, + { + "filename" : "Logo-1024@1x.png", + "idiom" : "watch-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png deleted file mode 100644 index 3b9f0db..0000000 Binary files a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png and /dev/null differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-27.5@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-27.5@2x.png deleted file mode 100644 index fa55cd6..0000000 Binary files a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-27.5@2x.png and /dev/null differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png deleted file mode 100644 index 89f282a..0000000 Binary files a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png and /dev/null differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png deleted file mode 100644 index 75eae03..0000000 Binary files a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png and /dev/null differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png deleted file mode 100644 index fc3e112..0000000 Binary files a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png and /dev/null differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-44@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-44@2x.png deleted file mode 100644 index 847c415..0000000 Binary files a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-44@2x.png and /dev/null differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-86@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-86@2x.png deleted file mode 100644 index 1261d07..0000000 Binary files a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-86@2x.png and /dev/null differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-98@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-98@2x.png deleted file mode 100644 index 56019ba..0000000 Binary files a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Icon-98@2x.png and /dev/null differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-1024@1x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-1024@1x.png new file mode 100644 index 0000000..b3183df Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-1024@1x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-108@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-108@2x.png new file mode 100644 index 0000000..a04d7cd Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-108@2x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-24@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-24@2x.png new file mode 100644 index 0000000..49ee523 Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-24@2x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-24@3x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-24@3x.png new file mode 100644 index 0000000..792c466 Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-24@3x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-27-5@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-27-5@2x.png new file mode 100644 index 0000000..972ce12 Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-27-5@2x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-29@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-29@2x.png new file mode 100644 index 0000000..f67534c Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-29@2x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-40@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-40@2x.png new file mode 100644 index 0000000..0bc869b Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-40@2x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-44@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-44@2x.png new file mode 100644 index 0000000..b0e5215 Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-44@2x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-50@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-50@2x.png new file mode 100644 index 0000000..519f0d9 Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-50@2x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-86@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-86@2x.png new file mode 100644 index 0000000..c5522f9 Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-86@2x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-98@2x.png b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-98@2x.png new file mode 100644 index 0000000..7dc6439 Binary files /dev/null and b/Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Logo-98@2x.png differ diff --git a/Heart Control WatchKit App/Assets.xcassets/Contents.json b/Heart Control WatchKit App/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Heart Control WatchKit App/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Heart Control WatchKit App/Info.plist b/Heart Control WatchKit App/Info.plist index 51a711c..7c68902 100644 --- a/Heart Control WatchKit App/Info.plist +++ b/Heart Control WatchKit App/Info.plist @@ -28,7 +28,7 @@ UIInterfaceOrientationPortraitUpsideDown WKCompanionAppBundleIdentifier - com.thomaspaulmann.Heart-Control + com.kevintanner.Heart-Control WKWatchKitApp diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json index f2a7f51..b07e18f 100644 --- a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json @@ -9,14 +9,24 @@ "scale" : "2x", "screen-width" : "<=145" }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, { "idiom" : "watch", "scale" : "2x", "screen-width" : ">145" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Contents.json index 2bf2522..e8b3252 100644 --- a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Contents.json +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Contents.json @@ -1,23 +1,53 @@ { "assets" : [ { - "idiom" : "watch", "filename" : "Circular.imageset", + "idiom" : "watch", "role" : "circular" }, { + "filename" : "Extra Large.imageset", + "idiom" : "watch", + "role" : "extra-large" + }, + { + "filename" : "Graphic Bezel.imageset", + "idiom" : "watch", + "role" : "graphic-bezel" + }, + { + "filename" : "Graphic Circular.imageset", + "idiom" : "watch", + "role" : "graphic-circular" + }, + { + "filename" : "Graphic Corner.imageset", "idiom" : "watch", + "role" : "graphic-corner" + }, + { + "filename" : "Graphic Extra Large.imageset", + "idiom" : "watch", + "role" : "graphic-extra-large" + }, + { + "filename" : "Graphic Large Rectangular.imageset", + "idiom" : "watch", + "role" : "graphic-large-rectangular" + }, + { "filename" : "Modular.imageset", + "idiom" : "watch", "role" : "modular" }, { - "idiom" : "watch", "filename" : "Utilitarian.imageset", + "idiom" : "watch", "role" : "utilitarian" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json new file mode 100644 index 0000000..ed7de25 --- /dev/null +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json @@ -0,0 +1,28 @@ +{ + "images" : [ + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : "<=145" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">145" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json new file mode 100644 index 0000000..9685a7f --- /dev/null +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json new file mode 100644 index 0000000..9685a7f --- /dev/null +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json new file mode 100644 index 0000000..9685a7f --- /dev/null +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json new file mode 100644 index 0000000..ed7de25 --- /dev/null +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json @@ -0,0 +1,28 @@ +{ + "images" : [ + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : "<=145" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">145" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json new file mode 100644 index 0000000..9685a7f --- /dev/null +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json index f2a7f51..b07e18f 100644 --- a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json @@ -9,14 +9,24 @@ "scale" : "2x", "screen-width" : "<=145" }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, { "idiom" : "watch", "scale" : "2x", "screen-width" : ">145" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json index f2a7f51..b07e18f 100644 --- a/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json +++ b/Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json @@ -9,14 +9,24 @@ "scale" : "2x", "screen-width" : "<=145" }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">161" + }, { "idiom" : "watch", "scale" : "2x", "screen-width" : ">145" + }, + { + "idiom" : "watch", + "scale" : "2x", + "screen-width" : ">183" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Heart Control WatchKit Extension/AuthorizationManger.swift b/Heart Control WatchKit Extension/AuthorizationManger.swift index d82f9bb..af472b6 100644 --- a/Heart Control WatchKit Extension/AuthorizationManger.swift +++ b/Heart Control WatchKit Extension/AuthorizationManger.swift @@ -10,7 +10,7 @@ import HealthKit class AuthorizationManager { - static func requestAuthorization(completionHandler: ((_ success: Bool) -> Void)) { + static func requestAuthorization(completionHandler: @escaping ((_ success: Bool) -> Void)) { // Create health store. let healthStore = HKHealthStore() @@ -32,7 +32,7 @@ class AuthorizationManager { healthStore.requestAuthorization(toShare: nil, read: [heartRateQuantityType]) { (success, error) -> Void in // If there is an error, do nothing. guard error == nil else { - print(error) +// print(error) completionHandler(false) return } diff --git a/Heart Control WatchKit Extension/ExtensionDelegate.swift b/Heart Control WatchKit Extension/ExtensionDelegate.swift index ec7c4bb..837b30e 100644 --- a/Heart Control WatchKit Extension/ExtensionDelegate.swift +++ b/Heart Control WatchKit Extension/ExtensionDelegate.swift @@ -29,7 +29,7 @@ class ExtensionDelegate: NSObject, WKExtensionDelegate { // Process the background task // Be sure to complete each task when finished processing. - task.setTaskCompleted() + task.setTaskCompletedWithSnapshot(false) } } diff --git a/Heart Control WatchKit Extension/Info.plist b/Heart Control WatchKit Extension/Info.plist index cf15b9a..31e303b 100644 --- a/Heart Control WatchKit Extension/Info.plist +++ b/Heart Control WatchKit Extension/Info.plist @@ -27,7 +27,7 @@ NSExtensionAttributes WKAppBundleIdentifier - com.thomaspaulmann.Heart-Control.watchkitapp + com.kevintanner.Heart-Control.watchkitapp NSExtensionPointIdentifier com.apple.watchkit @@ -42,5 +42,11 @@ WKExtensionDelegateClassName $(PRODUCT_MODULE_NAME).ExtensionDelegate + WKRunsIndependentlyOfCompanionApp + + NSHealthShareUsageDescription + This is needed to view your heart rate data in an interesting way. + NSHealthUpdateUsageDescription + This is need to save your heart rate data to health. diff --git a/Heart Control WatchKit Extension/WorkoutManager.swift b/Heart Control WatchKit Extension/WorkoutManager.swift index 50046c1..965fb77 100644 --- a/Heart Control WatchKit Extension/WorkoutManager.swift +++ b/Heart Control WatchKit Extension/WorkoutManager.swift @@ -72,14 +72,14 @@ class WorkoutManager: NSObject { // Create workout session. do { - session = try HKWorkoutSession(configuration: workoutConfiguration) + session = try HKWorkoutSession(healthStore: healthStore, configuration: workoutConfiguration) session!.delegate = self } catch { fatalError("Unable to create Workout Session!") } // Start workout session. - healthStore.start(session!) + session?.startActivity(with: Date()) // Update state to started and inform delegates. state = .started @@ -96,7 +96,7 @@ class WorkoutManager: NSObject { heartRateManager.stop() // Stop the workout session. - healthStore.end(session!) + session?.end() // Clear the workout session. session = nil diff --git a/Heart Control.xcodeproj/project.pbxproj b/Heart Control.xcodeproj/project.pbxproj index 48a367c..9660653 100644 --- a/Heart Control.xcodeproj/project.pbxproj +++ b/Heart Control.xcodeproj/project.pbxproj @@ -276,12 +276,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = "Thomas Paul Mann"; TargetAttributes = { BE25AFE61D4F33B000DAF094 = { CreatedOnToolsVersion = 8.0; - DevelopmentTeam = E6HN743D3A; + DevelopmentTeam = C39EPG5VUE; DevelopmentTeamName = "Thomas Mann"; ProvisioningStyle = Automatic; SystemCapabilities = { @@ -292,13 +292,13 @@ }; BE25AFF81D4F33B100DAF094 = { CreatedOnToolsVersion = 8.0; - DevelopmentTeam = E6HN743D3A; + DevelopmentTeam = C39EPG5VUE; DevelopmentTeamName = "Thomas Mann"; ProvisioningStyle = Automatic; }; BE25B0071D4F33B100DAF094 = { CreatedOnToolsVersion = 8.0; - DevelopmentTeam = E6HN743D3A; + DevelopmentTeam = C39EPG5VUE; DevelopmentTeamName = "Thomas Mann"; ProvisioningStyle = Automatic; SystemCapabilities = { @@ -314,7 +314,7 @@ }; buildConfigurationList = BE25AFE21D4F33B000DAF094 /* Build configuration list for PBXProject "Heart Control" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -433,19 +433,31 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -467,7 +479,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -480,19 +492,31 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -508,7 +532,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -521,15 +545,16 @@ buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; CODE_SIGN_ENTITLEMENTS = "Heart Control WatchKit Extension/Heart Control WatchKit Extension.entitlements"; + DEVELOPMENT_TEAM = C39EPG5VUE; INFOPLIST_FILE = "Heart Control WatchKit Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.thomaspaulmann.Heart-Control.watchkitapp.watchkitextension"; + PRODUCT_BUNDLE_IDENTIFIER = "com.kevintanner.Heart-Control.watchkitapp.watchkitextension"; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + WATCHOS_DEPLOYMENT_TARGET = 7.2; }; name = Debug; }; @@ -538,15 +563,16 @@ buildSettings = { ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; CODE_SIGN_ENTITLEMENTS = "Heart Control WatchKit Extension/Heart Control WatchKit Extension.entitlements"; + DEVELOPMENT_TEAM = C39EPG5VUE; INFOPLIST_FILE = "Heart Control WatchKit Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.thomaspaulmann.Heart-Control.watchkitapp.watchkitextension"; + PRODUCT_BUNDLE_IDENTIFIER = "com.kevintanner.Heart-Control.watchkitapp.watchkitextension"; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + WATCHOS_DEPLOYMENT_TARGET = 7.2; }; name = Release; }; @@ -555,15 +581,16 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + DEVELOPMENT_TEAM = C39EPG5VUE; IBSC_MODULE = Heart_Control_WatchKit_Extension; INFOPLIST_FILE = "Heart Control WatchKit App/Info.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "com.thomaspaulmann.Heart-Control.watchkitapp"; + PRODUCT_BUNDLE_IDENTIFIER = "com.kevintanner.Heart-Control.watchkitapp"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + WATCHOS_DEPLOYMENT_TARGET = 7.2; }; name = Debug; }; @@ -572,15 +599,16 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + DEVELOPMENT_TEAM = C39EPG5VUE; IBSC_MODULE = Heart_Control_WatchKit_Extension; INFOPLIST_FILE = "Heart Control WatchKit App/Info.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "com.thomaspaulmann.Heart-Control.watchkitapp"; + PRODUCT_BUNDLE_IDENTIFIER = "com.kevintanner.Heart-Control.watchkitapp"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 3.0; + WATCHOS_DEPLOYMENT_TARGET = 7.2; }; name = Release; }; @@ -589,11 +617,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "Heart Control/Heart Control.entitlements"; + DEVELOPMENT_TEAM = C39EPG5VUE; INFOPLIST_FILE = "Heart Control/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.thomaspaulmann.Heart-Control"; + PRODUCT_BUNDLE_IDENTIFIER = "com.kevintanner.Heart-Control"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -602,11 +631,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "Heart Control/Heart Control.entitlements"; + DEVELOPMENT_TEAM = C39EPG5VUE; INFOPLIST_FILE = "Heart Control/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.thomaspaulmann.Heart-Control"; + PRODUCT_BUNDLE_IDENTIFIER = "com.kevintanner.Heart-Control"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Heart Control.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Heart Control.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Heart Control.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Contents.json b/Heart Control/Assets.xcassets/AppIcon.appiconset/Contents.json index 6835038..c54a55a 100644 --- a/Heart Control/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Heart Control/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,173 +1,116 @@ { "images" : [ - { - "idiom" : "iphone", + { "size" : "20x20", - "scale" : "2x" + "idiom": "iphone", + "filename" : "Heart Control-20@2x.png", + "scale": "2x" }, - { - "idiom" : "iphone", + { "size" : "20x20", - "scale" : "3x" + "idiom": "iphone", + "filename" : "Heart Control-20@3x.png", + "scale": "3x" + }, + { + "size" : "20x20", + "idiom": "ipad", + "filename" : "Heart Control-20.png", + "scale": "1x" }, { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "size" : "20x20", + "idiom": "ipad", + "filename" : "Heart Control-20@2x.png", + "scale": "2x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", + "filename" : "Heart Control-29@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", + "filename" : "Heart Control-29@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", + "filename" : "Heart Control-40@2x.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", + "filename" : "Heart Control-40@3x.png", "scale" : "3x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", + "filename" : "Heart Control-60@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", + "filename" : "Heart Control-60@3x.png", "scale" : "3x" }, { + "size" : "29x29", "idiom" : "ipad", - "size" : "20x20", + "filename" : "Heart Control-29.png", "scale" : "1x" }, { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "ipad", "size" : "29x29", - "scale" : "1x" - }, - { "idiom" : "ipad", - "size" : "29x29", + "filename" : "Heart Control-29@2x.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", + "filename" : "Heart Control-40.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "40x40", + "idiom" : "ipad", + "filename" : "Heart Control-40@2x.png", "scale" : "2x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", + "filename" : "Heart Control-76.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", + "filename" : "Heart Control-76@2x.png", "scale" : "2x" }, { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "idiom" : "car", - "size" : "60x60", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "car", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "24x24", - "idiom" : "watch", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "38mm" - }, - { - "size" : "27.5x27.5", - "idiom" : "watch", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "42mm" - }, - { - "size" : "29x29", - "idiom" : "watch", - "role" : "companionSettings", + "filename" : "Heart Control-83.5@2x.png", "scale" : "2x" }, { - "size" : "29x29", - "idiom" : "watch", - "filename" : "Icon-App-29x29@3x.png", - "role" : "companionSettings", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "watch", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "38mm" - }, - { - "size" : "44x44", - "idiom" : "watch", - "scale" : "2x", - "role" : "longLook", - "subtype" : "42mm" - }, - { - "size" : "86x86", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "38mm" - }, - { - "size" : "98x98", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "42mm" + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Heart Control-1024.png", + "scale" : "1x" } ], "info" : { "version" : 1, "author" : "xcode" } -} \ No newline at end of file +} diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-1024.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-1024.png new file mode 100644 index 0000000..116b53d Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-1024.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-20.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-20.png new file mode 100644 index 0000000..50f7591 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-20.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-20@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-20@2x.png new file mode 100644 index 0000000..a9cb110 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-20@2x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-20@3x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-20@3x.png new file mode 100644 index 0000000..e2fb200 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-20@3x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-29.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-29.png new file mode 100644 index 0000000..b998122 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-29.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-29@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-29@2x.png new file mode 100644 index 0000000..835f2d2 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-29@2x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-29@3x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-29@3x.png new file mode 100644 index 0000000..a3ff2bf Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-29@3x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-40.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-40.png new file mode 100644 index 0000000..a9cb110 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-40.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-40@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-40@2x.png new file mode 100644 index 0000000..ed56170 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-40@2x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-40@3x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-40@3x.png new file mode 100644 index 0000000..2b193e5 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-40@3x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-60@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-60@2x.png new file mode 100644 index 0000000..2b193e5 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-60@2x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-60@3x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-60@3x.png new file mode 100644 index 0000000..67e07c9 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-60@3x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-76.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-76.png new file mode 100644 index 0000000..e0c26f5 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-76.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-76@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-76@2x.png new file mode 100644 index 0000000..ae1c8c0 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-76@2x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-83.5@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-83.5@2x.png new file mode 100644 index 0000000..4c93cb5 Binary files /dev/null and b/Heart Control/Assets.xcassets/AppIcon.appiconset/Heart Control-83.5@2x.png differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 0a1e18e..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index 89f282a..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index 75eae03..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index aee5281..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index fc3e112..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index ac3d4be..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index ac3d4be..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index 1c889d4..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index 35cfcc0..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 90b81bd..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index 6f0c7cd..0000000 Binary files a/Heart Control/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/Heart Control/Assets.xcassets/Contents.json b/Heart Control/Assets.xcassets/Contents.json index da4a164..73c0059 100644 --- a/Heart Control/Assets.xcassets/Contents.json +++ b/Heart Control/Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Heart Control/Info.plist b/Heart Control/Info.plist index 1338f46..6dbe8aa 100644 --- a/Heart Control/Info.plist +++ b/Heart Control/Info.plist @@ -22,6 +22,8 @@ 1 LSRequiresIPhoneOS + NSHealthShareUsageDescription + Read your Heart Rate and present it on your Apple Watch. UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -35,7 +37,5 @@ UIInterfaceOrientationPortrait - NSHealthShareUsageDescription - Read your Heart Rate and present it on your Apple Watch.