commit ad7a79c2bb6c661c49bdbf4d87fd07858d8c39af
parent eaec3ae011f75138dde3b2187bbb9ddfce2548ef
Author: Terry Yiu <963907+tyiu@users.noreply.github.com>
Date: Mon, 17 Apr 2023 03:18:49 +0200
Fix typo on ParticipantsView.swift file name
Closes: #945
Diffstat:
3 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj
@@ -278,7 +278,7 @@
F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */; };
F79C7FAD29D5E9620000F946 /* EditProfilePictureControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = F79C7FAC29D5E9620000F946 /* EditProfilePictureControl.swift */; };
F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */; };
- F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA262978E54D009531F3 /* ParicipantsView.swift */; };
+ F7F0BA272978E54D009531F3 /* ParticipantsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA262978E54D009531F3 /* ParticipantsView.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -688,7 +688,7 @@
F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIPURLBuilder.swift; sourceTree = "<group>"; };
F79C7FAC29D5E9620000F946 /* EditProfilePictureControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProfilePictureControl.swift; sourceTree = "<group>"; };
F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeToDismiss.swift; sourceTree = "<group>"; };
- F7F0BA262978E54D009531F3 /* ParicipantsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParicipantsView.swift; sourceTree = "<group>"; };
+ F7F0BA262978E54D009531F3 /* ParticipantsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParticipantsView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -926,7 +926,7 @@
4C3AC7A42836987600E1F516 /* MainTabView.swift */,
4C363A8B28236B92006E126D /* PubkeyView.swift */,
4CACA9D4280C31E100D9BBE8 /* ReplyView.swift */,
- F7F0BA262978E54D009531F3 /* ParicipantsView.swift */,
+ F7F0BA262978E54D009531F3 /* ParticipantsView.swift */,
4C285C8D28399BFD008A31F1 /* SaveKeysView.swift */,
4C3AC7A628369BA200E1F516 /* SearchHomeView.swift */,
4C5C7E69284EDE2E00A22DF5 /* SearchResultsView.swift */,
@@ -1529,7 +1529,7 @@
4C477C9E282C3A4800033AA3 /* TipCounter.swift in Sources */,
4C3D52B6298DB4E6001C5831 /* ZapEvent.swift in Sources */,
647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */,
- F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */,
+ F7F0BA272978E54D009531F3 /* ParticipantsView.swift in Sources */,
4C0A3F91280F6528000448DE /* ChatView.swift in Sources */,
4CF0ABE32981BC7D00D66079 /* UserView.swift in Sources */,
4CE0E2AF29A2E82100DB4CA2 /* EventHolder.swift in Sources */,
diff --git a/damus/Views/ParicipantsView.swift b/damus/Views/ParicipantsView.swift
@@ -1,92 +0,0 @@
-//
-// ParicipantsView.swift
-// damus
-//
-// Created by Joel Klabo on 1/18/23.
-//
-
-import SwiftUI
-
-struct ParticipantsView: View {
-
- let damus_state: DamusState
-
- @Binding var references: [ReferencedId]
- @Binding var originalReferences: [ReferencedId]
-
- var body: some View {
- VStack {
- Text("Replying to", comment: "Text indicating that the view is used for editing which participants are replied to in a note.")
- .font(.headline)
- HStack {
- Spacer()
-
- Button {
- // Remove all "p" refs, keep "e" refs
- references = originalReferences.eRefs
- } label: {
- Text("Remove all", comment: "Button label to remove all participants from a note reply.")
- }
- .font(.system(size: 14, weight: .bold))
- .frame(width: 100, height: 30)
- .foregroundColor(.white)
- .background(LINEAR_GRADIENT)
- .clipShape(Capsule())
-
- Button {
- references = originalReferences
- } label: {
- Text("Add all", comment: "Button label to re-add all original participants as profiles to reply to in a note")
- }
- .font(.system(size: 14, weight: .bold))
- .frame(width: 80, height: 30)
- .foregroundColor(.white)
- .background(LINEAR_GRADIENT)
- .clipShape(Capsule())
-
- Spacer()
- }
- VStack {
- ScrollView {
- ForEach(originalReferences.pRefs) { participant in
- let pubkey = participant.id
- HStack {
- ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
-
- VStack(alignment: .leading) {
- let profile = damus_state.profiles.lookup(id: pubkey)
- ProfileName(pubkey: pubkey, profile: profile, damus: damus_state, show_friend_confirmed: false, show_nip5_domain: false)
- if let about = profile?.about {
- Text(FollowUserView.markdown.process(about))
- .lineLimit(3)
- .font(.footnote)
- }
- }
-
- Spacer()
-
- Image(systemName: "checkmark.circle.fill")
- .font(.system(size: 30))
- .foregroundColor(references.contains(participant) ? DamusColors.purple : .gray)
- }
- .onTapGesture {
- if references.contains(participant) {
- references = references.filter {
- $0 != participant
- }
- } else {
- if references.contains(participant) {
- // Don't add it twice
- } else {
- references.append(participant)
- }
- }
- }
- }
- }
- }
- Spacer()
- }
- .padding()
- }
-}
diff --git a/damus/Views/ParticipantsView.swift b/damus/Views/ParticipantsView.swift
@@ -0,0 +1,92 @@
+//
+// ParticipantsView.swift
+// damus
+//
+// Created by Joel Klabo on 1/18/23.
+//
+
+import SwiftUI
+
+struct ParticipantsView: View {
+
+ let damus_state: DamusState
+
+ @Binding var references: [ReferencedId]
+ @Binding var originalReferences: [ReferencedId]
+
+ var body: some View {
+ VStack {
+ Text("Replying to", comment: "Text indicating that the view is used for editing which participants are replied to in a note.")
+ .font(.headline)
+ HStack {
+ Spacer()
+
+ Button {
+ // Remove all "p" refs, keep "e" refs
+ references = originalReferences.eRefs
+ } label: {
+ Text("Remove all", comment: "Button label to remove all participants from a note reply.")
+ }
+ .font(.system(size: 14, weight: .bold))
+ .frame(width: 100, height: 30)
+ .foregroundColor(.white)
+ .background(LINEAR_GRADIENT)
+ .clipShape(Capsule())
+
+ Button {
+ references = originalReferences
+ } label: {
+ Text("Add all", comment: "Button label to re-add all original participants as profiles to reply to in a note")
+ }
+ .font(.system(size: 14, weight: .bold))
+ .frame(width: 80, height: 30)
+ .foregroundColor(.white)
+ .background(LINEAR_GRADIENT)
+ .clipShape(Capsule())
+
+ Spacer()
+ }
+ VStack {
+ ScrollView {
+ ForEach(originalReferences.pRefs) { participant in
+ let pubkey = participant.id
+ HStack {
+ ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
+
+ VStack(alignment: .leading) {
+ let profile = damus_state.profiles.lookup(id: pubkey)
+ ProfileName(pubkey: pubkey, profile: profile, damus: damus_state, show_friend_confirmed: false, show_nip5_domain: false)
+ if let about = profile?.about {
+ Text(FollowUserView.markdown.process(about))
+ .lineLimit(3)
+ .font(.footnote)
+ }
+ }
+
+ Spacer()
+
+ Image(systemName: "checkmark.circle.fill")
+ .font(.system(size: 30))
+ .foregroundColor(references.contains(participant) ? DamusColors.purple : .gray)
+ }
+ .onTapGesture {
+ if references.contains(participant) {
+ references = references.filter {
+ $0 != participant
+ }
+ } else {
+ if references.contains(participant) {
+ // Don't add it twice
+ } else {
+ references.append(participant)
+ }
+ }
+ }
+ }
+ }
+ }
+ Spacer()
+ }
+ .padding()
+ }
+}
