Revert "Fix tap area when mentioning users"

This reverts commit a2cd51b6e7.
This commit is contained in:
William Casarin
2023-04-14 11:36:38 -07:00
parent 042e02d2e4
commit 735376b00f
3 changed files with 14 additions and 26 deletions

View File

@@ -12,24 +12,22 @@ struct UserView: View {
let pubkey: String
var body: some View {
VStack {
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(about)
.lineLimit(3)
.font(.footnote)
}
NavigationLink(destination: ProfileView(damus_state: damus_state, pubkey: pubkey)) {
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(about)
.lineLimit(3)
.font(.footnote)
}
Spacer()
}
Spacer()
}
.buttonStyle(PlainButtonStyle())
}
}

View File

@@ -12,20 +12,10 @@ struct FollowUserView: View {
let damus_state: DamusState
static let markdown = Markdown()
@State var navigating: Bool = false
var body: some View {
let dest = ProfileView(damus_state: damus_state, pubkey: target.pubkey)
NavigationLink(destination: dest, isActive: $navigating) {
EmptyView()
}
HStack {
UserView(damus_state: damus_state, pubkey: target.pubkey)
.contentShape(Rectangle())
.onTapGesture {
navigating = true
}
FollowButtonView(target: target, follows_you: false, follow_state: damus_state.contacts.follow_state(target.pubkey))
}
@@ -43,9 +33,10 @@ struct FollowersView: View {
LazyVStack(alignment: .leading) {
ForEach(followers.contacts ?? [], id: \.self) { pk in
FollowUserView(target: .pubkey(pk), damus_state: damus_state)
Divider()
}
}
.padding(.horizontal)
.padding()
}
.navigationBarTitle(NSLocalizedString("Followers", comment: "Navigation bar title for view that shows who is following a user."))
.onAppear {

View File

@@ -81,7 +81,6 @@ struct UserSearch: View {
} else {
ForEach(users) { user in
UserView(damus_state: damus_state, pubkey: user.pubkey)
.contentShape(Rectangle())
.onTapGesture {
on_user_tapped(user: user)
}