Refactor annotation label view into shared package

Move AnnotationLabelView into STAnnotationsPluginShared so it can be used by both AppKit and UIKit demo apps. Rename it to STAnnotationLabelView for consistency with other public types in the package. Update the view to take an action closure that is invoked when the annotation is tapped, allowing the demo apps to remove the tapped annotation. Simplify the container shape to use a standard RoundedRectangle. Remove the now unused AnnotationLabelView files from the demo app projects.
krzyzanowskim · Dec 14, 2024 · e6f43de · e6f43de
1 parent f561618
commit e6f43de
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 137 deletions.
diff --git a/DemoApp.AppKit/DemoApp.AppKit.xcodeproj/project.pbxproj b/DemoApp.AppKit/DemoApp.AppKit.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		752C90732AB1AF12006C835E /* AnnotationLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752C90722AB1AF12006C835E /* AnnotationLabelView.swift */; };
 		7565EBBE2A9BE09D0005B170 /* EditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7565EBBD2A9BE09D0005B170 /* EditorViewController.swift */; };
 		7565EBC12A9BE0B10005B170 /* STTextView in Frameworks */ = {isa = PBXBuildFile; productRef = 7565EBC02A9BE0B10005B170 /* STTextView */; };
 		7576EDCD2AB062F400540BF5 /* STTextViewAnnotationsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 7576EDCC2AB062F400540BF5 /* STTextViewAnnotationsPlugin */; };
@@ -17,7 +16,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		752C90722AB1AF12006C835E /* AnnotationLabelView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnnotationLabelView.swift; sourceTree = "<group>"; };
 		7565EBBD2A9BE09D0005B170 /* EditorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorViewController.swift; sourceTree = "<group>"; };
 		7576EDCA2AB0627D00540BF5 /* STTextView-Plugin-Annotations */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "STTextView-Plugin-Annotations"; path = ..; sourceTree = "<group>"; };
 		758BAB4F2A9BDFC200D840BF /* DemoApp.AppKit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemoApp.AppKit.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -51,7 +49,6 @@
 			isa = PBXGroup;
 			children = (
 				7576EDCA2AB0627D00540BF5 /* STTextView-Plugin-Annotations */,
-				7590AFEA2B64617E00947F82 /* View */,
 				7565EBBD2A9BE09D0005B170 /* EditorViewController.swift */,
 				758BAB522A9BDFC200D840BF /* AppDelegate.swift */,
 				758BAB542A9BDFC300D840BF /* Assets.xcassets */,
@@ -70,14 +67,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		7590AFEA2B64617E00947F82 /* View */ = {
-			isa = PBXGroup;
-			children = (
-				752C90722AB1AF12006C835E /* AnnotationLabelView.swift */,
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -156,7 +145,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				758BAB532A9BDFC200D840BF /* AppDelegate.swift in Sources */,
-				752C90732AB1AF12006C835E /* AnnotationLabelView.swift in Sources */,
 				7565EBBE2A9BE09D0005B170 /* EditorViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/DemoApp.AppKit/EditorViewController.swift b/DemoApp.AppKit/EditorViewController.swift
@@ -74,7 +74,7 @@ extension EditorViewController: STAnnotationsDataSource {
         }
 
         return STAnnotationView(frame: proposedViewFrame) {
-            AnnotationLabelView(Text(lineAnnotation.message), annotation: lineAnnotation) { [weak self] annotation in
+            STAnnotationLabelView(Text(lineAnnotation.message), annotation: lineAnnotation) { [weak self] annotation in
                 // Remove annotation
                 self?.annotations.removeAll(where: { $0.id == annotation.id })
             }

diff --git a/DemoApp.UIKit/DemoApp.UIKit.xcodeproj/project.pbxproj b/DemoApp.UIKit/DemoApp.UIKit.xcodeproj/project.pbxproj
@@ -14,7 +14,6 @@
 		3E8504C52C991A98004DC5CC /* Base in Resources */ = {isa = PBXBuildFile; fileRef = 3E8504C42C991A98004DC5CC /* Base */; };
 		3E8504C72C991A99004DC5CC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3E8504C62C991A99004DC5CC /* Assets.xcassets */; };
 		3E8504CA2C991A99004DC5CC /* Base in Resources */ = {isa = PBXBuildFile; fileRef = 3E8504C92C991A99004DC5CC /* Base */; };
-		3EB326C72C991D4D00F5C862 /* AnnotationLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EB326C62C991D4900F5C862 /* AnnotationLabelView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -26,7 +25,6 @@
 		3E8504C62C991A99004DC5CC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		3E8504C92C991A99004DC5CC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		3E8504CB2C991A99004DC5CC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		3EB326C62C991D4900F5C862 /* AnnotationLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnnotationLabelView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -44,7 +42,6 @@
 		3E8504B12C991A98004DC5CC = {
 			isa = PBXGroup;
 			children = (
-				3EB326C52C991D3C00F5C862 /* View */,
 				3E8504BD2C991A98004DC5CC /* AppDelegate.swift */,
 				3E8504BF2C991A98004DC5CC /* SceneDelegate.swift */,
 				3E8504C12C991A98004DC5CC /* ViewController.swift */,
@@ -64,14 +61,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		3EB326C52C991D3C00F5C862 /* View */ = {
-			isa = PBXGroup;
-			children = (
-				3EB326C62C991D4900F5C862 /* AnnotationLabelView.swift */,
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -150,7 +139,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				3E8504C22C991A98004DC5CC /* ViewController.swift in Sources */,
-				3EB326C72C991D4D00F5C862 /* AnnotationLabelView.swift in Sources */,
 				3E8504BE2C991A98004DC5CC /* AppDelegate.swift in Sources */,
 				3E8504C02C991A98004DC5CC /* SceneDelegate.swift in Sources */,
 			);

diff --git a/DemoApp.UIKit/View/AnnotationLabelView.swift b/DemoApp.UIKit/View/AnnotationLabelView.swift
diff --git a/DemoApp.UIKit/ViewController.swift b/DemoApp.UIKit/ViewController.swift
@@ -3,6 +3,7 @@ import UIKit
 
 import STTextView
 import STAnnotationsPlugin
+import STAnnotationsPluginShared
 
 class ViewController: UIViewController {
 
@@ -105,8 +106,11 @@ extension ViewController: STAnnotationsDataSource {
         }
 
         return STAnnotationView(frame: proposedViewFrame) {
-            AnnotationLabelView(Text(lineAnnotation.message), annotation: lineAnnotation, textWidth: proposedViewFrame.width, textHeight: proposedViewFrame.height)
-                .font(.body)
+            STAnnotationLabelView(Text(lineAnnotation.message), annotation: lineAnnotation) { annotation in
+                // Remove annotation
+                self.annotations.removeAll(where: { $0.id == annotation.id })
+            }
+            .font(.body)
         }
     }
 

diff --git a/...App.AppKit/View/AnnotationLabelView.swift → ...sPluginShared/STAnnotationLabelView.swift b/...App.AppKit/View/AnnotationLabelView.swift → ...sPluginShared/STAnnotationLabelView.swift
@@ -4,22 +4,21 @@
 import SwiftUI
 import Foundation
 import STTextView
-import STAnnotationsPlugin
 
-struct AnnotationLabelView : View {
+public struct STAnnotationLabelView: View {
     @Environment(\.colorScheme) private var colorScheme
 
     private let text: Text
     private let annotation: STMessageLineAnnotation
     private let action: (STMessageLineAnnotation) -> Void
 
-    init(_ text: Text, annotation: STMessageLineAnnotation, action: @escaping (STMessageLineAnnotation) -> Void) {
+    public init(_ text: Text, annotation: STMessageLineAnnotation, action: @escaping (STMessageLineAnnotation) -> Void) {
         self.text = text
         self.action = action
         self.annotation = annotation
     }
 
-    var body: some View {
+    public var body: some View {
         Label {
             text
                 .foregroundColor(.primary)
@@ -56,10 +55,7 @@ struct AnnotationLabelView : View {
             }
         )
         .containerShape(
-            UnevenRoundedRectangle(
-                cornerRadii: RectangleCornerRadii(topLeading: 2, bottomLeading: 2),
-                style: .circular
-            )
+            RoundedRectangle(cornerRadius: 2, style: .circular)
         )
     }
 }