aboutsummaryrefslogtreecommitdiff
path: root/Map/Presentation/Theme
diff options
context:
space:
mode:
Diffstat (limited to 'Map/Presentation/Theme')
-rw-r--r--Map/Presentation/Theme/Color+theme.swift2
-rw-r--r--Map/Presentation/Theme/Dimensions.swift6
-rw-r--r--Map/Presentation/Theme/Font+theme.swift9
-rw-r--r--Map/Presentation/Theme/NSColor+theme.swift2
-rw-r--r--Map/Presentation/Theme/NSFont+theme.swift3
5 files changed, 9 insertions, 13 deletions
diff --git a/Map/Presentation/Theme/Color+theme.swift b/Map/Presentation/Theme/Color+theme.swift
index dcc84cb..541bbb6 100644
--- a/Map/Presentation/Theme/Color+theme.swift
+++ b/Map/Presentation/Theme/Color+theme.swift
@@ -51,7 +51,7 @@ extension Color {
Color.Theme.jasperRed,
Color.Theme.lightPorcelainGreen,
Color.Theme.naplesYellow,
- Color.Theme.hermosaPink,
+ Color.Theme.hermosaPink
]
}
}
diff --git a/Map/Presentation/Theme/Dimensions.swift b/Map/Presentation/Theme/Dimensions.swift
index b7c1faf..40ca73d 100644
--- a/Map/Presentation/Theme/Dimensions.swift
+++ b/Map/Presentation/Theme/Dimensions.swift
@@ -71,9 +71,9 @@ struct Dimensions {
struct EvolutionPicker {
static var radius: CGFloat {
if #available(macOS 26, *) {
- return 12.0
+ return 12.0
} else {
- return 4.0
+ return 4.0
}
}
static let controlSize = 8.0
@@ -89,7 +89,7 @@ struct Dimensions {
}
}
}
-
+
struct Preferences {
struct Window {
diff --git a/Map/Presentation/Theme/Font+theme.swift b/Map/Presentation/Theme/Font+theme.swift
index bb1d8f6..d560d77 100644
--- a/Map/Presentation/Theme/Font+theme.swift
+++ b/Map/Presentation/Theme/Font+theme.swift
@@ -43,8 +43,7 @@ extension Font {
static var note: Font {
if UserDefaults.standard.bool(forKey: "useCustomFont"),
let customFontName = UserDefaults.standard.string(forKey: "customFontName"),
- !customFontName.isEmpty
- {
+ !customFontName.isEmpty {
return Font.custom(customFontName, size: Dimensions.FontSize.Map.note).weight(.regular)
}
return Font.libertinus(size: Dimensions.FontSize.Map.note).weight(.regular)
@@ -53,8 +52,7 @@ extension Font {
static var axisLabel: Font {
if UserDefaults.standard.bool(forKey: "useCustomFont"),
let customFontName = UserDefaults.standard.string(forKey: "customFontName"),
- !customFontName.isEmpty
- {
+ !customFontName.isEmpty {
return Font.custom(customFontName, size: Dimensions.FontSize.Map.axisLabel).weight(
.regular)
}
@@ -64,8 +62,7 @@ extension Font {
static var vertexLabel: Font {
if UserDefaults.standard.bool(forKey: "useCustomFont"),
let customFontName = UserDefaults.standard.string(forKey: "customFontName"),
- !customFontName.isEmpty
- {
+ !customFontName.isEmpty {
return Font.custom(customFontName, size: Dimensions.FontSize.Map.vertexLabel).weight(
.regular)
}
diff --git a/Map/Presentation/Theme/NSColor+theme.swift b/Map/Presentation/Theme/NSColor+theme.swift
index 21db412..5f349a3 100644
--- a/Map/Presentation/Theme/NSColor+theme.swift
+++ b/Map/Presentation/Theme/NSColor+theme.swift
@@ -29,7 +29,7 @@ extension NSColor {
.withAlphaComponent(
0.3)
static let error = (NSColor(named: "Jasper Red") ?? .textColor)
-
+
static func colorForSyntax(_ captureName: String) -> NSColor {
switch captureName {
case ("variable.component_label"):
diff --git a/Map/Presentation/Theme/NSFont+theme.swift b/Map/Presentation/Theme/NSFont+theme.swift
index 712cc1d..77927a6 100644
--- a/Map/Presentation/Theme/NSFont+theme.swift
+++ b/Map/Presentation/Theme/NSFont+theme.swift
@@ -31,8 +31,7 @@ extension NSFont {
@MainActor static var regular: NSFont {
if UserDefaults.standard.bool(forKey: "useCustomEditorFont"),
let customEditorFontName = UserDefaults.standard.string(forKey: "customEditorFontName"),
- !customEditorFontName.isEmpty
- {
+ !customEditorFontName.isEmpty {
return NSFontManager.shared.font(
withFamily: customEditorFontName,
traits: NSFontTraitMask(),