Skip to content

Updates to Swift 5 and Watch 7.2 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LittleTanner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updates to Swift 5 and Watch 7.2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 49 additions & 32 deletions Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,92 @@
{
"images" : [
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "24x24",
"filename" : "[email protected]",
"idiom" : "watch",
"filename" : "[email protected]",
"scale" : "2x",
"role" : "notificationCenter",
"scale" : "2x",
"size" : "24x24",
"subtype" : "38mm"
},
{
"size" : "27.5x27.5",
"filename" : "[email protected]",
"idiom" : "watch",
"filename" : "[email protected]",
"scale" : "2x",
"role" : "notificationCenter",
"scale" : "2x",
"size" : "27.5x27.5",
"subtype" : "42mm"
},
{
"size" : "29x29",
"filename" : "[email protected]",
"idiom" : "watch",
"role" : "companionSettings",
"scale" : "2x"
"scale" : "2x",
"size" : "29x29"
},
{
"size" : "29x29",
"filename" : "[email protected]",
"idiom" : "watch",
"filename" : "[email protected]",
"role" : "companionSettings",
"scale" : "3x"
"scale" : "3x",
"size" : "29x29"
},
{
"size" : "40x40",
"filename" : "[email protected]",
"idiom" : "watch",
"filename" : "[email protected]",
"scale" : "2x",
"role" : "appLauncher",
"scale" : "2x",
"size" : "40x40",
"subtype" : "38mm"
},
{
"size" : "44x44",
"filename" : "[email protected]",
"idiom" : "watch",
"filename" : "[email protected]",
"role" : "appLauncher",
"scale" : "2x",
"role" : "longLook",
"subtype" : "42mm"
"size" : "44x44",
"subtype" : "40mm"
},
{
"size" : "86x86",
"filename" : "[email protected]",
"idiom" : "watch",
"filename" : "[email protected]",
"role" : "appLauncher",
"scale" : "2x",
"size" : "50x50",
"subtype" : "44mm"
},
{
"filename" : "[email protected]",
"idiom" : "watch",
"role" : "quickLook",
"scale" : "2x",
"size" : "86x86",
"subtype" : "38mm"
},
{
"size" : "98x98",
"filename" : "[email protected]",
"idiom" : "watch",
"filename" : "[email protected]",
"scale" : "2x",
"role" : "quickLook",
"scale" : "2x",
"size" : "98x98",
"subtype" : "42mm"
},
{
"filename" : "[email protected]",
"idiom" : "watch",
"role" : "quickLook",
"scale" : "2x",
"size" : "108x108",
"subtype" : "44mm"
},
{
"filename" : "[email protected]",
"idiom" : "watch-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Binary file removed Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Heart Control WatchKit App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions Heart Control WatchKit App/Assets.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
2 changes: 1 addition & 1 deletion Heart Control WatchKit App/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>WKCompanionAppBundleIdentifier</key>
<string>com.thomaspaulmann.Heart-Control</string>
<string>com.kevintanner.Heart-Control</string>
Copy link
Author

@LittleTanner LittleTanner Apr 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know how to test the app on my device without changing this to my name. I'm newish to iOS development so any insight on how to handle this would be appreciated.

<key>WKWatchKitApp</key>
<true/>
</dict>
Expand Down
16 changes: 13 additions & 3 deletions ...it Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
40 changes: 35 additions & 5 deletions Heart Control WatchKit Extension/Assets.xcassets/Complication.complicationset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
}
28 changes: 28 additions & 0 deletions ...Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
18 changes: 18 additions & 0 deletions ...tension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"images" : [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
18 changes: 18 additions & 0 deletions ...sion/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"images" : [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
18 changes: 18 additions & 0 deletions ...ension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"images" : [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
28 changes: 28 additions & 0 deletions ...n/Assets.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
18 changes: 18 additions & 0 deletions ...ts.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"images" : [
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
16 changes: 13 additions & 3 deletions ...Kit Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Loading