From 7e1daf78165af266940e5d5d2e42b913045600b2 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Mon, 23 Jan 2023 10:38:53 -0800 Subject: [PATCH] refactor: move Highlight to its own file --- damus.xcodeproj/project.pbxproj | 4 ++++ damus/Components/Highlight.swift | 39 ++++++++++++++++++++++++++++++++ damus/Views/EventView.swift | 28 ----------------------- 3 files changed, 43 insertions(+), 28 deletions(-) create mode 100644 damus/Components/Highlight.swift diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj index c84f70a..5a9b6be 100644 --- a/damus.xcodeproj/project.pbxproj +++ b/damus.xcodeproj/project.pbxproj @@ -127,6 +127,7 @@ 4CB8839A297322D200DC99E7 /* DMTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB88399297322D200DC99E7 /* DMTests.swift */; }; 4CBCA930297DB57F00EC6B2F /* WebsiteLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */; }; 4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */; }; + 4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEC297F0B9E00430951 /* Highlight.swift */; }; 4CD7641B28A1641400B6928F /* EndBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7641A28A1641400B6928F /* EndBlock.swift */; }; 4CE4F8CD281352B30009DFBB /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F8CC281352B30009DFBB /* Notifications.swift */; }; 4CE4F9DE2852768D00C00DD9 /* ConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */; }; @@ -349,6 +350,7 @@ 4CB88399297322D200DC99E7 /* DMTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMTests.swift; sourceTree = ""; }; 4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsiteLink.swift; sourceTree = ""; }; 4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuilderEventView.swift; sourceTree = ""; }; + 4CC7AAEC297F0B9E00430951 /* Highlight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Highlight.swift; sourceTree = ""; }; 4CD7641A28A1641400B6928F /* EndBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndBlock.swift; sourceTree = ""; }; 4CE4F8CC281352B30009DFBB /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = ""; }; 4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigView.swift; sourceTree = ""; }; @@ -646,6 +648,7 @@ 4CB8838A296F6E1E00DC99E7 /* NIP05Badge.swift */, 4CB8838C296F710400DC99E7 /* Reposted.swift */, 4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */, + 4CC7AAEC297F0B9E00430951 /* Highlight.swift */, ); path = Components; sourceTree = ""; @@ -916,6 +919,7 @@ 4C75EFAD28049CFB0006080F /* PostButton.swift in Sources */, 4CB55EF5295E679D007FD187 /* UserRelaysView.swift in Sources */, 4C363AA228296A7E006E126D /* SearchView.swift in Sources */, + 4CC7AAED297F0B9E00430951 /* Highlight.swift in Sources */, 4C285C8A2838B985008A31F1 /* ProfilePictureSelector.swift in Sources */, 4C75EFB92804A2740006080F /* EventView.swift in Sources */, 4C7FF7D52823313F009601DB /* Mentions.swift in Sources */, diff --git a/damus/Components/Highlight.swift b/damus/Components/Highlight.swift new file mode 100644 index 0000000..44b3577 --- /dev/null +++ b/damus/Components/Highlight.swift @@ -0,0 +1,39 @@ +// +// Highlight.swift +// damus +// +// Created by William Casarin on 2023-01-23. +// + +import Foundation +import SwiftUI + + +enum Highlight { + case none + case main + case reply + case custom(Color, Float) + + var is_main: Bool { + if case .main = self { + return true + } + return false + } + + var is_none: Bool { + if case .none = self { + return true + } + return false + } + + var is_replied_to: Bool { + switch self { + case .reply: return true + default: return false + } + } +} + diff --git a/damus/Views/EventView.swift b/damus/Views/EventView.swift index 6ae26ba..1c08857 100644 --- a/damus/Views/EventView.swift +++ b/damus/Views/EventView.swift @@ -8,34 +8,6 @@ import Foundation import SwiftUI -enum Highlight { - case none - case main - case reply - case custom(Color, Float) - - var is_main: Bool { - if case .main = self { - return true - } - return false - } - - var is_none: Bool { - if case .none = self { - return true - } - return false - } - - var is_replied_to: Bool { - switch self { - case .reply: return true - default: return false - } - } -} - enum EventViewKind { case small case normal