Use isNotEmpty from Bedrock

Author: alicerunsonfedora

.swiftlint.yml

@@ -19,7 +19,6 @@ type_body_length:
 file_length:
   warning: 500
   error: 1200
-
 type_name:
   min_length: 3
   max_length:
@@ -39,4 +38,11 @@ identifier_name:
     - id
     - URL
 
-reporter: "xcode"
+custom_rules:
+  prefer_is_not_empty:
+    name: "Prefer Bedrock isNotEmpty"
+    regex: "(\\![a-zA-Z0-9\\_\\.]+\\.isEmpty)"
+    capture_group: 0
+    message: "Prefer to use the isNotEmpty property from Bedrock."
+    severity: warning
+reporter: "xcode"

Alidade.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		9500D89C2F1229FA00B4A633 /* Bedrock in Frameworks */ = {isa = PBXBuildFile; productRef = 9500D89B2F1229FA00B4A633 /* Bedrock */; };
+		9500D89E2F1229FA00B4A633 /* BedrockUI in Frameworks */ = {isa = PBXBuildFile; productRef = 9500D89D2F1229FA00B4A633 /* BedrockUI */; };
 		9504030F2D4D7E0A00F51903 /* CubiomesKit in Frameworks */ = {isa = PBXBuildFile; productRef = 9504030E2D4D7E0A00F51903 /* CubiomesKit */; };
 		95141F562F0874D200DAF47D /* DocumentKit in Frameworks */ = {isa = PBXBuildFile; productRef = 95141F552F0874D200DAF47D /* DocumentKit */; };
 		951FE2BC2D5937630091BE11 /* ViewInspector in Frameworks */ = {isa = PBXBuildFile; productRef = 951FE2BB2D5937630091BE11 /* ViewInspector */; };
@@ -69,10 +71,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				9504030F2D4D7E0A00F51903 /* CubiomesKit in Frameworks */,
+				9500D89E2F1229FA00B4A633 /* BedrockUI in Frameworks */,
 				955A44382D8F47C600262A6D /* AdaptableSidebarSheetView in Frameworks */,
 				95FB72D02DE255630003CC61 /* AlidadeUI in Frameworks */,
 				956603732EA588CC0049C15D /* AlidadeSearchEngine in Frameworks */,
 				955CD1652DAAE1BE007F6FA1 /* CubiomesKit in Frameworks */,
+				9500D89C2F1229FA00B4A633 /* Bedrock in Frameworks */,
 				955A4D682D932A6500262A6D /* DesignLibrary in Frameworks */,
 				95141F562F0874D200DAF47D /* DocumentKit in Frameworks */,
 				95F6B0AD2DADE504006A1B8C /* AsyncAlgorithms in Frameworks */,
@@ -143,6 +147,8 @@
 				956603722EA588CC0049C15D /* AlidadeSearchEngine */,
 				95141F552F0874D200DAF47D /* DocumentKit */,
 				95317F2D2F0B0FB9007BCDA0 /* ImageProcessing */,
+				9500D89B2F1229FA00B4A633 /* Bedrock */,
+				9500D89D2F1229FA00B4A633 /* BedrockUI */,
 			);
 			productName = MCMaps;
 			productReference = 950402CF2D4D522100F51903 /* Alidade.app */;
@@ -214,6 +220,7 @@
 				956603712EA588CC0049C15D /* XCRemoteSwiftPackageReference "searchengine" */,
 				95141F542F0874D200DAF47D /* XCRemoteSwiftPackageReference "DocumentKit" */,
 				95317F2C2F0B0FB9007BCDA0 /* XCRemoteSwiftPackageReference "imageprocessing" */,
+				9500D89A2F1229FA00B4A633 /* XCRemoteSwiftPackageReference "bedrock" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 950402D02D4D522100F51903 /* Products */;
@@ -635,6 +642,14 @@
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCRemoteSwiftPackageReference section */
+		9500D89A2F1229FA00B4A633 /* XCRemoteSwiftPackageReference "bedrock" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://source.marquiskurt.net/marquiskurt/bedrock";
+			requirement = {
+				branch = main;
+				kind = branch;
+			};
+		};
 		95141F542F0874D200DAF47D /* XCRemoteSwiftPackageReference "DocumentKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://source.marquiskurt.net/marquiskurt/DocumentKit";
@@ -710,6 +725,16 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		9500D89B2F1229FA00B4A633 /* Bedrock */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9500D89A2F1229FA00B4A633 /* XCRemoteSwiftPackageReference "bedrock" */;
+			productName = Bedrock;
+		};
+		9500D89D2F1229FA00B4A633 /* BedrockUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9500D89A2F1229FA00B4A633 /* XCRemoteSwiftPackageReference "bedrock" */;
+			productName = BedrockUI;
+		};
 		9504030E2D4D7E0A00F51903 /* CubiomesKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = CubiomesKit;

MCMaps.xcodeproj/project.pbxproj

@@ -5,6 +5,7 @@
 //  Created by Marquis Kurt on 19-06-2025.
 //
 
+import Bedrock
 import ImageProcessing
 import MCMap
 import SwiftUI
@@ -41,7 +42,7 @@ struct RedWindowPinGalleryCell: RedWindowDetailCell {
                 .bold()
                 .padding(.top)
                 .fontDesign(.serif)
-            if let images = pin.images, !images.isEmpty {
+            if let images = pin.images, images.isNotEmpty {
                 ScrollView(.horizontal) {
                     HStack {
                         ForEach(Array(images), id: \.self) { image in

MCMaps/Red Window/Views/Detail/Cells/RedWindowPinGalleryCell.swift

@@ -5,6 +5,7 @@
 //  Created by Marquis Kurt on 19-06-2025.
 //
 
+import Bedrock
 import MCMap
 import SwiftUI
 
@@ -28,7 +29,7 @@ struct RedWindowPinTagsCell: RedWindowDetailCell {
                 .font(.system(.title3, design: .serif))
                 .bold()
                 .padding(.top)
-            if let tags = pin.tags, !tags.isEmpty {
+            if let tags = pin.tags, tags.isNotEmpty {
                 ScrollView(.horizontal) {
                     HStack {
                         ForEach(Array(tags), id: \.self) { tag in

MCMaps/Red Window/Views/Detail/Cells/RedWindowPinTagsCell.swift

@@ -5,6 +5,7 @@
 //  Created by Marquis Kurt on 15-06-2025.
 //
 
+import Bedrock
 import CubiomesKit
 import MCMap
 import PhotosUI
@@ -61,7 +62,7 @@ struct RedWindowPinDetailView: View {
                     Group {
                         RedWindowDescriptionCell(pin: $pin, isEditing: $editMode, file: $file)
                         if !editMode {
-                            if !tags.isEmpty {
+                            if tags.isNotEmpty {
                                 RedWindowPinTagsCell(pin: $pin, isEditing: $editMode, file: $file)
                             }
                             RedWindowPositionCell(pin: $pin, isEditing: $editMode, file: $file)

MCMaps/Red Window/Views/Detail/RedWindowPinDetailView.swift

@@ -5,6 +5,7 @@
 //  Created by Marquis Kurt on 16-06-2025.
 //
 
+import Bedrock
 import CubiomesKit
 import MCMap
 import SwiftUI
@@ -56,7 +57,7 @@ struct RedWindowPinLibraryListView: View {
             TableColumn("Dimension", value: \.content.dimension.rawValue.localizedCapitalized)
             TableColumn("Tags") { val in
                 Group {
-                    if let tags = val.content.tags, !tags.isEmpty {
+                    if let tags = val.content.tags, tags.isNotEmpty {
                         ViewThatFits {
                             HStack {
                                 ForEach(Array(tags), id: \.self) { tag in

MCMaps/Red Window/Views/Library/RedWindowPinLibraryListView.swift

@@ -5,6 +5,7 @@
 //  Created by Marquis Kurt on 19-06-2025.
 //
 
+import Bedrock
 import SwiftUI
 
 struct RedWindowTagForm: View {
@@ -23,7 +24,7 @@ struct RedWindowTagForm: View {
                 HStack {
                     TextField("Create Tag", text: $tagToAdd, prompt: Text("Tag Name"))
                         .onSubmit(submitTag)
-                    if !tagToAdd.isEmpty {
+                    if tagToAdd.isNotEmpty {
                         Button("Create", action: submitTag)
                     }
                 }
@@ -58,7 +59,7 @@ struct RedWindowTagForm: View {
         .toolbar {
             #if os(iOS)
                 ToolbarItem {
-                    if !tags.isEmpty {
+                    if tags.isNotEmpty {
                         EditButton()
                     }
                 }

MCMaps/Red Window/Views/RedWindowTagForm.swift

@@ -8,18 +8,6 @@
 import Foundation
 
 extension CGPoint {
-    /// Returns the distance between two points using the Manhattan/taxicab algorithm.
-    ///
-    /// This is typically used to calculate the distance between two locations by a measure of Minecraft blocks rather
-    /// than a raw distance.
-    /// 
-    /// - Parameter other: The endpoint to get the distance to from the current point.
-    func manhattanDistance(to other: CGPoint) -> Double {
-        let deltaX = self.x - other.x
-        let deltaY = self.y - other.y
-        return abs(deltaX) + abs(deltaY)
-    }
-
     /// A human-readable readout for accessibility purposes.
     var accessibilityReadout: String {
         let xVal = Int(x)

MCMaps/Shared/Extensions/CGPoint+Manhattan.swift

@@ -5,25 +5,26 @@
 //  Created by Marquis Kurt on 13-06-2025.
 //
 
+import Bedrock
 import SwiftUI
 
 extension MCMapsApp {
     /// The app's display name as it appears in the Info.plist file.
     static var appName: String {
-        Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String ?? ""
+        Bundle.main.appInformation?.name ?? ""
     }
 
     /// The app's main version as it appears in the Info.plist file.
     static var version: String {
-        Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "0.0"
+        Bundle.main.appInformation?.version ?? "0.0"
     }
 
     /// The app's build number as it appears in the Info.plist file.
     static var buildNumber: String {
-        Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "0"
+        Bundle.main.appInformation?.buildNumber ?? "0"
     }
 
     static var copyrightString: String {
-        Bundle.main.infoDictionary?["NSHumanReadableCopyright"] as? String ?? ""
+        Bundle.main.appInformation?.copyrightString as? String ?? ""
     }
 }