Skip to content

Commit efd7c8d

Browse files
Minor cleanup, docs polish
1 parent 48ef0c1 commit efd7c8d

File tree

14 files changed

+227
-259
lines changed

14 files changed

+227
-259
lines changed

Alidade.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 159 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Alidade/Extensions/MCMapFormat/MCMapManifestPinColor+SwiftUI.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@ extension CartographyMapPin.Color {
3333
}
3434
}
3535
}
36+
37+
extension CartographyMapPin {
38+
func resolveColor() -> SwiftUI.Color {
39+
self.color?.swiftUIColor ?? .accent
40+
}
41+
}

Alidade/Resources/Alidade.docc/Alidade.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,20 @@ contributors to read through.
7777
### Architecture and View Hierarchy
7878

7979
- <doc:Architecture>
80-
- <doc:LegacyArchitecture>
81-
- ``MCMapsApp``
80+
- ``Alidade``
8281

8382
### Launch experience
84-
- ``DocumentLaunchView-6qz0r``
85-
- ``RecentDocumentsList``
86-
- ``DocumentLaunchViewModel``
83+
- ``DocumentContinuation``
84+
- ``DocumentLaunchView``
85+
- ``DocumentLaunchScene``
8786

8887
### Services
8988

9089
- <doc:Integrations>
91-
- ``CartographyIntegrationService``
90+
- ``CartographyClock``
9291
- ``CartographySearchService``
92+
- ``CartographyIntegrationService``
93+
- ``PasteboardActor``
9394

9495
### Map Ornaments
9596

@@ -103,9 +104,19 @@ contributors to read through.
103104

104105
### Pickers
105106

106-
- ``CartographyMapPinColorPicker``
107107
- ``WorldDimensionPickerView``
108108

109+
### Icons
110+
111+
- ``SemanticIcon``
112+
- ``CartographyIconPicker``
113+
114+
### Command Groups
115+
116+
- ``MapCommands``
117+
- ``HelpCommands``
118+
- ``DebugCommands``
119+
109120
### Tips and Onboarding
110121

111122
- ``LibraryOnboardingTip``
@@ -132,6 +143,4 @@ contributors to read through.
132143

133144
### Settings and Feature Flags
134145

135-
- ``FeatureFlag``
136-
- ``FeatureFlagged``
137146
- ``AlidadeSettingsView``

Alidade/Resources/Alidade.docc/Articles/Architecture.md

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@ Learn and understand Alidade's architecture and view hierarchy.
88

99
## Overview
1010

11-
> Important: To view information about the legacy architecture, refer to
12-
> the <doc:LegacyArchitecture> article.
13-
14-
Under the **Red Window** design, Alidade provides a consistent
15-
architecture and user interface that applies across Mac, iPhone, and iPad.
16-
This article will cover how the app is structured and how it interacts
17-
with other views.
11+
Alidade provides a consistent architecture and user interface that applies
12+
across Mac, iPhone, and iPad. This article will cover how the app is
13+
structured and how it interacts with other views.
1814

1915
### Rationale
2016

@@ -29,18 +25,17 @@ portable views while leveraging what SwiftUI has to offer.
2925

3026
## Entrypoint
3127

32-
Much like the legacy architecture, the main app starts at the
33-
``MCMapsApp`` entrypoint. Here, the ``RedWindowContentView`` is created,
34-
which receives the currently open file as an argument. Information about
35-
the current app state is passed through as an environment object,
36-
``RedWindowEnvironment``. This environment object contains key information
37-
such as which tab route is currently active, what pins should be deleted,
38-
etc:
28+
The main app starts at the ``Alidade`` entrypoint. Here, the
29+
``RedWindowContentView`` is created, which receives the currently open file
30+
as an argument. Information about the current app state is passed through
31+
as an environment object, ``RedWindowEnvironment``. This environment
32+
object contains key information such as which tab route is currently
33+
active, what pins should be deleted, etc:
3934

4035
```swift
4136
import SwiftUI
4237

43-
struct MCMapsApp: App {
38+
struct Alidade: App {
4439
@State private var redWindowEnv = RedWindowEnvironment()
4540
var body: some Scene {
4641
DocumentGroup(...) { configuration in
@@ -51,8 +46,6 @@ struct MCMapsApp: App {
5146
}
5247
```
5348

54-
This effectively replaces the old ``CartographyMapViewModel``.
55-
5649
At this time, any integration services are also set up. For example, the
5750
Bluemap integration service is provided as an environment variable to the
5851
view through the ``SwiftUICore/EnvironmentValues/bluemapService`` key

0 commit comments

Comments
 (0)