Merge pull request #199 from josh/project-updates

Xcode Updates
dgraham · May 14, 2024 · ffc5934 · ffc5934
2 parents f2bfbf1 + 5c92571
commit ffc5934
Show file tree

Hide file tree

Showing 52 changed files with 57 additions and 417 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,4 +11,4 @@ jobs:
 
       - uses: actions/setup-node@v2
 
-      - run: npx prettier --check ".github/" "Shared (Extension)/blockerList.json"
+      - run: npx prettier --check ".github/" "Extension/blockerList.json"
diff --git a/.github/workflows/xcode.yml b/.github/workflows/xcode.yml
@@ -4,13 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    strategy:
-      matrix:
-        scheme:
-          # - "Ka-Block (iOS)"
-          - "Ka-Block (macOS)"
-
-    runs-on: macos-11.0
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v1
@@ -19,4 +13,4 @@ jobs:
         run: xcodebuild -version -sdk
 
       - name: Build
-        run: xcodebuild -project Ka-Block.xcodeproj -scheme "${{ matrix.scheme }}" build ENABLE_HARDENED_RUNTIME=NO CODE_SIGN_STYLE=Manual CODE_SIGN_IDENTITY=
+        run: xcodebuild -project Ka-Block.xcodeproj -scheme "Ka-Block" build ENABLE_HARDENED_RUNTIME=NO CODE_SIGN_STYLE=Manual CODE_SIGN_IDENTITY=
diff --git a/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
diff --git a/...assets/AppIcon.appiconset/1024x1024-1.png → ...assets/AppIcon.appiconset/1024x1024-1.png b/...assets/AppIcon.appiconset/1024x1024-1.png → ...assets/AppIcon.appiconset/1024x1024-1.png
diff --git a/...xcassets/AppIcon.appiconset/1024x1024.png → ...xcassets/AppIcon.appiconset/1024x1024.png b/...xcassets/AppIcon.appiconset/1024x1024.png → ...xcassets/AppIcon.appiconset/1024x1024.png
diff --git a/...s.xcassets/AppIcon.appiconset/128x128.png → ...s.xcassets/AppIcon.appiconset/128x128.png b/...s.xcassets/AppIcon.appiconset/128x128.png → ...s.xcassets/AppIcon.appiconset/128x128.png
diff --git a/...ets.xcassets/AppIcon.appiconset/16x16.png → ...ets.xcassets/AppIcon.appiconset/16x16.png b/...ets.xcassets/AppIcon.appiconset/16x16.png → ...ets.xcassets/AppIcon.appiconset/16x16.png
diff --git a/...xcassets/AppIcon.appiconset/256x256-1.png → ...xcassets/AppIcon.appiconset/256x256-1.png b/...xcassets/AppIcon.appiconset/256x256-1.png → ...xcassets/AppIcon.appiconset/256x256-1.png
diff --git a/...s.xcassets/AppIcon.appiconset/256x256.png → ...s.xcassets/AppIcon.appiconset/256x256.png b/...s.xcassets/AppIcon.appiconset/256x256.png → ...s.xcassets/AppIcon.appiconset/256x256.png
diff --git a/...s.xcassets/AppIcon.appiconset/29x29-1.png → ...s.xcassets/AppIcon.appiconset/29x29-1.png b/...s.xcassets/AppIcon.appiconset/29x29-1.png → ...s.xcassets/AppIcon.appiconset/29x29-1.png
diff --git a/...ets.xcassets/AppIcon.appiconset/29x29.png → ...ets.xcassets/AppIcon.appiconset/29x29.png b/...ets.xcassets/AppIcon.appiconset/29x29.png → ...ets.xcassets/AppIcon.appiconset/29x29.png
diff --git a/...cassets/AppIcon.appiconset/29x29@2x-1.png → ...cassets/AppIcon.appiconset/29x29@2x-1.png b/...cassets/AppIcon.appiconset/29x29@2x-1.png → ...cassets/AppIcon.appiconset/29x29@2x-1.png
diff --git a/....xcassets/AppIcon.appiconset/29x29@2x.png → ....xcassets/AppIcon.appiconset/29x29@2x.png b/....xcassets/AppIcon.appiconset/29x29@2x.png → ....xcassets/AppIcon.appiconset/29x29@2x.png
diff --git a/....xcassets/AppIcon.appiconset/29x29@3x.png → ....xcassets/AppIcon.appiconset/29x29@3x.png b/....xcassets/AppIcon.appiconset/29x29@3x.png → ....xcassets/AppIcon.appiconset/29x29@3x.png
diff --git a/...s.xcassets/AppIcon.appiconset/32x32-1.png → ...s.xcassets/AppIcon.appiconset/32x32-1.png b/...s.xcassets/AppIcon.appiconset/32x32-1.png → ...s.xcassets/AppIcon.appiconset/32x32-1.png
diff --git a/...ets.xcassets/AppIcon.appiconset/32x32.png → ...ets.xcassets/AppIcon.appiconset/32x32.png b/...ets.xcassets/AppIcon.appiconset/32x32.png → ...ets.xcassets/AppIcon.appiconset/32x32.png
diff --git a/...ets.xcassets/AppIcon.appiconset/40x40.png → ...ets.xcassets/AppIcon.appiconset/40x40.png b/...ets.xcassets/AppIcon.appiconset/40x40.png → ...ets.xcassets/AppIcon.appiconset/40x40.png
diff --git a/...cassets/AppIcon.appiconset/40x40@2x-1.png → ...cassets/AppIcon.appiconset/40x40@2x-1.png b/...cassets/AppIcon.appiconset/40x40@2x-1.png → ...cassets/AppIcon.appiconset/40x40@2x-1.png
diff --git a/....xcassets/AppIcon.appiconset/40x40@2x.png → ....xcassets/AppIcon.appiconset/40x40@2x.png b/....xcassets/AppIcon.appiconset/40x40@2x.png → ....xcassets/AppIcon.appiconset/40x40@2x.png
diff --git a/....xcassets/AppIcon.appiconset/40x40@3x.png → ....xcassets/AppIcon.appiconset/40x40@3x.png b/....xcassets/AppIcon.appiconset/40x40@3x.png → ....xcassets/AppIcon.appiconset/40x40@3x.png
diff --git a/...ets.xcassets/AppIcon.appiconset/50x50.png → ...ets.xcassets/AppIcon.appiconset/50x50.png b/...ets.xcassets/AppIcon.appiconset/50x50.png → ...ets.xcassets/AppIcon.appiconset/50x50.png
diff --git a/....xcassets/AppIcon.appiconset/50x50@2x.png → ....xcassets/AppIcon.appiconset/50x50@2x.png b/....xcassets/AppIcon.appiconset/50x50@2x.png → ....xcassets/AppIcon.appiconset/50x50@2x.png
diff --git a/...xcassets/AppIcon.appiconset/512x512-1.png → ...xcassets/AppIcon.appiconset/512x512-1.png b/...xcassets/AppIcon.appiconset/512x512-1.png → ...xcassets/AppIcon.appiconset/512x512-1.png
diff --git a/...s.xcassets/AppIcon.appiconset/512x512.png → ...s.xcassets/AppIcon.appiconset/512x512.png b/...s.xcassets/AppIcon.appiconset/512x512.png → ...s.xcassets/AppIcon.appiconset/512x512.png
diff --git a/...ets.xcassets/AppIcon.appiconset/57x57.png → ...ets.xcassets/AppIcon.appiconset/57x57.png b/...ets.xcassets/AppIcon.appiconset/57x57.png → ...ets.xcassets/AppIcon.appiconset/57x57.png
diff --git a/....xcassets/AppIcon.appiconset/57x57@2x.png → ....xcassets/AppIcon.appiconset/57x57@2x.png b/....xcassets/AppIcon.appiconset/57x57@2x.png → ....xcassets/AppIcon.appiconset/57x57@2x.png
diff --git a/....xcassets/AppIcon.appiconset/60x60@2x.png → ....xcassets/AppIcon.appiconset/60x60@2x.png b/....xcassets/AppIcon.appiconset/60x60@2x.png → ....xcassets/AppIcon.appiconset/60x60@2x.png
diff --git a/....xcassets/AppIcon.appiconset/60x60@3x.png → ....xcassets/AppIcon.appiconset/60x60@3x.png b/....xcassets/AppIcon.appiconset/60x60@3x.png → ....xcassets/AppIcon.appiconset/60x60@3x.png
diff --git a/...ets.xcassets/AppIcon.appiconset/64x64.png → ...ets.xcassets/AppIcon.appiconset/64x64.png b/...ets.xcassets/AppIcon.appiconset/64x64.png → ...ets.xcassets/AppIcon.appiconset/64x64.png
diff --git a/...ets.xcassets/AppIcon.appiconset/72x72.png → ...ets.xcassets/AppIcon.appiconset/72x72.png b/...ets.xcassets/AppIcon.appiconset/72x72.png → ...ets.xcassets/AppIcon.appiconset/72x72.png
diff --git a/....xcassets/AppIcon.appiconset/72x72@2x.png → ....xcassets/AppIcon.appiconset/72x72@2x.png b/....xcassets/AppIcon.appiconset/72x72@2x.png → ....xcassets/AppIcon.appiconset/72x72@2x.png
diff --git a/...ets.xcassets/AppIcon.appiconset/76x76.png → ...ets.xcassets/AppIcon.appiconset/76x76.png b/...ets.xcassets/AppIcon.appiconset/76x76.png → ...ets.xcassets/AppIcon.appiconset/76x76.png
diff --git a/....xcassets/AppIcon.appiconset/76x76@2x.png → ....xcassets/AppIcon.appiconset/76x76@2x.png b/....xcassets/AppIcon.appiconset/76x76@2x.png → ....xcassets/AppIcon.appiconset/76x76@2x.png
diff --git a/...ssets/AppIcon.appiconset/83.5x83.5@2x.png → ...ssets/AppIcon.appiconset/83.5x83.5@2x.png b/...ssets/AppIcon.appiconset/83.5x83.5@2x.png → ...ssets/AppIcon.appiconset/83.5x83.5@2x.png
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
@@ -205,10 +205,6 @@
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"
-    },
-    {
-      "idiom" : "mac",
-      "size" : "1024x1024"
     }
   ],
   "info" : {

diff --git a/Shared (App)/Assets.xcassets/Contents.json → App/Assets.xcassets/Contents.json b/Shared (App)/Assets.xcassets/Contents.json → App/Assets.xcassets/Contents.json
diff --git a/...xcassets/LargeIcon.imageset/Contents.json → ...xcassets/LargeIcon.imageset/Contents.json b/...xcassets/LargeIcon.imageset/Contents.json → ...xcassets/LargeIcon.imageset/Contents.json
diff --git a/.../LogoDisabledColor.colorset/Contents.json → .../LogoDisabledColor.colorset/Contents.json b/.../LogoDisabledColor.colorset/Contents.json → .../LogoDisabledColor.colorset/Contents.json
diff --git a/...s/LogoEnabledColor.colorset/Contents.json → ...s/LogoEnabledColor.colorset/Contents.json b/...s/LogoEnabledColor.colorset/Contents.json → ...s/LogoEnabledColor.colorset/Contents.json
diff --git a/...werBackgroundColor.colorset/Contents.json → ...werBackgroundColor.colorset/Contents.json b/...werBackgroundColor.colorset/Contents.json → ...werBackgroundColor.colorset/Contents.json
diff --git a/...perBackgroundColor.colorset/Contents.json → ...perBackgroundColor.colorset/Contents.json b/...perBackgroundColor.colorset/Contents.json → ...perBackgroundColor.colorset/Contents.json
diff --git a/Shared (App)/ContentBlockerState.swift → App/ContentBlockerState.swift b/Shared (App)/ContentBlockerState.swift → App/ContentBlockerState.swift
diff --git a/Shared (App)/HomeScreen.swift → App/HomeScreen.swift b/Shared (App)/HomeScreen.swift → App/HomeScreen.swift
diff --git a/iOS (App)/KaBlockApp.swift → App/KaBlockApp.swift b/iOS (App)/KaBlockApp.swift → App/KaBlockApp.swift
@@ -7,6 +7,13 @@ struct KaBlockApp: App {
     var body: some Scene {
         WindowGroup {
             HomeScreen(isEnabled: contentBlockerState.isEnabled)
+            #if os(macOS)
+                .frame(width: 375, height: 640)
+            #endif
         }
+        #if os(macOS)
+        .windowResizability(.contentSize)
+        .windowStyle(.hiddenTitleBar)
+        #endif
     }
 }
diff --git a/iOS (App)/Localizable.strings → App/Localizable.strings b/iOS (App)/Localizable.strings → App/Localizable.strings
diff --git a/Shared (App)/Logo.swift → App/Logo.swift b/Shared (App)/Logo.swift → App/Logo.swift
@@ -10,6 +10,7 @@ struct Logo: View {
 
                 Circle()
                     .stroke(stateColor, lineWidth: 0.1)
+                    .position()
 
                 Circle()
                     .foregroundColor(Color.white)

diff --git a/...nsion)/ContentBlockerRequestHandler.swift → Extension/ContentBlockerRequestHandler.swift b/...nsion)/ContentBlockerRequestHandler.swift → Extension/ContentBlockerRequestHandler.swift
diff --git a/Shared (Extension)/Info.plist → Extension/Info.plist b/Shared (Extension)/Info.plist → Extension/Info.plist
diff --git a/Shared (Extension)/blockerList.json → Extension/blockerList.json b/Shared (Extension)/blockerList.json → Extension/blockerList.json
diff --git a/Ka-Block.xcodeproj/project.pbxproj b/Ka-Block.xcodeproj/project.pbxproj
diff --git a/macOS (App)/KaBlockApp.swift b/macOS (App)/KaBlockApp.swift
diff --git a/macOS (App)/Localizable.strings b/macOS (App)/Localizable.strings