Skip to content
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.

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

Xcode Updates #199

Merged
merged 10 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 2 additions & 8 deletions .github/workflows/xcode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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=
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,6 @@
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
},
{
"idiom" : "mac",
"size" : "1024x1024"
}
],
"info" : {
Expand Down
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions iOS (App)/KaBlockApp.swift → App/KaBlockApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
File renamed without changes.
1 change: 1 addition & 0 deletions Shared (App)/Logo.swift → App/Logo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ struct Logo: View {

Circle()
.stroke(stateColor, lineWidth: 0.1)
.position()

Circle()
.foregroundColor(Color.white)
Expand Down
File renamed without changes.
File renamed without changes.
390 changes: 46 additions & 344 deletions Ka-Block.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

58 changes: 0 additions & 58 deletions macOS (App)/KaBlockApp.swift

This file was deleted.

2 changes: 0 additions & 2 deletions macOS (App)/Localizable.strings

This file was deleted.

Loading