diff --git a/Loop/Assets.xcassets/Window Actions/Contents.json b/Loop/Assets.xcassets/Window Actions/Contents.json deleted file mode 100644 index 73c00596..00000000 --- a/Loop/Assets.xcassets/Window Actions/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Loop/Assets.xcassets/Window Actions/custom.macwindow.trianglebadge.exclamationmark.symbolset/Contents.json b/Loop/Assets.xcassets/Window Actions/custom.macwindow.trianglebadge.exclamationmark.symbolset/Contents.json deleted file mode 100644 index a2506201..00000000 --- a/Loop/Assets.xcassets/Window Actions/custom.macwindow.trianglebadge.exclamationmark.symbolset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - }, - "symbols" : [ - { - "filename" : "custom.macwindow.trianglebadge.exclamationmark.svg", - "idiom" : "universal" - } - ] -} diff --git a/Loop/Assets.xcassets/Window Actions/custom.macwindow.trianglebadge.exclamationmark.symbolset/custom.macwindow.trianglebadge.exclamationmark.svg b/Loop/Assets.xcassets/Window Actions/custom.macwindow.trianglebadge.exclamationmark.symbolset/custom.macwindow.trianglebadge.exclamationmark.svg deleted file mode 100644 index d059d1fb..00000000 --- a/Loop/Assets.xcassets/Window Actions/custom.macwindow.trianglebadge.exclamationmark.symbolset/custom.macwindow.trianglebadge.exclamationmark.svg +++ /dev/null @@ -1 +0,0 @@ -Weight/Scale VariationsUltralightThinLightRegularMediumSemiboldBoldHeavyBlackDesign VariationsSymbols are supported in up to nine weights and three scales.For optimal layout with text and other symbols, vertically alignsymbols with the adjacent text.MarginsLeading and trailing margins on the left and right side of each symbolcan be adjusted by modifying the x-location of the margin guidelines.Modifications are automatically applied proportionally to allscales and weights.ExportingSymbols should be outlined when exporting to ensure thedesign is preserved when submitting to Xcode.Template v.4.0Requires Xcode 14 or greaterGenerated fromTypeset at 100.0 pointsSmallMediumLarge \ No newline at end of file diff --git a/Loop/Assets.xcassets/Window Actions/custom.rectangle.slash.symbolset/Contents.json b/Loop/Assets.xcassets/Window Actions/custom.rectangle.slash.symbolset/Contents.json deleted file mode 100644 index 4adef998..00000000 --- a/Loop/Assets.xcassets/Window Actions/custom.rectangle.slash.symbolset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - }, - "symbols" : [ - { - "filename" : "custom.rectangle.slash.svg", - "idiom" : "universal" - } - ] -} diff --git a/Loop/Assets.xcassets/Window Actions/custom.rectangle.slash.symbolset/custom.rectangle.slash.svg b/Loop/Assets.xcassets/Window Actions/custom.rectangle.slash.symbolset/custom.rectangle.slash.svg deleted file mode 100644 index b4745b41..00000000 --- a/Loop/Assets.xcassets/Window Actions/custom.rectangle.slash.symbolset/custom.rectangle.slash.svg +++ /dev/null @@ -1 +0,0 @@ -Weight/Scale VariationsUltralightThinLightRegularMediumSemiboldBoldHeavyBlackDesign VariationsSymbols are supported in up to nine weights and three scales.For optimal layout with text and other symbols, vertically alignsymbols with the adjacent text.MarginsLeading and trailing margins on the left and right side of each symbolcan be adjusted by modifying the x-location of the margin guidelines.Modifications are automatically applied proportionally to allscales and weights.ExportingSymbols should be outlined when exporting to ensure thedesign is preserved when submitting to Xcode.Template v.4.0Requires Xcode 14 or greaterGenerated fromTypeset at 100.0 pointsSmallMediumLarge \ No newline at end of file diff --git a/Loop/Luminare/LuminareManager.swift b/Loop/Luminare/LuminareManager.swift index d6715a29..7a9cf5f0 100644 --- a/Loop/Luminare/LuminareManager.swift +++ b/Loop/Luminare/LuminareManager.swift @@ -12,7 +12,7 @@ import SwiftUI class LuminareManager { static let iconConfiguration = SettingsTab("Icon", Image(._18PxSquareSparkle), IconConfigurationView()) static let accentColorConfiguration = SettingsTab("Accent Color", Image(._18PxPaintbrush), AccentColorConfigurationView()) - static let radialMenuConfiguration = SettingsTab("Radial Menu", Image("loop"), RadialMenuConfigurationView()) + static let radialMenuConfiguration = SettingsTab("Radial Menu", Image(.loop), RadialMenuConfigurationView()) static let previewConfiguration = SettingsTab("Preview", Image(._18PxSidebarRight2), PreviewConfigurationView()) static let behaviorConfiguration = SettingsTab("Behavior", Image(._18PxGear), BehaviorConfigurationView()) diff --git a/Loop/Managers/LoopManager.swift b/Loop/Managers/LoopManager.swift index 54a74cfe..7676d0fb 100644 --- a/Loop/Managers/LoopManager.swift +++ b/Loop/Managers/LoopManager.swift @@ -180,10 +180,6 @@ private extension LoopManager { // Icon stuff Defaults[.timesLooped] += 1 IconManager.checkIfUnlockedNewIcon() - } else { - if targetWindow == nil, isLoopActive { - NSSound.beep() - } } isLoopActive = false diff --git a/Loop/Radial Menu/RadialMenuView.swift b/Loop/Radial Menu/RadialMenuView.swift index ab6cafe4..6457ec66 100644 --- a/Loop/Radial Menu/RadialMenuView.swift +++ b/Loop/Radial Menu/RadialMenuView.swift @@ -131,7 +131,7 @@ struct RadialMenuView: View { Group { if window == nil, previewMode == false { - Image("custom.macwindow.trianglebadge.exclamationmark") + Image(systemName: "exclamationmark.triangle") } else if let image = currentAction.radialMenuImage { image } diff --git a/Loop/Window Management/WindowAction+Image.swift b/Loop/Window Management/WindowAction+Image.swift index 8e428b8d..816ddbeb 100644 --- a/Loop/Window Management/WindowAction+Image.swift +++ b/Loop/Window Management/WindowAction+Image.swift @@ -43,9 +43,9 @@ extension WindowAction { var radialMenuImage: Image? { switch direction { case .hide: - Image("custom.rectangle.slash") + Image(systemName: "eye.slash") case .minimize: - Image("custom.arrow.down.right.and.arrow.up.left.rectangle") + Image(systemName: "arrow.down.right.and.arrow.up.left") default: nil }