Fix DST (#61)

* Add new handling of timezones * Fix timezones * Fix spellings and grammar * Remove dead code * Fix linter
rlxone · Mar 17, 2024 · 3986285 · 3986285
1 parent 750652e
commit 3986285
Show file tree

Hide file tree

Showing 46 changed files with 1,272 additions and 547 deletions.
diff --git a/Equinox/Equinox.xcodeproj/project.pbxproj b/Equinox/Equinox.xcodeproj/project.pbxproj
@@ -23,7 +23,7 @@
 		F32F3778273AD25400A52762 /* WorkspaceRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = F32F3777273AD25400A52762 /* WorkspaceRunner.swift */; };
 		F337578A26BF533200310E72 /* SolarMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F337578926BF533200310E72 /* SolarMainViewController.swift */; };
 		F34E06D5267B86A700F004EF /* WallpaperMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F34E06D4267B86A700F004EF /* WallpaperMainViewController.swift */; };
-		F356C8B1272F78B500E915C6 /* SolarTimezoneController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F356C8B0272F78B500E915C6 /* SolarTimezoneController.swift */; };
+		F356C8B1272F78B500E915C6 /* SolarDateAndTimeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F356C8B0272F78B500E915C6 /* SolarDateAndTimeController.swift */; };
 		F356C8B32734B88D00E915C6 /* TipViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F356C8B22734B88D00E915C6 /* TipViewController.swift */; };
 		F356C8B92734C1FA00E915C6 /* TipContentViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F356C8B82734C1FA00E915C6 /* TipContentViewExtensions.swift */; };
 		F36AD5DA26E515C800314A02 /* WallpaperWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F36AD5D926E515C800314A02 /* WallpaperWindowController.swift */; };
@@ -100,7 +100,7 @@
 		F32F3777273AD25400A52762 /* WorkspaceRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkspaceRunner.swift; sourceTree = "<group>"; };
 		F337578926BF533200310E72 /* SolarMainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SolarMainViewController.swift; sourceTree = "<group>"; };
 		F34E06D4267B86A700F004EF /* WallpaperMainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperMainViewController.swift; sourceTree = "<group>"; };
-		F356C8B0272F78B500E915C6 /* SolarTimezoneController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SolarTimezoneController.swift; sourceTree = "<group>"; };
+		F356C8B0272F78B500E915C6 /* SolarDateAndTimeController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SolarDateAndTimeController.swift; sourceTree = "<group>"; };
 		F356C8B22734B88D00E915C6 /* TipViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipViewController.swift; sourceTree = "<group>"; };
 		F356C8B82734C1FA00E915C6 /* TipContentViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipContentViewExtensions.swift; sourceTree = "<group>"; };
 		F36AD5D926E515C800314A02 /* WallpaperWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperWindowController.swift; sourceTree = "<group>"; };
@@ -260,7 +260,7 @@
 				F36AD5DD26E51BCF00314A02 /* SolarWindowController.swift */,
 				F36AD5DF26E528C800314A02 /* SolarRootViewController.swift */,
 				F337578926BF533200310E72 /* SolarMainViewController.swift */,
-				F356C8B0272F78B500E915C6 /* SolarTimezoneController.swift */,
+				F356C8B0272F78B500E915C6 /* SolarDateAndTimeController.swift */,
 			);
 			path = Solar;
 			sourceTree = "<group>";
@@ -446,7 +446,7 @@
 				F3837F0F2698FFA400671585 /* main.swift in Sources */,
 				F3E7B06026AE17E500287C60 /* AppearanceContentViewExtensions.swift in Sources */,
 				F329B3DE26F6838500A31035 /* WallpaperGalleryDataController.swift in Sources */,
-				F356C8B1272F78B500E915C6 /* SolarTimezoneController.swift in Sources */,
+				F356C8B1272F78B500E915C6 /* SolarDateAndTimeController.swift in Sources */,
 				F30C86DC26D6CEE600F93E60 /* WallpaperType.swift in Sources */,
 				3D916CE428B1682700D29FFF /* HelpMenuLinks.swift in Sources */,
 				F3E7B05E26ADE71100287C60 /* GalleryContentViewExtensions.swift in Sources */,

diff --git a/Equinox/Equinox/Extensions/GalleryContentViewExtensions.swift b/Equinox/Equinox/Extensions/GalleryContentViewExtensions.swift
@@ -120,7 +120,6 @@ extension GalleryCollectionButtonsView.Style {
             primaryStyle: .init(
                 backgroundColor: Color.wallpaperPrimaryBackground,
                 alternativeColor: Color.controlAccent,
-                highlightColor: Color.controlAccent,
                 borderColor: Color.wallpaperButtonBorder
             )
         )

diff --git a/Equinox/Equinox/Extensions/SolarContentViewExtensions.swift b/Equinox/Equinox/Extensions/SolarContentViewExtensions.swift
@@ -86,9 +86,31 @@ extension SolarMainContentView.Style {
                     font: Font.title2(.bold),
                     color: Color.label
                 ),
-                timelineStyle: .init(
-                    font: Font.callout(.regular),
-                    color: Color.label
+                timezoneAbbreviationStyle: .init(
+                    ownStyle: .init(
+                        backgroundColor: Color.solarContent,
+                        borderColor: Color.solarContentBorder
+                    ),
+                    titleStyle: .init(
+                        font: Font.callout(.regular),
+                        color: Color.label
+                    )
+                ),
+                timezoneDaylightSavingTimeStyle: .init(
+                    ownStyle: .init(
+                        backgroundColor: Color.solarContent,
+                        borderColor: Color.solarContentBorder
+                    ),
+                    titleStyle: .init(
+                        font: Font.callout(.regular),
+                        color: Color.label
+                    )
+                ),
+                timezoneMenuStyle: .init(
+                    titleFont: Font.body(.regular),
+                    titleColor: Color.label,
+                    supplementaryTitleFont: Font.caption2(.regular),
+                    supplementaryTitleColor: Color.secondaryLabel
                 )
             ),
             resultStyle: .init(
@@ -111,12 +133,12 @@ extension SolarMainContentView.Style {
                         copyImage: Image.copy
                     ),
                     pushButtonStyle: .default
-                ),
-                pushButtonStyle: .default
+                )
             ),
             lineStyle: .init(
                 color: Color.separator
-            )
+            ),
+            tooltipStyle: .default
         )
     }
 }
diff --git a/Equinox/Equinox/Menu/MenuItem.swift b/Equinox/Equinox/Menu/MenuItem.swift
@@ -47,12 +47,6 @@ final class MenuItem: NSMenuItem {
         self.target = target
     }
 
-    init(title string: String, submenuItems: [NSMenuItem]) {
-        super.init(title: string, action: nil, keyEquivalent: String())
-        self.submenu = NSMenu()
-        self.submenu?.items = submenuItems
-    }
-
     required init(coder: NSCoder) {
         super.init(coder: coder)
     }

diff --git a/Equinox/Equinox/Stories/Common/ImageProvider.swift b/Equinox/Equinox/Stories/Common/ImageProvider.swift
@@ -37,7 +37,6 @@ protocol ImageProvider {
         resizeMode: ImageResizeMode,
         completion: @escaping (NSImage?) -> Void
     )
-    func removeCachedImage(_ url: URL)
     func validateImages(_ urls: [URL]) -> [URL]
     func getImageMetadata(for url: URL) -> ExifMetadata?
 }
@@ -113,10 +112,6 @@ final class ImageProviderImpl: ImageProvider {
         }
     }
 
-    func removeCachedImage(_ url: URL) {
-        imageService.removeCachedImage(url: url)
-    }
-
     func validateImages(_ urls: [URL]) -> [URL] {
         var preparedUrls: [URL] = []
 

diff --git a/Equinox/Equinox/Stories/Common/NavigationController.swift b/Equinox/Equinox/Stories/Common/NavigationController.swift
@@ -33,20 +33,10 @@ import Foundation
 // MARK: - Enums, Structs
 
 extension NavigationController {
-    private class ControlState {
-        let isEnabled: Bool
-
-        init(isEnabled: Bool) {
-            self.isEnabled = isEnabled
-        }
-    }
-
     private enum Constants {
         static let defaultAnimationTimeInterval: TimeInterval = 0.35
         static let pushAnimationPreviousShiftAspect: CGFloat = 3
         static let pushAnimationPreviousAlpha: CGFloat = 0.3
-        static let presentScaleAnimationTimeInterval: TimeInterval = 0.25
-        static let dismissScaleAnimationTimeInterval: TimeInterval = 0.2
         static let dismissAnimationTimeInterval: TimeInterval = 0.25
     }
 }
@@ -55,7 +45,6 @@ extension NavigationController {
 
 class NavigationController: ViewController {
     private var rootViewController: ViewController
-    private var controlsState = NSMapTable<NSView, ControlState>(keyOptions: [.weakMemory])
 
     // MARK: - Initializer
 

diff --git a/Equinox/Equinox/Stories/Common/WorkspaceRunner.swift b/Equinox/Equinox/Stories/Common/WorkspaceRunner.swift
@@ -48,13 +48,4 @@ enum WorkspaceRunner {
 
         return output
     }
-
-    static func launchApplication(bundleIndentifier: String, options: NSWorkspace.LaunchOptions) {
-        NSWorkspace.shared.launchApplication(
-            withBundleIdentifier: bundleIndentifier,
-            options: options,
-            additionalEventParamDescriptor: nil,
-            launchIdentifier: nil
-        )
-    }
 }