End of Step 4: Move app shared stuff to AppShared

2 years ago · 4ddea12805
parent fb4d02d577
commit 4ddea12805
27 changed files with 224 additions and 75 deletions
--- a/JustOneThing/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/JustOneThing/Assets.xcassets/AccentColor.colorset/Contents.json
--- a/JustOneThing/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/JustOneThing/Assets.xcassets/AppIcon.appiconset/Contents.json
@ -54,6 +54,11 @@
      "idiom" : "mac",
      "scale" : "2x",
      "size" : "512x512"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
    }
  ],
  "info" : {
--- a/Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
+++ b/Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
@ -1,7 +1,7 @@
 {
-  "colors" : [
+  "images" : [
    {
-      "idiom" : "universal"
+      "idiom" : "tv"
    }
  ],
  "info" : {
--- a/Store.imagestack/Back.imagestacklayer/Contents.json
+++ b/Store.imagestack/Back.imagestacklayer/Contents.json
--- a/AppShared/Assets.xcassets/Brand
+++ b/AppShared/Assets.xcassets/Brand
@ -0,0 +1,17 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "layers" : [
+    {
+      "filename" : "Front.imagestacklayer"
+    },
+    {
+      "filename" : "Middle.imagestacklayer"
+    },
+    {
+      "filename" : "Back.imagestacklayer"
+    }
+  ]
+}
--- a/Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
+++ b/Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Store.imagestack/Front.imagestacklayer/Contents.json
+++ b/Store.imagestack/Front.imagestacklayer/Contents.json
--- a/Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
+++ b/Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Store.imagestack/Middle.imagestacklayer/Contents.json
+++ b/Store.imagestack/Middle.imagestacklayer/Contents.json
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
+++ b/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
+  }
+}
--- a/Icon.imagestack/Back.imagestacklayer/Contents.json
+++ b/Icon.imagestack/Back.imagestacklayer/Contents.json
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/AppShared/Assets.xcassets/Brand
+++ b/AppShared/Assets.xcassets/Brand
@ -0,0 +1,17 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "layers" : [
+    {
+      "filename" : "Front.imagestacklayer"
+    },
+    {
+      "filename" : "Middle.imagestacklayer"
+    },
+    {
+      "filename" : "Back.imagestacklayer"
+    }
+  ]
+}
--- a/Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
+++ b/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
+  }
+}
--- a/Icon.imagestack/Front.imagestacklayer/Contents.json
+++ b/Icon.imagestack/Front.imagestacklayer/Contents.json
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
+++ b/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
+  }
+}
--- a/Icon.imagestack/Middle.imagestacklayer/Contents.json
+++ b/Icon.imagestack/Middle.imagestacklayer/Contents.json
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Assets.brandassets/Contents.json
+++ b/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
+  }
+}
--- a/AppShared/Assets.xcassets/Brand
+++ b/AppShared/Assets.xcassets/Brand
@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/AppShared/Assets.xcassets/Brand
+++ b/AppShared/Assets.xcassets/Brand
@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/AppShared/Assets.xcassets/Contents.json
+++ b/AppShared/Assets.xcassets/Contents.json
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/JustOneThing/ContentView.swift
+++ b/JustOneThing/ContentView.swift
--- a/JustOneThing/JustOneThingApp.swift
+++ b/JustOneThing/JustOneThingApp.swift
--- 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 = "<group>"; };
-		5431ED712A2A77C900515680 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
-		5431ED732A2A77CA00515680 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		5431ED762A2A77CA00515680 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		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 = "<group>"; };
@ -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 = "<group>";
+		};
 		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;
 		};
--- a/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/JustOneThing.xcodeproj/xcuserdata/acf.xcuserdatad/xcschemes/xcschememanagement.plist
@ -7,12 +7,12 @@
 		<key>JustOneThing.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>JustOneThingWatch Watch App.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 </dict>
--- a/App/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/App/Assets.xcassets/AppIcon.appiconset/Contents.json
@ -1,13 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
--- a/App/ContentView.swift
+++ b/App/ContentView.swift
@ -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()
-    }
-}
--- a/App/JustOneThingWatchApp.swift
+++ b/App/JustOneThingWatchApp.swift
@ -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()
-        }
-    }
-}