From 4ddea128053196fac847aa85bf64ff981519c785 Mon Sep 17 00:00:00 2001 From: Alan Francis Date: Fri, 2 Jun 2023 21:45:07 +0100 Subject: [PATCH] End of Step 4: Move app shared stuff to AppShared --- .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 5 +++ .../Content.imageset}/Contents.json | 4 +-- .../Back.imagestacklayer}/Contents.json | 0 .../Contents.json | 17 ++++++++++ .../Content.imageset/Contents.json | 11 +++++++ .../Front.imagestacklayer}/Contents.json | 0 .../Content.imageset/Contents.json | 11 +++++++ .../Middle.imagestacklayer/Contents.json | 6 ++++ .../Content.imageset/Contents.json | 16 ++++++++++ .../Back.imagestacklayer/Contents.json | 6 ++++ .../App Icon.imagestack/Contents.json | 17 ++++++++++ .../Content.imageset/Contents.json | 16 ++++++++++ .../Front.imagestacklayer/Contents.json | 6 ++++ .../Content.imageset/Contents.json | 16 ++++++++++ .../Middle.imagestacklayer/Contents.json | 6 ++++ .../Brand Assets.brandassets/Contents.json | 32 +++++++++++++++++++ .../Contents.json | 16 ++++++++++ .../Top Shelf Image.imageset/Contents.json | 16 ++++++++++ AppShared/Assets.xcassets/Contents.json | 6 ++++ {JustOneThing => AppShared}/ContentView.swift | 0 .../JustOneThingApp.swift | 0 JustOneThing.xcodeproj/project.pbxproj | 32 ++++++++++--------- .../xcschemes/xcschememanagement.plist | 4 +-- .../AppIcon.appiconset/Contents.json | 13 -------- JustOneThingWatch Watch App/ContentView.swift | 26 --------------- .../JustOneThingWatchApp.swift | 17 ---------- 27 files changed, 224 insertions(+), 75 deletions(-) rename {JustOneThing => AppShared}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename {JustOneThing => AppShared}/Assets.xcassets/AppIcon.appiconset/Contents.json (90%) rename {JustOneThingWatch Watch App/Assets.xcassets/AccentColor.colorset => AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset}/Contents.json (65%) rename {JustOneThing/Assets.xcassets => AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer}/Contents.json (100%) create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json rename {JustOneThingWatch Watch App/Assets.xcassets => AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer}/Contents.json (100%) create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json create mode 100644 AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json create mode 100644 AppShared/Assets.xcassets/Contents.json rename {JustOneThing => AppShared}/ContentView.swift (100%) rename {JustOneThing => AppShared}/JustOneThingApp.swift (100%) delete mode 100644 JustOneThingWatch Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 JustOneThingWatch Watch App/ContentView.swift delete mode 100644 JustOneThingWatch Watch App/JustOneThingWatchApp.swift diff --git a/JustOneThing/Assets.xcassets/AccentColor.colorset/Contents.json b/AppShared/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from JustOneThing/Assets.xcassets/AccentColor.colorset/Contents.json rename to AppShared/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/JustOneThing/Assets.xcassets/AppIcon.appiconset/Contents.json b/AppShared/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 90% rename from JustOneThing/Assets.xcassets/AppIcon.appiconset/Contents.json rename to AppShared/Assets.xcassets/AppIcon.appiconset/Contents.json index 532cd72..1d63b70 100644 --- a/JustOneThing/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/AppShared/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -54,6 +54,11 @@ "idiom" : "mac", "scale" : "2x", "size" : "512x512" + }, + { + "idiom" : "universal", + "platform" : "watchos", + "size" : "1024x1024" } ], "info" : { diff --git a/JustOneThingWatch Watch App/Assets.xcassets/AccentColor.colorset/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json similarity index 65% rename from JustOneThingWatch Watch App/Assets.xcassets/AccentColor.colorset/Contents.json rename to AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json index eb87897..2e00335 100644 --- a/JustOneThingWatch Watch App/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json @@ -1,7 +1,7 @@ { - "colors" : [ + "images" : [ { - "idiom" : "universal" + "idiom" : "tv" } ], "info" : { diff --git a/JustOneThing/Assets.xcassets/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json similarity index 100% rename from JustOneThing/Assets.xcassets/Contents.json rename to AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Contents.json new file mode 100644 index 0000000..de59d88 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Contents.json @@ -0,0 +1,17 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "layers" : [ + { + "filename" : "Front.imagestacklayer" + }, + { + "filename" : "Middle.imagestacklayer" + }, + { + "filename" : "Back.imagestacklayer" + } + ] +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..2e00335 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,11 @@ +{ + "images" : [ + { + "idiom" : "tv" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/JustOneThingWatch Watch App/Assets.xcassets/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json similarity index 100% rename from JustOneThingWatch Watch App/Assets.xcassets/Contents.json rename to AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Front.imagestacklayer/Contents.json diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..2e00335 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,11 @@ +{ + "images" : [ + { + "idiom" : "tv" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..795cce1 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + }, + { + "idiom" : "tv", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Contents.json new file mode 100644 index 0000000..de59d88 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Contents.json @@ -0,0 +1,17 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "layers" : [ + { + "filename" : "Front.imagestacklayer" + }, + { + "filename" : "Middle.imagestacklayer" + }, + { + "filename" : "Back.imagestacklayer" + } + ] +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..795cce1 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + }, + { + "idiom" : "tv", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json new file mode 100644 index 0000000..795cce1 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + }, + { + "idiom" : "tv", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/Contents.json new file mode 100644 index 0000000..f47ba43 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/Contents.json @@ -0,0 +1,32 @@ +{ + "assets" : [ + { + "filename" : "App Icon - App Store.imagestack", + "idiom" : "tv", + "role" : "primary-app-icon", + "size" : "1280x768" + }, + { + "filename" : "App Icon.imagestack", + "idiom" : "tv", + "role" : "primary-app-icon", + "size" : "400x240" + }, + { + "filename" : "Top Shelf Image Wide.imageset", + "idiom" : "tv", + "role" : "top-shelf-image-wide", + "size" : "2320x720" + }, + { + "filename" : "Top Shelf Image.imageset", + "idiom" : "tv", + "role" : "top-shelf-image", + "size" : "1920x720" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json new file mode 100644 index 0000000..795cce1 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + }, + { + "idiom" : "tv", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json b/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json new file mode 100644 index 0000000..795cce1 --- /dev/null +++ b/AppShared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "idiom" : "tv", + "scale" : "1x" + }, + { + "idiom" : "tv", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AppShared/Assets.xcassets/Contents.json b/AppShared/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/AppShared/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/JustOneThing/ContentView.swift b/AppShared/ContentView.swift similarity index 100% rename from JustOneThing/ContentView.swift rename to AppShared/ContentView.swift diff --git a/JustOneThing/JustOneThingApp.swift b/AppShared/JustOneThingApp.swift similarity index 100% rename from JustOneThing/JustOneThingApp.swift rename to AppShared/JustOneThingApp.swift diff --git a/JustOneThing.xcodeproj/project.pbxproj b/JustOneThing.xcodeproj/project.pbxproj index 81ffc2d..0981483 100644 --- a/JustOneThing.xcodeproj/project.pbxproj +++ b/JustOneThing.xcodeproj/project.pbxproj @@ -7,9 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 5431ED702A2A77C900515680 /* JustOneThingWatchApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5431ED6F2A2A77C900515680 /* JustOneThingWatchApp.swift */; }; - 5431ED722A2A77C900515680 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5431ED712A2A77C900515680 /* ContentView.swift */; }; - 5431ED742A2A77CA00515680 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5431ED732A2A77CA00515680 /* Assets.xcassets */; }; + 5407E5022A2A8AE200EF00B8 /* JustOneThingApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5483903A2A2A773900BF5624 /* JustOneThingApp.swift */; }; + 5407E5032A2A8AE700EF00B8 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5483903C2A2A773900BF5624 /* ContentView.swift */; }; + 5407E5042A2A8AEA00EF00B8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5483903E2A2A773A00BF5624 /* Assets.xcassets */; }; 5431ED772A2A77CA00515680 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5431ED762A2A77CA00515680 /* Preview Assets.xcassets */; }; 5431ED7A2A2A77CA00515680 /* JustOneThingWatch Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 5431ED6D2A2A77C900515680 /* JustOneThingWatch Watch App.app */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 5483903B2A2A773900BF5624 /* JustOneThingApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5483903A2A2A773900BF5624 /* JustOneThingApp.swift */; }; @@ -44,9 +44,6 @@ /* Begin PBXFileReference section */ 5431ED6D2A2A77C900515680 /* JustOneThingWatch Watch App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "JustOneThingWatch Watch App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5431ED6F2A2A77C900515680 /* JustOneThingWatchApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JustOneThingWatchApp.swift; sourceTree = ""; }; - 5431ED712A2A77C900515680 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; - 5431ED732A2A77CA00515680 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 5431ED762A2A77CA00515680 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 548390372A2A773900BF5624 /* JustOneThing.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JustOneThing.app; sourceTree = BUILT_PRODUCTS_DIR; }; 5483903A2A2A773900BF5624 /* JustOneThingApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JustOneThingApp.swift; sourceTree = ""; }; @@ -74,12 +71,19 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 5407E5012A2A8A5100EF00B8 /* AppShared */ = { + isa = PBXGroup; + children = ( + 5483903A2A2A773900BF5624 /* JustOneThingApp.swift */, + 5483903C2A2A773900BF5624 /* ContentView.swift */, + 5483903E2A2A773A00BF5624 /* Assets.xcassets */, + ); + path = AppShared; + sourceTree = ""; + }; 5431ED6E2A2A77C900515680 /* JustOneThingWatch Watch App */ = { isa = PBXGroup; children = ( - 5431ED6F2A2A77C900515680 /* JustOneThingWatchApp.swift */, - 5431ED712A2A77C900515680 /* ContentView.swift */, - 5431ED732A2A77CA00515680 /* Assets.xcassets */, 5431ED752A2A77CA00515680 /* Preview Content */, ); path = "JustOneThingWatch Watch App"; @@ -96,6 +100,7 @@ 5483902E2A2A773900BF5624 = { isa = PBXGroup; children = ( + 5407E5012A2A8A5100EF00B8 /* AppShared */, 548390392A2A773900BF5624 /* JustOneThing */, 5431ED6E2A2A77C900515680 /* JustOneThingWatch Watch App */, 548390382A2A773900BF5624 /* Products */, @@ -114,9 +119,6 @@ 548390392A2A773900BF5624 /* JustOneThing */ = { isa = PBXGroup; children = ( - 5483903A2A2A773900BF5624 /* JustOneThingApp.swift */, - 5483903C2A2A773900BF5624 /* ContentView.swift */, - 5483903E2A2A773A00BF5624 /* Assets.xcassets */, 548390402A2A773A00BF5624 /* JustOneThing.entitlements */, 548390412A2A773A00BF5624 /* Preview Content */, ); @@ -212,8 +214,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 5407E5042A2A8AEA00EF00B8 /* Assets.xcassets in Resources */, 5431ED772A2A77CA00515680 /* Preview Assets.xcassets in Resources */, - 5431ED742A2A77CA00515680 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -233,8 +235,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5431ED722A2A77C900515680 /* ContentView.swift in Sources */, - 5431ED702A2A77C900515680 /* JustOneThingWatchApp.swift in Sources */, + 5407E5032A2A8AE700EF00B8 /* ContentView.swift in Sources */, + 5407E5022A2A8AE200EF00B8 /* JustOneThingApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist b/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist index 7aa0b38..4cdb56e 100644 --- a/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,12 +7,12 @@ JustOneThing.xcscheme_^#shared#^_ orderHint - 0 + 1 JustOneThingWatch Watch App.xcscheme_^#shared#^_ orderHint - 1 + 0 diff --git a/JustOneThingWatch Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json b/JustOneThingWatch Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 49c81cd..0000000 --- a/JustOneThingWatch Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "platform" : "watchos", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/JustOneThingWatch Watch App/ContentView.swift b/JustOneThingWatch Watch App/ContentView.swift deleted file mode 100644 index 2f66962..0000000 --- a/JustOneThingWatch Watch App/ContentView.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// ContentView.swift -// JustOneThingWatch Watch App -// -// Created by Alan Francis on 02/06/2023. -// - -import SwiftUI - -struct ContentView: View { - var body: some View { - VStack { - Image(systemName: "globe") - .imageScale(.large) - .foregroundColor(.accentColor) - Text("Hello, world!") - } - .padding() - } -} - -struct ContentView_Previews: PreviewProvider { - static var previews: some View { - ContentView() - } -} diff --git a/JustOneThingWatch Watch App/JustOneThingWatchApp.swift b/JustOneThingWatch Watch App/JustOneThingWatchApp.swift deleted file mode 100644 index 60eb93e..0000000 --- a/JustOneThingWatch Watch App/JustOneThingWatchApp.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// JustOneThingWatchApp.swift -// JustOneThingWatch Watch App -// -// Created by Alan Francis on 02/06/2023. -// - -import SwiftUI - -@main -struct JustOneThingWatch_Watch_AppApp: App { - var body: some Scene { - WindowGroup { - ContentView() - } - } -}