diff --git a/Shared/Constants.swift b/Shared/Constants.swift index 1656621..b07b54f 100644 --- a/Shared/Constants.swift +++ b/Shared/Constants.swift @@ -20,7 +20,6 @@ enum Constants { enum URLs { static let timeMachinePreferencesPlist = URL(fileURLWithPath: "/Library/Preferences/com.apple.TimeMachine.plist") - static let settingsFullDiskAccess: URL = URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_AllFiles")! static let timeMachineSystemSettings: URL = URL(string: "x-apple.systempreferences:com.apple.Time-Machine-Settings.extension")! static let authorURL: URL = URL(string: "https://lukaspistrol.com")! @@ -30,9 +29,7 @@ enum Constants { static let githubSponsor: URL = URL(string: "https://github.com/sponsors/lukepistrol")! static let buymeacoffee: URL = URL(string: "http://buymeacoffee.com/lukeeep")! - static var timeMachineApp: URL? { - URL(filePath: "/Applications/Time Machine.app") - } + static let timeMachineApp: URL? = URL(filePath: "/Applications/Time Machine.app") } enum Commands { diff --git a/TimeMachineStatus.xcodeproj/project.pbxproj b/TimeMachineStatus.xcodeproj/project.pbxproj index 75ffb9e..118def9 100644 --- a/TimeMachineStatus.xcodeproj/project.pbxproj +++ b/TimeMachineStatus.xcodeproj/project.pbxproj @@ -548,7 +548,7 @@ CODE_SIGN_ENTITLEMENTS = TimeMachineStatusHelper/TimeMachineStatusHelper.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 20; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = NO; @@ -562,7 +562,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 0.1.4; + MARKETING_VERSION = 0.2.0; PRODUCT_BUNDLE_IDENTIFIER = com.lukaspistrol.TimeMachineStatusHelper; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -578,7 +578,7 @@ CODE_SIGN_ENTITLEMENTS = TimeMachineStatusHelper/TimeMachineStatusHelper.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 20; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = NO; @@ -592,7 +592,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 0.1.4; + MARKETING_VERSION = 0.2.0; PRODUCT_BUNDLE_IDENTIFIER = com.lukaspistrol.TimeMachineStatusHelper; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -731,7 +731,7 @@ CODE_SIGN_ENTITLEMENTS = TimeMachineStatus/TimeMachineStatus.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 20; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"TimeMachineStatus/Preview Content\""; DEVELOPMENT_TEAM = ""; @@ -749,7 +749,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 0.1.4; + MARKETING_VERSION = 0.2.0; PRODUCT_BUNDLE_IDENTIFIER = com.lukaspistrol.TimeMachineStatus; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -766,7 +766,7 @@ CODE_SIGN_ENTITLEMENTS = TimeMachineStatus/TimeMachineStatus.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 18; + CURRENT_PROJECT_VERSION = 20; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"TimeMachineStatus/Preview Content\""; DEVELOPMENT_TEAM = ""; @@ -784,7 +784,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 0.1.4; + MARKETING_VERSION = 0.2.0; PRODUCT_BUNDLE_IDENTIFIER = com.lukaspistrol.TimeMachineStatus; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; diff --git a/TimeMachineStatus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TimeMachineStatus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index efca628..880c6bc 100644 --- a/TimeMachineStatus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/TimeMachineStatus.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "adfbd13af11368529ed8775057964d06d9a7c6d121e286f41cb35afced24139d", + "originHash" : "90288fc062e15ae6d002014a29c6e503504dcbb9aecef39d93ed46eaaa54b1b9", "pins" : [ { "identity" : "sfsafesymbols", @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log.git", "state" : { - "revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed", - "version" : "1.5.3" + "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537", + "version" : "1.6.1" } }, { diff --git a/TimeMachineStatus/Views/InitializeView.swift b/TimeMachineStatus/Views/InitializeView.swift index be2c094..3814122 100644 --- a/TimeMachineStatus/Views/InitializeView.swift +++ b/TimeMachineStatus/Views/InitializeView.swift @@ -66,6 +66,7 @@ struct InitializeView: View { } } .padding() + .padding(.top, -26) .frame(width: 300) .backgroundVisualEffect(.hudWindow) .task { diff --git a/TimeMachineStatus/Views/MenuView.swift b/TimeMachineStatus/Views/MenuView.swift index 429a9ed..8f7db13 100644 --- a/TimeMachineStatus/Views/MenuView.swift +++ b/TimeMachineStatus/Views/MenuView.swift @@ -9,13 +9,10 @@ // See LICENSE.md for license information. // -import Combine import Sparkle import SwiftUI struct MenuView: View { - @Environment(\.openWindow) private var openWindow - @State private var utility: any TMUtility @ObservedObject private var updaterViewModel: UpdaterViewModel private let updater: SPUUpdater