Address the lint warnings

diff --git a/Map/Data/FocusedValues+document.swift b/Map/Data/FocusedValues+document.swift
index a28404fca2c4b9413f2262dbc74180286a491589..78db1c1082f55789643dfdef52f9bac61df41421 100644 (file)
--- a/Map/Data/FocusedValues+document.swift
+++ b/Map/Data/FocusedValues+document.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct DocumentFocusedValueKey: FocusedValueKey {
 import SwiftUI
 
 struct DocumentFocusedValueKey: FocusedValueKey {

diff --git a/Map/Data/MapDocument.swift b/Map/Data/MapDocument.swift
index 317c39d726d12355794ef9c397033a011cd92372..1b43efbe314001f6cc31cab63034f5b10a404719 100644 (file)
--- a/Map/Data/MapDocument.swift
+++ b/Map/Data/MapDocument.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 import UniformTypeIdentifiers
 
 import SwiftUI
 import UniformTypeIdentifiers
 

diff --git a/Map/Data/Stage.swift b/Map/Data/Stage.swift
index 395f279039099768713be53ca38fdc096ee2d28b..4f737a1dc96431f6a378a7e9e72ae32d767b490d 100644 (file)
--- a/Map/Data/Stage.swift
+++ b/Map/Data/Stage.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 struct Stage {
   let i: String
   let ii: String
 struct Stage {
   let i: String
   let ii: String

diff --git a/Map/Logic/Constants.swift b/Map/Logic/Constants.swift
index 789934a22a01856170eb082669aadc61c8a7bb42..1c6f54db08b657ad406a0130c7f91693be068f3d 100644 (file)
--- a/Map/Logic/Constants.swift
+++ b/Map/Logic/Constants.swift
@@ -1,19 +1,18 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */

 struct Constants {
   static let kMaxZoom = 2.0
   static let kMinZoom = 0.1
 struct Constants {
   static let kMaxZoom = 2.0
   static let kMinZoom = 0.1

diff --git a/Map/Logic/Debouncer.swift b/Map/Logic/Debouncer.swift
index 68a914dd70908ad6be74d18e8d543f9a25db1f78..8d40e9955fe8caae8fe95fc716fbdb379091418d 100644 (file)
--- a/Map/Logic/Debouncer.swift
+++ b/Map/Logic/Debouncer.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Foundation
 
 class Debouncer {
 import Foundation
 
 class Debouncer {

diff --git a/Map/Logic/MapParser/MapParser.swift b/Map/Logic/MapParser/MapParser.swift
index 61f3e5188c773241002178d6f5d501c5895d8158..e94de773812ba69a24a4c6bb896a1cb12f28dc3c 100644 (file)
--- a/Map/Logic/MapParser/MapParser.swift
+++ b/Map/Logic/MapParser/MapParser.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import CoreGraphics
 import Foundation
 
 import CoreGraphics
 import Foundation
 

diff --git a/Map/Logic/MapParser/Strategies/BlockerParserStrategy.swift b/Map/Logic/MapParser/Strategies/BlockerParserStrategy.swift
index 09996667d5cbf7ee46521f1be023ad53ebf9a006..4bd2ce4b3a5c33ac82ca4a63f06bfb1028ee0d51 100644 (file)
--- a/Map/Logic/MapParser/Strategies/BlockerParserStrategy.swift
+++ b/Map/Logic/MapParser/Strategies/BlockerParserStrategy.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Foundation
 
 struct BlockerParserStrategy: MapParserStrategy {
 import Foundation
 
 struct BlockerParserStrategy: MapParserStrategy {

diff --git a/Map/Logic/MapParser/Strategies/EdgeParserStrategy.swift b/Map/Logic/MapParser/Strategies/EdgeParserStrategy.swift
index f8b78df1888d5e558c4220844b9a036c45abac0f..cc29b49e90b5fbdd0fbb060f8c722824f137b1ad 100644 (file)
--- a/Map/Logic/MapParser/Strategies/EdgeParserStrategy.swift
+++ b/Map/Logic/MapParser/Strategies/EdgeParserStrategy.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Foundation
 
 struct EdgeParserStrategy: MapParserStrategy {
 import Foundation
 
 struct EdgeParserStrategy: MapParserStrategy {

diff --git a/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift b/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift
index d5ab60c5c8a218699878ccad3ea206597a7fa596..96de36532bec791167b87fb6a3c5188983e911ec 100644 (file)
--- a/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift
+++ b/Map/Logic/MapParser/Strategies/GroupParserStrategy.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Foundation
 
 struct GroupParserStrategy: MapParserStrategy {
 import Foundation
 
 struct GroupParserStrategy: MapParserStrategy {

diff --git a/Map/Logic/MapParser/Strategies/NoteParserStrategy.swift b/Map/Logic/MapParser/Strategies/NoteParserStrategy.swift
index da1652e77dbac7abb19959afaaa5474e308b1eda..d06c76816a650f0c93b70f0d2f78a0564706963e 100644 (file)
--- a/Map/Logic/MapParser/Strategies/NoteParserStrategy.swift
+++ b/Map/Logic/MapParser/Strategies/NoteParserStrategy.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Foundation
 
 struct NoteParserStrategy: MapParserStrategy {
 import Foundation
 
 struct NoteParserStrategy: MapParserStrategy {

diff --git a/Map/Logic/MapParser/Strategies/OpportunityParserStrategy.swift b/Map/Logic/MapParser/Strategies/OpportunityParserStrategy.swift
index 78320556410b605e4b40e96879ada93c38d4eb18..25e6cc49facef5439df98b561c12cd86bf6177b0 100644 (file)
--- a/Map/Logic/MapParser/Strategies/OpportunityParserStrategy.swift
+++ b/Map/Logic/MapParser/Strategies/OpportunityParserStrategy.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Foundation
 
 struct OpportunityParserStrategy: MapParserStrategy {
 import Foundation
 
 struct OpportunityParserStrategy: MapParserStrategy {

diff --git a/Map/Logic/MapParser/Strategies/StageParserStrategy.swift b/Map/Logic/MapParser/Strategies/StageParserStrategy.swift
index d20a4c6220fc8dc9a77ea960730d281305aac277..6e4a34108835608d35841291b9f63a7222fbb9d4 100644 (file)
--- a/Map/Logic/MapParser/Strategies/StageParserStrategy.swift
+++ b/Map/Logic/MapParser/Strategies/StageParserStrategy.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Foundation
 
 struct StageParserStrategy: MapParserStrategy {
 import Foundation
 
 struct StageParserStrategy: MapParserStrategy {

diff --git a/Map/Logic/MapParser/Strategies/VertexParserStrategy.swift b/Map/Logic/MapParser/Strategies/VertexParserStrategy.swift
index 0c25e614093c8e3555b6179255537c91e5115650..0ca6fc16d6c8a3b1bc9ace540a36115fd515e208 100644 (file)
--- a/Map/Logic/MapParser/Strategies/VertexParserStrategy.swift
+++ b/Map/Logic/MapParser/Strategies/VertexParserStrategy.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Foundation
 
 struct VertexParserStrategy: MapParserStrategy {
 import Foundation
 
 struct VertexParserStrategy: MapParserStrategy {

diff --git a/Map/MapApp.swift b/Map/MapApp.swift
index 4578bd85d53143fe77afa000831404fbd7469afb..edfe4ece962015462f1925601fd24b7c8c117412 100644 (file)
--- a/Map/MapApp.swift
+++ b/Map/MapApp.swift
@@ -1,20 +1,18 @@
-import Sparkle
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.
+import Sparkle

 import SwiftUI
 
 @main
 import SwiftUI
 
 @main

diff --git a/Map/Presentation/Base Components/EvolutionPicker.swift b/Map/Presentation/Base Components/EvolutionPicker.swift
index 03f51451c3010816cd6a481fc39c3f26aa81f2ae..276854039099e8188e64ef7a8ab2c6c4f14c4ed4 100644 (file)
--- a/Map/Presentation/Base Components/EvolutionPicker.swift
+++ b/Map/Presentation/Base Components/EvolutionPicker.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct EvolutionPicker: View {
 import SwiftUI
 
 struct EvolutionPicker: View {


@@ -23,21 +21,21 @@ struct EvolutionPicker: View {
   var body: some View {
     Picker("Evolution", selection: $selectedEvolution) {
       ForEach(StageType.types) { stage in
   var body: some View {
     Picker("Evolution", selection: $selectedEvolution) {
       ForEach(StageType.types) { stage in

-        Text(Stage.title(stage)).font(.theme.body).tag(stage).padding(4.0)
+        Text(Stage.title(stage)).font(.Theme.body).tag(stage).padding(4.0)

       }
       Divider()
       ForEach(StageType.characteristics) { stage in
       }
       Divider()
       ForEach(StageType.characteristics) { stage in

-        Text(Stage.title(stage)).font(.theme.body).tag(stage).padding(4.0).font(.theme.body)
+        Text(Stage.title(stage)).font(.Theme.body).tag(stage).padding(4.0).font(.Theme.body)

       }
       Divider()
       ForEach(StageType.properties) { stage in
       }
       Divider()
       ForEach(StageType.properties) { stage in

-        Text(Stage.title(stage)).font(.theme.body).tag(stage).padding(4.0)
+        Text(Stage.title(stage)).font(.Theme.body).tag(stage).padding(4.0)

       }
       Divider()
       ForEach(StageType.custom) { stage in
       }
       Divider()
       ForEach(StageType.custom) { stage in

-        Text(Stage.title(stage)).font(.theme.body).tag(stage).padding(4.0)
+        Text(Stage.title(stage)).font(.Theme.body).tag(stage).padding(4.0)

       }
       }

-    }.font(.theme.body).padding(.horizontal, 8.0).padding(.vertical, 4.0)
+    }.font(.Theme.body).padding(.horizontal, 8.0).padding(.vertical, 4.0)

   }
 }
 
   }
 }
 

diff --git a/Map/Presentation/Base Components/MapRender/MapAxes.swift b/Map/Presentation/Base Components/MapRender/MapAxes.swift
index bdbafbdaa87f681d213c29ccac79367fd150904f..4f64135ef49311ce027eaa4a2e0d82ada9a9474f 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapAxes.swift
+++ b/Map/Presentation/Base Components/MapRender/MapAxes.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct MapAxes: View {
 import SwiftUI
 
 struct MapAxes: View {


@@ -35,14 +33,14 @@ struct MapAxes: View {
         path.addLine(to: CGPoint(x: mapSize.width, y: mapSize.height))
         path.move(to: CGPoint(x: mapSize.width, y: mapSize.height))
         path.closeSubpath()
         path.addLine(to: CGPoint(x: mapSize.width, y: mapSize.height))
         path.move(to: CGPoint(x: mapSize.width, y: mapSize.height))
         path.closeSubpath()

-      }.stroke(Color.map.axisColor, lineWidth: lineWidth * 2)
+      }.stroke(Color.Map.axisColor, lineWidth: lineWidth * 2)

 
       // Y Labels
 
       // Y Labels

-      Text("Visible").font(.theme.axisLabel).foregroundColor(.map.labelColor).rotationEffect(
+      Text("Visible").font(.Theme.axisLabel).foregroundColor(.Map.labelColor).rotationEffect(

         Angle(degrees: -90.0)
       )
       .offset(CGSize(width: -35.0, height: 0.0))
         Angle(degrees: -90.0)
       )
       .offset(CGSize(width: -35.0, height: 0.0))

-      Text("Invisible").font(.theme.axisLabel).foregroundColor(.map.labelColor).rotationEffect(
+      Text("Invisible").font(.Theme.axisLabel).foregroundColor(.Map.labelColor).rotationEffect(

         Angle(degrees: -90.0)
       )
       .offset(CGSize(width: -40.0, height: mapSize.height - 20))
         Angle(degrees: -90.0)
       )
       .offset(CGSize(width: -40.0, height: mapSize.height - 20))


@@ -50,37 +48,37 @@ struct MapAxes: View {
       // X Labels
 
       Text("Uncharted")
       // X Labels
 
       Text("Uncharted")

-        .font(.theme.axisLabel)
-        .foregroundColor(.map.labelColor)
+        .font(.Theme.axisLabel)
+        .foregroundColor(.Map.labelColor)

         .frame(width: mapSize.width / 4, height: stageHeight / 2.0, alignment: .topLeading)
         .offset(CGSize(width: 0.0, height: -stageHeight / 4.0))
       Text("Industrialised")
         .frame(width: mapSize.width / 4, height: stageHeight / 2.0, alignment: .topLeading)
         .offset(CGSize(width: 0.0, height: -stageHeight / 4.0))
       Text("Industrialised")

-        .font(.theme.axisLabel)
-        .foregroundColor(.map.labelColor)
+        .font(.Theme.axisLabel)
+        .foregroundColor(.Map.labelColor)

         .frame(width: mapSize.width / 4, height: stageHeight / 2.0, alignment: .topLeading)
         .offset(CGSize(width: mapSize.width - 100.0, height: -stageHeight / 4.0))
 
       Text(evolution.i)
         .frame(width: mapSize.width / 4, height: stageHeight / 2.0, alignment: .topLeading)
         .offset(CGSize(width: mapSize.width - 100.0, height: -stageHeight / 4.0))
 
       Text(evolution.i)

-        .font(.theme.axisLabel)
-        .foregroundColor(.map.labelColor)
+        .font(.Theme.axisLabel)
+        .foregroundColor(.Map.labelColor)

         .frame(width: w(stages[0]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: 0.0, height: mapSize.height + padding))
 
       Text(evolution.ii)
         .frame(width: w(stages[0]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: 0.0, height: mapSize.height + padding))
 
       Text(evolution.ii)

-        .font(.theme.axisLabel)
-        .foregroundColor(.map.labelColor)
+        .font(.Theme.axisLabel)
+        .foregroundColor(.Map.labelColor)

         .frame(width: w(stages[1]) - w(stages[0]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: w(stages[0]), height: mapSize.height + padding))
 
       Text(evolution.iii)
         .frame(width: w(stages[1]) - w(stages[0]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: w(stages[0]), height: mapSize.height + padding))
 
       Text(evolution.iii)

-        .font(.theme.axisLabel)
-        .foregroundColor(.map.labelColor)
+        .font(.Theme.axisLabel)
+        .foregroundColor(.Map.labelColor)

         .frame(width: w(stages[2]) - w(stages[1]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: w(stages[1]), height: mapSize.height + padding))
 
       Text(evolution.iv)
         .frame(width: w(stages[2]) - w(stages[1]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: w(stages[1]), height: mapSize.height + padding))
 
       Text(evolution.iv)

-        .font(.theme.axisLabel)
-        .foregroundColor(.map.labelColor)
+        .font(.Theme.axisLabel)
+        .foregroundColor(.Map.labelColor)

         .frame(width: mapSize.width - w(stages[2]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: w(stages[2]), height: mapSize.height + padding))
     }
         .frame(width: mapSize.width - w(stages[2]), height: stageHeight, alignment: .topLeading)
         .offset(CGSize(width: w(stages[2]), height: mapSize.height + padding))
     }

diff --git a/Map/Presentation/Base Components/MapRender/MapBlockers.swift b/Map/Presentation/Base Components/MapRender/MapBlockers.swift
index 356c1d127b0a7796e5c2b1ad49889b1993af8cbd..613b79244b669002666466034ccaccdc4fce1c04 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapBlockers.swift
+++ b/Map/Presentation/Base Components/MapRender/MapBlockers.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct MapBlockers: View {
 import SwiftUI
 
 struct MapBlockers: View {


@@ -34,7 +32,7 @@ struct MapBlockers: View {
               y: h(vertex.position.y) - vertexSize.height * 2 / 3),
             size: CGSize(width: vertexSize.width / 2, height: vertexSize.height * 2)
           ), cornerSize: cornerSize)
               y: h(vertex.position.y) - vertexSize.height * 2 / 3),
             size: CGSize(width: vertexSize.width / 2, height: vertexSize.height * 2)
           ), cornerSize: cornerSize)

-      }.fill(Color.map.blockerColor)
+      }.fill(Color.Map.blockerColor)

     }
   }
 
     }
   }
 

diff --git a/Map/Presentation/Base Components/MapRender/MapEdges.swift b/Map/Presentation/Base Components/MapRender/MapEdges.swift
index a377774a07bbcec95e77e71f79e15e9da689ded3..3090c04369b362fc054244f664125cd9cc4ec5f5 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapEdges.swift
+++ b/Map/Presentation/Base Components/MapRender/MapEdges.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct MapEdges: View {
 import SwiftUI
 
 struct MapEdges: View {


@@ -68,7 +66,7 @@ struct MapEdges: View {
         path.closeSubpath()
       }.applying(
         CGAffineTransform(translationX: vertexSize.width / 2.0, y: vertexSize.height / 2.0)
         path.closeSubpath()
       }.applying(
         CGAffineTransform(translationX: vertexSize.width / 2.0, y: vertexSize.height / 2.0)

-      ).stroke(Color.map.vertexColor, lineWidth: lineWidth)
+      ).stroke(Color.Map.vertexColor, lineWidth: lineWidth)

     }
   }
 
     }
   }
 

diff --git a/Map/Presentation/Base Components/MapRender/MapGroup.swift b/Map/Presentation/Base Components/MapRender/MapGroup.swift
index 852c536f74dde3404f0671b957a5ca12d642ca2f..a5877a8ff37e89abdf36359dbb1cbcaf0130cd5d 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapGroup.swift
+++ b/Map/Presentation/Base Components/MapRender/MapGroup.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import ConcaveHull
 import SwiftUI
 
 import ConcaveHull
 import SwiftUI
 

diff --git a/Map/Presentation/Base Components/MapRender/MapGroups.swift b/Map/Presentation/Base Components/MapRender/MapGroups.swift
index 936a1fc98963ad23f29849510f6267d61980f96f..41ea14772820acb3b90d12ca89fd597ecd0256d1 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapGroups.swift
+++ b/Map/Presentation/Base Components/MapRender/MapGroups.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import ConcaveHull
 import SwiftUI
 
 import ConcaveHull
 import SwiftUI
 


@@ -30,7 +28,7 @@ struct MapGroups: View {
   }
 
   private func color(_ index: Int) -> Color {
   }
 
   private func color(_ index: Int) -> Color {

-    return .map.groupColors[index % Color.map.groupColors.count]
+    return .Map.groupColors[index % Color.Map.groupColors.count]

   }
 }
 
   }
 }
 

diff --git a/Map/Presentation/Base Components/MapRender/MapNotes.swift b/Map/Presentation/Base Components/MapRender/MapNotes.swift
index d2d7e1f777bbdc88249a12940d2cb79d405b4739..0119154192c03bb47df2d2ed6185d1d912ee9379 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapNotes.swift
+++ b/Map/Presentation/Base Components/MapRender/MapNotes.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct MapNotes: View {
 import SwiftUI
 
 struct MapNotes: View {


@@ -26,11 +24,11 @@ struct MapNotes: View {
 
   var body: some View {
     ForEach(notes, id: \.id) { note in
 
   var body: some View {
     ForEach(notes, id: \.id) { note in

-      Text(note.text.replacingOccurrences(of: "\\n", with: "\n")).font(.theme.note)
+      Text(note.text.replacingOccurrences(of: "\\n", with: "\n")).font(.Theme.note)

         .padding(2.0)
         .background(.white)
         .padding(2.0)
         .background(.white)

-        .foregroundColor(.map.labelColor)
-        .border(Color.map.vertexColor, width: lineWidth)
+        .foregroundColor(.Map.labelColor)
+        .border(Color.Map.vertexColor, width: lineWidth)

         .frame(minWidth: 16.0, maxWidth: maxWidth, alignment: .topLeading)
         .offset(
           CGSize(
         .frame(minWidth: 16.0, maxWidth: maxWidth, alignment: .topLeading)
         .offset(
           CGSize(

diff --git a/Map/Presentation/Base Components/MapRender/MapOpportunities.swift b/Map/Presentation/Base Components/MapRender/MapOpportunities.swift
index 310379b7cb3aa10d54eed54400ee040d7b5ecf85..3d539d4c8b90cc348683d1dc5abfc918e7af2b65 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapOpportunities.swift
+++ b/Map/Presentation/Base Components/MapRender/MapOpportunities.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct MapOpportunities: View {
 import SwiftUI
 
 struct MapOpportunities: View {


@@ -63,7 +61,7 @@ struct MapOpportunities: View {
       }.applying(
         CGAffineTransform(translationX: vertexSize.width / 2.0, y: vertexSize.height / 2.0)
       ).strokedPath(StrokeStyle(lineWidth: lineWidth / 4, dash: [10.0])).stroke(
       }.applying(
         CGAffineTransform(translationX: vertexSize.width / 2.0, y: vertexSize.height / 2.0)
       ).strokedPath(StrokeStyle(lineWidth: lineWidth / 4, dash: [10.0])).stroke(

-        Color.map.opportunityColor)
+        Color.Map.opportunityColor)

     }
   }
 
     }
   }
 

diff --git a/Map/Presentation/Base Components/MapRender/MapStages.swift b/Map/Presentation/Base Components/MapRender/MapStages.swift
index 754ebb2aa7911f5b154beadd8ea89459747ebbce..d5e596552f5b2331a7d386402420360023d8c9f2 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapStages.swift
+++ b/Map/Presentation/Base Components/MapRender/MapStages.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Patterns
 import SwiftUI
 
 import Patterns
 import SwiftUI
 


@@ -27,25 +25,25 @@ struct MapStages: View {
   var body: some View {
     ZStack(alignment: .topLeading) {
       PatternView(
   var body: some View {
     ZStack(alignment: .topLeading) {
       PatternView(

-        design: .constant(.stitch), pixelSize: 1.0, foregroundColor: .map.stageForeground,
-        backgroundColor: .map.stageBackground
+        design: .constant(.stitch), pixelSize: 1.0, foregroundColor: .Map.stageForeground,
+        backgroundColor: .Map.stageBackground

       )
       .frame(width: w(stages[0]), height: mapSize.height)
       PatternView(
       )
       .frame(width: w(stages[0]), height: mapSize.height)
       PatternView(

-        design: .constant(.shingles), pixelSize: 1.0, foregroundColor: .map.stageForeground,
-        backgroundColor: .map.stageBackground
+        design: .constant(.shingles), pixelSize: 1.0, foregroundColor: .Map.stageForeground,
+        backgroundColor: .Map.stageBackground

       )
       .offset(CGSize(width: w(stages[0]), height: 0))
       .frame(width: w(stages[1]) - w(stages[0]), height: mapSize.height)
       PatternView(
       )
       .offset(CGSize(width: w(stages[0]), height: 0))
       .frame(width: w(stages[1]) - w(stages[0]), height: mapSize.height)
       PatternView(

-        design: .constant(.shadowGrid), pixelSize: 1.0, foregroundColor: .map.stageForeground,
-        backgroundColor: .map.stageBackground
+        design: .constant(.shadowGrid), pixelSize: 1.0, foregroundColor: .Map.stageForeground,
+        backgroundColor: .Map.stageBackground

       )
       .offset(CGSize(width: w(stages[1]), height: 0))
       .frame(width: w(stages[2]) - w(stages[1]), height: mapSize.height)
       PatternView(
       )
       .offset(CGSize(width: w(stages[1]), height: 0))
       .frame(width: w(stages[2]) - w(stages[1]), height: mapSize.height)
       PatternView(

-        design: .constant(.wicker), pixelSize: 1.0, foregroundColor: .map.stageForeground,
-        backgroundColor: .map.stageBackground
+        design: .constant(.wicker), pixelSize: 1.0, foregroundColor: .Map.stageForeground,
+        backgroundColor: .Map.stageBackground

       )
       .offset(CGSize(width: w(stages[2]), height: 0))
       .frame(width: mapSize.width - w(stages[2]), height: mapSize.height)
       )
       .offset(CGSize(width: w(stages[2]), height: 0))
       .frame(width: mapSize.width - w(stages[2]), height: mapSize.height)


@@ -63,7 +61,7 @@ struct MapStages: View {
         path.move(to: CGPoint(x: w(stages[0]), y: 0))
         path.closeSubpath()
       }.strokedPath(StrokeStyle(lineWidth: lineWidth / 4, dash: [10.0, 18.0])).stroke(
         path.move(to: CGPoint(x: w(stages[0]), y: 0))
         path.closeSubpath()
       }.strokedPath(StrokeStyle(lineWidth: lineWidth / 4, dash: [10.0, 18.0])).stroke(

-        Color.map.axisColor)
+        Color.Map.axisColor)

     }
   }
 
     }
   }
 

diff --git a/Map/Presentation/Base Components/MapRender/MapVertices.swift b/Map/Presentation/Base Components/MapRender/MapVertices.swift
index 1be091a2e9c2b1af535f24ba492e7ef84626ee4e..d8e3b88dddc0c2d9c21d932e074f9390f9bad6b6 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapVertices.swift
+++ b/Map/Presentation/Base Components/MapRender/MapVertices.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct MapVertices: View {
 import SwiftUI
 
 struct MapVertices: View {


@@ -29,9 +27,9 @@ struct MapVertices: View {
     ZStack(alignment: .topLeading) {
       ForEach(vertices, id: \.id) { vertex in
         ZStack(alignment: .topLeading) {
     ZStack(alignment: .topLeading) {
       ForEach(vertices, id: \.id) { vertex in
         ZStack(alignment: .topLeading) {

-          getVertexShape(vertex).fill(Color.map.vertexColor)
-          Text(vertex.label.replacingOccurrences(of: "\\n", with: "\n")).font(.theme.vertexLabel)
-            .foregroundColor(.map.labelColor)
+          getVertexShape(vertex).fill(Color.Map.vertexColor)
+          Text(vertex.label.replacingOccurrences(of: "\\n", with: "\n")).font(.Theme.vertexLabel)
+            .foregroundColor(.Map.labelColor)

             .shadow(color: .white, radius: 0, x: -0.5, y: -0.5)
             .shadow(color: .white, radius: 0, x: 0.5, y: 0.5)
             .offset(
             .shadow(color: .white, radius: 0, x: -0.5, y: -0.5)
             .shadow(color: .white, radius: 0, x: 0.5, y: 0.5)
             .offset(

diff --git a/Map/Presentation/Base Components/MapTextEditor.swift b/Map/Presentation/Base Components/MapTextEditor.swift
index a7dbe52ee644b97ad0d3ad37cc3fff2b77d3447e..2e4f279cd3d6ea0266a8d646479b31a1284f6601 100644 (file)
--- a/Map/Presentation/Base Components/MapTextEditor.swift
+++ b/Map/Presentation/Base Components/MapTextEditor.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Cocoa
 import SwiftUI
 
 import Cocoa
 import SwiftUI
 


@@ -66,7 +64,7 @@ class MapTextEditorController: NSViewController {
 
     scrollView.translatesAutoresizingMaskIntoConstraints = false
 
 
     scrollView.translatesAutoresizingMaskIntoConstraints = false
 

-    textView.backgroundColor = .ui.background
+    textView.backgroundColor = .UI.background

     textView.allowsUndo = true
     textView.delegate = self
     textView.textStorage?.delegate = self
     textView.allowsUndo = true
     textView.delegate = self
     textView.textStorage?.delegate = self


@@ -94,7 +92,7 @@ class MapTextEditorController: NSViewController {
         for range in highlightRanges {
           let nsRange = NSRange(range, in: textStorage.string)
 
         for range in highlightRanges {
           let nsRange = NSRange(range, in: textStorage.string)
 

-          textStorage.addAttribute(.backgroundColor, value: NSColor.syntax.match, range: nsRange)
+          textStorage.addAttribute(.backgroundColor, value: NSColor.Syntax.match, range: nsRange)

         }
 
         textView.needsDisplay = true
         }
 
         textView.needsDisplay = true


@@ -166,77 +164,77 @@ extension MapTextEditorController: NSTextStorageDelegate {
 
     for match in matches {
       textStorage.addAttributes(
 
     for match in matches {
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 1))
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 1))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.number], range: match.range(at: 2))
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 2))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.number], range: match.range(at: 3))
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 3))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.option], range: match.range(at: 4))
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 4))

     }
 
     matches = edgeRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(
     }
 
     matches = edgeRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 1))
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 1))

       let arrowRange = match.range(at: 2)
       textStorage.addAttributes(
       let arrowRange = match.range(at: 2)
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.symbol],
+        [.foregroundColor: NSColor.Syntax.symbol],

         range: NSMakeRange(arrowRange.lowerBound - 1, arrowRange.length + 1))
       textStorage.addAttributes(
         range: NSMakeRange(arrowRange.lowerBound - 1, arrowRange.length + 1))
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 3))
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 3))

     }
 
     matches = opportunityRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(
     }
 
     matches = opportunityRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.option], range: match.range(at: 1))
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 2))
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 2))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.symbol], range: match.range(at: 3))
+        [.foregroundColor: NSColor.Syntax.symbol], range: match.range(at: 3))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.number], range: match.range(at: 4))
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 4))

     }
 
     matches = blockerRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(
     }
 
     matches = blockerRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.option], range: match.range(at: 1))
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 2))
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 2))

     }
 
     matches = noteRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(
     }
 
     matches = noteRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.option], range: match.range(at: 1))
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.number], range: match.range(at: 2))
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 2))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.number], range: match.range(at: 3))
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 3))

     }
 
     matches = stageRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(
     }
 
     matches = stageRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.option], range: match.range(at: 1))
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.number], range: match.range(at: 2))
+        [.foregroundColor: NSColor.Syntax.number], range: match.range(at: 2))

     }
 
     matches = groupRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(
     }
 
     matches = groupRegex.matches(in: textStorage.string, options: [], range: range)
 
     for match in matches {
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.option], range: match.range(at: 1))
+        [.foregroundColor: NSColor.Syntax.option], range: match.range(at: 1))

       textStorage.addAttributes(
       textStorage.addAttributes(

-        [.foregroundColor: NSColor.syntax.vertex], range: match.range(at: 2))
+        [.foregroundColor: NSColor.Syntax.vertex], range: match.range(at: 2))

     }
   }
 }
     }
   }
 }

diff --git a/Map/Presentation/Base Components/SearchBar.swift b/Map/Presentation/Base Components/SearchBar.swift
index 7e921b08123764d66370c90ef260dd2c010807bf..e5182c5818133a0ebc60fb25a20b4c89a1f6200f 100644 (file)
--- a/Map/Presentation/Base Components/SearchBar.swift
+++ b/Map/Presentation/Base Components/SearchBar.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct SearchBar: View {
 import SwiftUI
 
 struct SearchBar: View {


@@ -50,19 +48,19 @@ struct SearchBar: View {
       Spacer()
       Button(action: onPrevious) {
         Image(systemName: "chevron.left")
       Spacer()
       Button(action: onPrevious) {
         Image(systemName: "chevron.left")

-          .font(.theme.smallControl)
+          .font(.Theme.smallControl)

       }.keyboardShortcut(
         "g", modifiers: EventModifiers([.command, .shift])
       ).help("Find Previous (⇧⌘G)")
       Button(action: onNext) {
         Image(systemName: "chevron.right")
       }.keyboardShortcut(
         "g", modifiers: EventModifiers([.command, .shift])
       ).help("Find Previous (⇧⌘G)")
       Button(action: onNext) {
         Image(systemName: "chevron.right")

-          .font(.theme.smallControl)
+          .font(.Theme.smallControl)

       }.keyboardShortcut(
         "g", modifiers: EventModifiers([.command])
       ).help("Find Next (⌘G)")
       Button(action: onDismiss) {
         Text("Done")
       }.keyboardShortcut(
         "g", modifiers: EventModifiers([.command])
       ).help("Find Next (⌘G)")
       Button(action: onDismiss) {
         Text("Done")

-          .font(.theme.smallControl)
+          .font(.Theme.smallControl)

       }.keyboardShortcut(.escape, modifiers: EventModifiers())
         .help("Done (⎋)")
     }.padding(4.0)
       }.keyboardShortcut(.escape, modifiers: EventModifiers())
         .help("Done (⎋)")
     }.padding(4.0)

diff --git a/Map/Presentation/Commands/MapCommands.swift b/Map/Presentation/Commands/MapCommands.swift
index 83c4b273eb60a49459b07feb3a2ade21fad35064..c04cb73f8c4b703098cd75bbff0a27aab9b4b91e 100644 (file)
--- a/Map/Presentation/Commands/MapCommands.swift
+++ b/Map/Presentation/Commands/MapCommands.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct MapCommands: Commands {
 import SwiftUI
 
 struct MapCommands: Commands {

diff --git a/Map/Presentation/Commands/UpdateCommands.swift b/Map/Presentation/Commands/UpdateCommands.swift
index 3a019cc79eda8150fd825d73d3788eb455cc27d8..bfe707817d67f522ae7f9de00b733042ab0bc63b 100644 (file)
--- a/Map/Presentation/Commands/UpdateCommands.swift
+++ b/Map/Presentation/Commands/UpdateCommands.swift
@@ -1,20 +1,18 @@
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Sparkle
 import Sparkle

-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */

 import SwiftUI
 
 struct UpdateCommands: Commands {
 import SwiftUI
 
 struct UpdateCommands: Commands {

diff --git a/Map/Presentation/Complex Components/MapRender/MapRenderView.swift b/Map/Presentation/Complex Components/MapRender/MapRenderView.swift
index 75dde4ccc080d45e72397302024e242ff5e88b8d..1ca1ffeaaa849ffbd612d9014ba1b8535dddb239 100644 (file)
--- a/Map/Presentation/Complex Components/MapRender/MapRenderView.swift
+++ b/Map/Presentation/Complex Components/MapRender/MapRenderView.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Combine
 import CoreData
 import CoreGraphics
 import Combine
 import CoreData
 import CoreGraphics

diff --git a/Map/Presentation/MapEditor.swift b/Map/Presentation/MapEditor.swift
index d7c93dda3ce597fce10ec123b32a3befd71d03f5..d62d4adfea1bf2259247fa32b7bc874defdbf463 100644 (file)
--- a/Map/Presentation/MapEditor.swift
+++ b/Map/Presentation/MapEditor.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// Copyright (C) 2024 Rubén Beltrán del Río
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 struct MapEditor: View {
 import SwiftUI
 
 struct MapEditor: View {


@@ -89,10 +87,10 @@ struct MapEditor: View {
       adaptiveStack {
         ZStack(alignment: .topLeading) {
           MapTextEditor(document: $document, highlightRanges: results, selectedRange: selectedTerm)
       adaptiveStack {
         ZStack(alignment: .topLeading) {
           MapTextEditor(document: $document, highlightRanges: results, selectedRange: selectedTerm)

-            .background(Color.ui.background)
-            .foregroundColor(Color.ui.foreground)
+            .background(Color.UI.background)
+            .foregroundColor(Color.UI.foreground)

             .frame(minHeight: 96.0)
             .frame(minHeight: 96.0)

-        }.padding(.top, 8.0).padding(.leading, 8.0).background(Color.ui.background).cornerRadius(
+        }.padding(.top, 8.0).padding(.leading, 8.0).background(Color.UI.background).cornerRadius(

           5.0)
         GeometryReader { geometry in
           ScrollView([.horizontal, .vertical]) {
           5.0)
         GeometryReader { geometry in
           ScrollView([.horizontal, .vertical]) {


@@ -101,7 +99,7 @@ struct MapEditor: View {
             ).scaleEffect(zoom, anchor: .center).frame(
               width: (Dimensions.mapSize.width + 2 * Dimensions.mapPadding) * zoom,
               height: (Dimensions.mapSize.height + 2 * Dimensions.mapPadding) * zoom)
             ).scaleEffect(zoom, anchor: .center).frame(
               width: (Dimensions.mapSize.width + 2 * Dimensions.mapPadding) * zoom,
               height: (Dimensions.mapSize.height + 2 * Dimensions.mapPadding) * zoom)

-          }.background(Color.ui.background)
+          }.background(Color.UI.background)

             .gesture(
               MagnificationGesture()
                 .onChanged { value in
             .gesture(
               MagnificationGesture()
                 .onChanged { value in


@@ -122,16 +120,16 @@ struct MapEditor: View {
           value: $zoom, in: zoomRange, step: 0.1,
           label: {
             Text(formatZoom(zoom))
           value: $zoom, in: zoomRange, step: 0.1,
           label: {
             Text(formatZoom(zoom))

-              .font(.theme.smallControl)
+              .font(.Theme.smallControl)

           },
           minimumValueLabel: {
             Image(systemName: "minus.magnifyingglass")
           },
           minimumValueLabel: {
             Image(systemName: "minus.magnifyingglass")

-              .font(.theme.smallControl)
+              .font(.Theme.smallControl)

               .help("Zoom Out (⌘-)")
           },
           maximumValueLabel: {
             Image(systemName: "plus.magnifyingglass")
               .help("Zoom Out (⌘-)")
           },
           maximumValueLabel: {
             Image(systemName: "plus.magnifyingglass")

-              .font(.theme.smallControl)
+              .font(.Theme.smallControl)

               .help("Zoom In (⌘+)")
           }
         ).frame(width: 200).padding(.trailing, 10.0)
               .help("Zoom In (⌘+)")
           }
         ).frame(width: 200).padding(.trailing, 10.0)

diff --git a/Map/Presentation/Theme/Color+theme.swift b/Map/Presentation/Theme/Color+theme.swift
index d09fabec6a192e4ef26f591d65a5315bf8f75bd0..feac76ace44b9938ecefc0d43be82524d8ce3586 100644 (file)
--- a/Map/Presentation/Theme/Color+theme.swift
+++ b/Map/Presentation/Theme/Color+theme.swift
@@ -1,23 +1,21 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 extension Color {
 import SwiftUI
 
 extension Color {

-  struct theme {
+  struct Theme {

     static let darkSlate = Color("Dark Slate")
     static let jasperRed = Color("Jasper Red")
     static let olympicBlue = Color("Olympic Blue")
     static let darkSlate = Color("Dark Slate")
     static let jasperRed = Color("Jasper Red")
     static let olympicBlue = Color("Olympic Blue")


@@ -30,24 +28,24 @@ extension Color {
     static let darkerNeutralGray = Color("Darker Neutral Gray")
   }
 
     static let darkerNeutralGray = Color("Darker Neutral Gray")
   }
 

-  struct map {
-    static let labelColor = Color.theme.darkSlate
-    static let axisColor = Color.theme.darkSlate
-    static let vertexColor = Color.theme.darkSlate
-    static let blockerColor = Color.theme.jasperRed
-    static let opportunityColor = Color.theme.olympicBlue
-    static let stageForeground = Color.theme.lightNeutralGray
+  struct Map {
+    static let labelColor = Color.Theme.darkSlate
+    static let axisColor = Color.Theme.darkSlate
+    static let vertexColor = Color.Theme.darkSlate
+    static let blockerColor = Color.Theme.jasperRed
+    static let opportunityColor = Color.Theme.olympicBlue
+    static let stageForeground = Color.Theme.lightNeutralGray

     static let stageBackground = Color.white
     static let groupColors = [
     static let stageBackground = Color.white
     static let groupColors = [

-      Color.theme.olympicBlue,
-      Color.theme.jasperRed,
-      Color.theme.lightPorcelainGreen,
-      Color.theme.naplesYellow,
-      Color.theme.hermosaPink,
+      Color.Theme.olympicBlue,
+      Color.Theme.jasperRed,
+      Color.Theme.lightPorcelainGreen,
+      Color.Theme.naplesYellow,
+      Color.Theme.hermosaPink,

     ]
   }
 
     ]
   }
 

-  struct ui {
+  struct UI {

     static let foreground = Color("Foreground")
     static let background = Color("Background")
   }
     static let foreground = Color("Foreground")
     static let background = Color("Background")
   }

diff --git a/Map/Presentation/Theme/Dimensions.swift b/Map/Presentation/Theme/Dimensions.swift
index ac87c1227cd6e159c84fd0a6b30c1e1a09821dec..99a62073494520020bc77d5004c0ca7211433f38 100644 (file)
--- a/Map/Presentation/Theme/Dimensions.swift
+++ b/Map/Presentation/Theme/Dimensions.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import Foundation
 
 struct Dimensions {
 import Foundation
 
 struct Dimensions {

diff --git a/Map/Presentation/Theme/Font+theme.swift b/Map/Presentation/Theme/Font+theme.swift
index db781c341dfa76ca6fc10fad321bc4e0603603df..1a9abb8811a17edbb4eaa778cee8017d62f8d94f 100644 (file)
--- a/Map/Presentation/Theme/Font+theme.swift
+++ b/Map/Presentation/Theme/Font+theme.swift
@@ -1,23 +1,21 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import SwiftUI
 
 extension Font {
 import SwiftUI
 
 extension Font {

-  public struct theme {
+  public struct Theme {

 
     // Map
     static let note = Font.system(size: 12, design: .serif)
 
     // Map
     static let note = Font.system(size: 12, design: .serif)

diff --git a/Map/Presentation/Theme/NSColor+theme.swift b/Map/Presentation/Theme/NSColor+theme.swift
index f1a046daf3aa2235e31ff2764a80698e0c11420c..61b54984dd012c541f58dc949d8068ecf2422d24 100644 (file)
--- a/Map/Presentation/Theme/NSColor+theme.swift
+++ b/Map/Presentation/Theme/NSColor+theme.swift
@@ -1,23 +1,21 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 import AppKit
 
 extension NSColor {
 import AppKit
 
 extension NSColor {

-  struct syntax {
+  struct Syntax {

     static let vertex = NSColor(named: "Vertex") ?? .textColor
     static let number = NSColor(named: "Number") ?? .textColor
     static let option = NSColor(named: "Option") ?? .textColor
     static let vertex = NSColor(named: "Vertex") ?? .textColor
     static let number = NSColor(named: "Number") ?? .textColor
     static let option = NSColor(named: "Option") ?? .textColor


@@ -27,7 +25,7 @@ extension NSColor {
       0.3)
   }
 
       0.3)
   }
 

-  struct ui {
+  struct UI {

     static let background = NSColor(named: "Background") ?? .windowBackgroundColor
   }
 }
     static let background = NSColor(named: "Background") ?? .windowBackgroundColor
   }
 }

diff --git a/Map/Presentation/ViewStyle.swift b/Map/Presentation/ViewStyle.swift
index e490c4d8b86d7220c0ceb32470ed77adce75b852..f1b7732e28475c2fb20f765df26e52f3a4d690a4 100644 (file)
--- a/Map/Presentation/ViewStyle.swift
+++ b/Map/Presentation/ViewStyle.swift
@@ -1,19 +1,17 @@
-/*
- Copyright (C) 2024 Rubén Beltrán del Río
+// Copyright (C) 2024 Rubén Beltrán del Río

 
 

- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.

 
 

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.

 
 

- You should have received a copy of the GNU General Public License
- along with this program. If not, see https://map.tranquil.systems.
- */
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see https://map.tranquil.systems.

 enum ViewStyle: String {
   case vertical, horizontal
 }
 enum ViewStyle: String {
   case vertical, horizontal
 }