More migrations to Bedrock

Author: alicerunsonfedora

Alidade.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,14 +5,15 @@
 //  Created by Marquis Kurt on 16-06-2025.
 //
 
+import BedrockUI
 import MCMap
 import SwiftUI
 
 /// An enumeration representing all the available tab routes in the app.
 ///
 /// This routing system works in conjunction with the new designs via Red Window to provide programmatic navigation.
 /// Tabs and navigation links should supply this value to enable routing accordingly.
-enum RedWindowRoute: Identifiable, Hashable {
+enum RedWindowRoute: Identifiable {
     /// A unique identifier for the current route.
     var id: Self { self }
 
@@ -52,9 +53,9 @@ extension RedWindowRoute: CaseIterable {
     }
 }
 
-extension RedWindowRoute {
+extension RedWindowRoute: TabRoute {
     /// The localized name for the route.
-    var name: LocalizedStringKey {
+    var nameKey: LocalizedStringResource {
         switch self {
         case .map: "Map"
         case .worldEdit: "World"
@@ -78,4 +79,12 @@ extension RedWindowRoute {
         case .pin: "mappin"
         }
     }
+
+    var name: String {
+        String(localized: nameKey)
+    }
+
+    var icon: TabRouteIcon {
+        .system(symbol)
+    }
 }

MCMaps/Red Window/Extensions/Tab+RedWindowRoute.swift

@@ -108,7 +108,7 @@ struct RedWindowContentView: View {
             }
 
             TabSection("Library") {
-                Tab(route: .allPins) {
+                Tab(route: RedWindowRoute.allPins) {
                     RedWindowPinLibraryView(file: $file, path: $libraryNavigationPath)
                 }
                 .customizationID("app.tab.library.all_pins")

MCMaps/Red Window/Routing/RedWindowRoute.swift

@@ -14,7 +14,7 @@ struct DocumentLaunchScene: Scene {
 
     var body: some Scene {
         #if os(macOS)
-            DocumentLaunchView(MCMapsApp.appName, creating: CartographyMapFile(withManifest: .sampleFile)) {
+            DocumentLaunchView(MCMapsApp.information.name, creating: CartographyMapFile(withManifest: .sampleFile)) {
                 EmptyView()
             } background: {
                 Image(.packMcmeta)

MCMaps/Red Window/Views/RedWindowContentView.swift

@@ -30,8 +30,8 @@ struct MCMapsApp: App {
     @State private var redWindowEnvironment = RedWindowEnvironment()
 
     init() {
-        UserDefaults.standard.set(Self.version, forKey: "CFBundleShortVersionString")
-        UserDefaults.standard.set(Self.buildNumber, forKey: "CFBundleVersion")
+        UserDefaults.standard.set(Self.information.version, forKey: "CFBundleShortVersionString")
+        UserDefaults.standard.set(Self.information.buildNumber, forKey: "CFBundleVersion")
         UserDefaults.standard.synchronize()
         do {
             try Tips.configure()
@@ -82,13 +82,13 @@ struct MCMapsApp: App {
                     .labelsVisibility(.visible)
             }
             CommandGroup(replacing: .help) {
-                Link("\(Self.appName) Help", destination: URL(appLink: .help)!)
+                Link("\(Self.information.name) Help", destination: URL(appLink: .help)!)
                 Divider()
                 if let docs = URL(appLink: .docs) {
-                    Link("View \(Self.appName) Documentation", destination: docs)
+                    Link("View \(Self.information.name) Documentation", destination: docs)
                 }
                 if let feedback = URL(appLink: .issues) {
-                    Link("Send \(Self.appName) Feedback", destination: feedback)
+                    Link("Send \(Self.information.name) Feedback", destination: feedback)
                 }
             }
             CommandGroup(after: .pasteboard) {
@@ -122,12 +122,12 @@ struct MCMapsApp: App {
         #if os(macOS)
             .commands {
                 CommandGroup(replacing: .appInfo) {
-                    Button("About \(Self.appName)") {
+                    Button("About \(Self.information.name)") {
                         openWindow(id: .about)
                     }
                 }
                 CommandGroup(after: .windowArrangement) {
-                    Button("Welcome to \(Self.appName)") {
+                    Button("Welcome to \(Self.information.name)") {
                         openWindow(id: .launch)
                     }
                     .keyboardShortcut("0", modifiers: [.shift, .command])
@@ -159,7 +159,7 @@ struct MCMapsApp: App {
         DocumentLaunchScene(proxyMap: $proxyMap)
 
         #if os(macOS)
-            Window("About \(Self.appName)", id: "about") {
+            Window("About \(Self.information.name)", id: "about") {
                 AboutWindowView()
                     .containerBackground(.thickMaterial, for: .window)
             }

MCMaps/Shared/DocumentLaunchExperience.swift

@@ -5,6 +5,7 @@
 //  Created by Marquis Kurt on 15-03-2025.
 //
 
+import BedrockUI
 import SwiftUI
 
 /// A view for displaying information about the current app.
@@ -18,7 +19,7 @@ struct AboutWindowView: View {
         static let paneWidth: Double = 300.0
     }
     private var version: String {
-        return String(localized: "v\(MCMapsApp.version) (Build \(MCMapsApp.buildNumber))")
+        return String(localized: "v\(MCMapsApp.information.version) (Build \(MCMapsApp.information.buildNumber))")
     }
 
     @State private var creditsPane: AttributedString?
@@ -31,13 +32,13 @@ struct AboutWindowView: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: Constants.appIconSize, height: Constants.appIconSize)
-                    Text(MCMapsApp.appName)
+                    Text(MCMapsApp.information.name)
                         .font(.title)
                         .bold()
                     Text(version)
                         .font(.headline)
                         .foregroundStyle(.secondary)
-                    Text(MCMapsApp.copyrightString)
+                    Text(MCMapsApp.information.copyrightString)
                         .foregroundStyle(.tertiary)
                         .padding(.top, 4)
                 }

MCMaps/Shared/Entrypoint.swift

@@ -10,22 +10,7 @@ import Testing
 
 @testable import Alidade
 
-struct PointSet {
-    let source: CGPoint
-    let destination: CGPoint
-}
-
 struct CGPointTests {
-    @Test(arguments: [
-        (PointSet(source: .init(x: 1, y: 1), destination: .init(x: 4, y: 5)), 7.0),
-        (PointSet(source: .init(x: 1, y: 2), destination: .init(x: 3, y: 3)), 3.0),
-        (PointSet(source: .init(x: 4, y: 2), destination: .init(x: 4, y: 2)), 0.0),
-    ])
-    func manhattanDistance(points: PointSet, distance: Double) async throws {
-        let diff = points.source.manhattanDistance(to: points.destination)
-        #expect(diff == distance)
-    }
-
     @Test func accessibilityReadout() async throws {
         let point = CGPoint(x: 1847, y: 1847)
         #expect(point.accessibilityReadout == "1,847, 1,847")