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

Migrating to the SwiftUI life cycle #3

Merged
merged 32 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0264272
Update Sparkle (2.6.4)
tekezo Dec 7, 2024
bfc2daa
Use @AppStorage
tekezo Jan 1, 2025
d92b14a
Add SettingsAccess
tekezo Jan 1, 2025
5283d95
Remove TrueWidget/MainMenu.xib
tekezo Jan 1, 2025
9f4ac41
Remove SettingsWindowManager.swift
tekezo Jan 1, 2025
dfe7e2c
Remove MenuController.swift
tekezo Jan 1, 2025
f713ea5
Set single scale to menu
tekezo Jan 1, 2025
1998861
Update menu icon
tekezo Jan 1, 2025
dd00f12
Remove showMenu from UserSettings.swift
tekezo Jan 1, 2025
5833de0
Switch to using TabView
tekezo Jan 2, 2025
8c48d13
Set width
tekezo Jan 2, 2025
14eca2b
Adjust SettingsMainView layout
tekezo Jan 2, 2025
0fdcffb
Adjust Settings tabs layout
tekezo Jan 2, 2025
aaa7b07
Call initializeTimeZoneTimeSettings in init
tekezo Jan 2, 2025
a0f8e91
Remove unused codes
tekezo Jan 2, 2025
7adeba4
MainView.swift -> ContentView.swift
tekezo Jan 2, 2025
dd354e3
Add Notifications.swift
tekezo Jan 2, 2025
99031e8
AppDelegate.swift -> TrueWidgetApp.swift
tekezo Jan 2, 2025
dd2a6eb
Use Window instead of WindowGroup
tekezo Jan 2, 2025
6d8481a
Minor behavior improvements
tekezo Jan 3, 2025
c17f51b
Minor behavior improvements
tekezo Jan 3, 2025
08bbe40
Remove UserSettings.shared
tekezo Jan 3, 2025
fd5f544
windowDidResize -> GeometryReader
tekezo Jan 3, 2025
133c9db
Remove Xcode.shared
tekezo Jan 3, 2025
dc511b2
Remove UserDefaults-propertyWrapper.swift
tekezo Jan 3, 2025
bebfda7
Remove unused @Environment
tekezo Jan 3, 2025
ca9ee96
Fix TimeZonePickerView
tekezo Jan 3, 2025
5bfb9a2
Remove blank line
tekezo Jan 4, 2025
f8802c3
WindowBehaviorManager.swift -> WindowPositionManager.swift
tekezo Jan 4, 2025
e244a2b
Config window in onAppear
tekezo Jan 4, 2025
03212b9
Update WidgetSource.Time interval
tekezo Jan 4, 2025
4a4ec91
Update ci.yml (macos-14 -> macos-15)
tekezo Jan 4, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ on:

jobs:
build:
runs-on: macos-14
runs-on: macos-15

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: recursive
Expand Down
2 changes: 0 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ codesign:
bash ../scripts/codesign.sh build/Release/TrueWidget.app/Contents/Frameworks/Sparkle.framework/Versions/B/Autoupdate
bash ../scripts/codesign.sh build/Release/TrueWidget.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app
bash ../scripts/codesign.sh build/Release/TrueWidget.app/Contents/Frameworks/Sparkle.framework
# libswift_Concurrency.dylib
bash ../scripts/codesign.sh build/Release/TrueWidget.app/Contents/Frameworks/libswift_Concurrency.dylib
# TrueWidget
bash ../scripts/codesign.sh build/Release/TrueWidget.app $(CURDIR)/TrueWidget/TrueWidget.entitlements

Expand Down
13 changes: 2 additions & 11 deletions src/TrueWidget/Assets.xcassets/menu.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
{
"images" : [
{
"filename" : "truewidget-menu.pdf",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
"filename" : "menu.svg",
"idiom" : "universal"
}
],
"info" : {
Expand Down
9 changes: 9 additions & 0 deletions src/TrueWidget/Assets.xcassets/menu.imageset/menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
4 changes: 0 additions & 4 deletions src/TrueWidget/Info.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
<string>@VERSION@</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSSupportsAutomaticTermination</key>
<false/>
<key>NSSupportsSuddenTermination</key>
Expand Down
101 changes: 0 additions & 101 deletions src/TrueWidget/MainMenu.xib

This file was deleted.

227 changes: 0 additions & 227 deletions src/TrueWidget/swift/AppDelegate.swift

This file was deleted.

Loading