Skip to content

Commit 6984593

Browse files
authored
πŸ’„ Luminare UI updates (#918)
* ✨ General updates * ✨ More updates * ✨ Fuzzy search * ✨ Use Luminare button styles in direction picker buttons * ✨ Fix corner radii * ✨ Sync wallpaper confirmation * πŸ”₯ Remove Nucleo icons * ✨ Update to use latest Luminare * ✨ Use Swift Regex in Updater * ⬆️ Set Luminare branch to main * 🐞 Fix initial update check * 🌐 Restore "Unstashed Size" localization key * πŸ’„ Tune font weight & shadows * 🐞 Don't show "Prioritize selected window’s corner radius" on pre-Tahoe machines * 🐞 Prevent initial update check from includeDevelopmentVersions AsyncStream * ⚑ Wait for update check to finish when awaiting update fetch * πŸ’„ Change `sparkles.2` to `sparkles`
1 parent 7e82a85 commit 6984593

File tree

88 files changed

+561
-921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+561
-921
lines changed

β€ŽLoop.xcodeproj/project.pbxprojβ€Ž

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2A28B6292EE5050C00A1E26B /* Defaults in Frameworks */ = {isa = PBXBuildFile; productRef = 2A28B6282EE5050C00A1E26B /* Defaults */; };
11-
2A28B62C2EE5057C00A1E26B /* Luminare in Frameworks */ = {isa = PBXBuildFile; productRef = 2A28B62B2EE5057C00A1E26B /* Luminare */; };
10+
2A58E3922EE78922008D10DB /* Luminare in Frameworks */ = {isa = PBXBuildFile; productRef = 2A58E3912EE78922008D10DB /* Luminare */; };
11+
2AB841972EE794D600B15467 /* Defaults in Frameworks */ = {isa = PBXBuildFile; productRef = A8DCC97A2980D5F500D41065 /* Defaults */; };
1212
A883642F298B7288005D6C19 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A883642E298B7288005D6C19 /* ServiceManagement.framework */; };
1313
F06D768A2DFF7A77007EEDA9 /* SkyLight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F06D76892DFF7A77007EEDA9 /* SkyLight.framework */; };
1414
/* End PBXBuildFile section */
@@ -44,9 +44,9 @@
4444
isa = PBXFrameworksBuildPhase;
4545
buildActionMask = 2147483647;
4646
files = (
47-
2A28B6292EE5050C00A1E26B /* Defaults in Frameworks */,
48-
2A28B62C2EE5057C00A1E26B /* Luminare in Frameworks */,
47+
2AB841972EE794D600B15467 /* Defaults in Frameworks */,
4948
F06D768A2DFF7A77007EEDA9 /* SkyLight.framework in Frameworks */,
49+
2A58E3922EE78922008D10DB /* Luminare in Frameworks */,
5050
A883642F298B7288005D6C19 /* ServiceManagement.framework in Frameworks */,
5151
);
5252
runOnlyForDeploymentPostprocessing = 0;
@@ -106,8 +106,8 @@
106106
);
107107
name = Loop;
108108
packageProductDependencies = (
109-
2A28B6282EE5050C00A1E26B /* Defaults */,
110-
2A28B62B2EE5057C00A1E26B /* Luminare */,
109+
A8DCC97A2980D5F500D41065 /* Defaults */,
110+
2A58E3912EE78922008D10DB /* Luminare */,
111111
);
112112
productName = WindowManager;
113113
productReference = A8E59C35297F5E9A0064D4BA /* Loop.app */;
@@ -149,8 +149,8 @@
149149
);
150150
mainGroup = A8E59C2C297F5E9A0064D4BA;
151151
packageReferences = (
152-
2A28B6272EE5050C00A1E26B /* XCRemoteSwiftPackageReference "Defaults" */,
153-
2A28B62A2EE5057C00A1E26B /* XCRemoteSwiftPackageReference "luminare" */,
152+
A8DCC9792980D5F500D41065 /* XCRemoteSwiftPackageReference "Defaults" */,
153+
2A58E3902EE78922008D10DB /* XCRemoteSwiftPackageReference "luminare" */,
154154
);
155155
productRefGroup = A8E59C36297F5E9A0064D4BA /* Products */;
156156
projectDirPath = "";
@@ -433,34 +433,34 @@
433433
/* End XCConfigurationList section */
434434

435435
/* Begin XCRemoteSwiftPackageReference section */
436-
2A28B6272EE5050C00A1E26B /* XCRemoteSwiftPackageReference "Defaults" */ = {
436+
2A58E3902EE78922008D10DB /* XCRemoteSwiftPackageReference "luminare" */ = {
437437
isa = XCRemoteSwiftPackageReference;
438-
repositoryURL = "https://github.com/sindresorhus/Defaults";
438+
repositoryURL = "https://github.com/mrkai77/luminare";
439439
requirement = {
440-
kind = upToNextMajorVersion;
441-
minimumVersion = 9.0.0;
440+
branch = main;
441+
kind = branch;
442442
};
443443
};
444-
2A28B62A2EE5057C00A1E26B /* XCRemoteSwiftPackageReference "luminare" */ = {
444+
A8DCC9792980D5F500D41065 /* XCRemoteSwiftPackageReference "Defaults" */ = {
445445
isa = XCRemoteSwiftPackageReference;
446-
repositoryURL = "https://github.com/mrkai77/luminare";
446+
repositoryURL = "https://github.com/sindresorhus/Defaults";
447447
requirement = {
448-
kind = upToNextMinorVersion;
449-
minimumVersion = 0.2.0;
448+
kind = upToNextMajorVersion;
449+
minimumVersion = 9.0.0;
450450
};
451451
};
452452
/* End XCRemoteSwiftPackageReference section */
453453

454454
/* Begin XCSwiftPackageProductDependency section */
455-
2A28B6282EE5050C00A1E26B /* Defaults */ = {
455+
2A58E3912EE78922008D10DB /* Luminare */ = {
456456
isa = XCSwiftPackageProductDependency;
457-
package = 2A28B6272EE5050C00A1E26B /* XCRemoteSwiftPackageReference "Defaults" */;
458-
productName = Defaults;
457+
package = 2A58E3902EE78922008D10DB /* XCRemoteSwiftPackageReference "luminare" */;
458+
productName = Luminare;
459459
};
460-
2A28B62B2EE5057C00A1E26B /* Luminare */ = {
460+
A8DCC97A2980D5F500D41065 /* Defaults */ = {
461461
isa = XCSwiftPackageProductDependency;
462-
package = 2A28B62A2EE5057C00A1E26B /* XCRemoteSwiftPackageReference "luminare" */;
463-
productName = Luminare;
462+
package = A8DCC9792980D5F500D41065 /* XCRemoteSwiftPackageReference "Defaults" */;
463+
productName = Defaults;
464464
};
465465
/* End XCSwiftPackageProductDependency section */
466466
};

β€ŽLoop/Accent Color/AccentColorOption.swiftβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ enum AccentColorOption: Int, Codable, Defaults.Serializable, CaseIterable {
1616
var image: Image {
1717
switch self {
1818
case .system: Image(systemName: "apple.logo")
19-
case .wallpaper: Image(.imageDepth)
20-
case .custom: Image(.colorPalette)
19+
case .wallpaper: Image(systemName: "photo")
20+
case .custom: Image(systemName: "eyedropper.halffull")
2121
}
2222
}
2323

β€ŽLoop/App/AppDelegate.swiftβ€Ž

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
2929
if !launchedAsLoginItem {
3030
SettingsWindowManager.shared.show()
3131
} else {
32-
// Dock icon is usually handled by LuminareManager, but in this case, it is manually set
33-
if !Defaults[.showDockIcon] {
34-
NSApp.setActivationPolicy(.accessory)
35-
}
32+
// Closing also hides the dock icon if needed.
33+
SettingsWindowManager.shared.close()
3634
}
3735

3836
DataPatcher.run()
@@ -43,8 +41,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
4341

4442
Task {
4543
// Wait to let the app settle and to prevent overwhelming the user
46-
try? await Task.sleep(for: .seconds(2))
44+
try? await Task.sleep(for: .seconds(5))
45+
4746
await Updater.shared.fetchLatestInfo()
47+
if Updater.shared.updateState == .available {
48+
await Updater.shared.showUpdateWindow()
49+
}
4850
}
4951

5052
UNUserNotificationCenter.current().delegate = self

β€ŽLoop/Assets.xcassets/Nucleo/Contents.jsonβ€Ž

Lines changed: 0 additions & 6 deletions
This file was deleted.
Binary file not shown.

β€ŽLoop/Assets.xcassets/Nucleo/badge-check-2.imageset/Contents.jsonβ€Ž

Lines changed: 0 additions & 16 deletions
This file was deleted.
Binary file not shown.

β€ŽLoop/Assets.xcassets/Nucleo/chevron-right.imageset/Contents.jsonβ€Ž

Lines changed: 0 additions & 16 deletions
This file was deleted.
Binary file not shown.

β€ŽLoop/Assets.xcassets/Nucleo/clipboard.imageset/Contents.jsonβ€Ž

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
Β (0)