tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ... when too many likes/reposts

Browse Source 
Closes: #351
Changelog-Fixed: Fix ... when too many likes/reposts
This commit is contained in:
Joel Klabo
2023-01-19 22:18:48 -08:00
committed by William Casarin
parent 1154cec719
commit 11e0a87f06
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
damus/Views/ActionBar/EventActionBar.swift
View File

@@ -33,10 +33,9 @@ struct EventActionBar: View {
EventActionButton(img: "bubble.left", col: nil) { EventActionButton(img: "bubble.left", col: nil) {
notify(.reply, event) notify(.reply, event)
} }
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
} }
Spacer()
HStack(alignment: .bottom) { ZStack {
EventActionButton(img: "arrow.2.squarepath", col: bar.boosted ? Color.green : nil) { EventActionButton(img: "arrow.2.squarepath", col: bar.boosted ? Color.green : nil) {
if bar.boosted { if bar.boosted {
@@ -44,51 +43,31 @@ struct EventActionBar: View {
} else if damus_state.is_privkey_user { } else if damus_state.is_privkey_user {
self.confirm_boost = true self.confirm_boost = true
} }
}.overlay {
Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
.offset(x: 22)
.font(.footnote.weight(.medium))
.foregroundColor(bar.boosted ? Color.green : Color.gray)
} }
Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
.offset(x: 18)
.font(.footnote.weight(.medium))
.foregroundColor(bar.boosted ? Color.green : Color.gray)
} }
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading) Spacer()
ZStack {
HStack(alignment: .bottom) {
LikeButton(liked: bar.liked) { LikeButton(liked: bar.liked) {
if bar.liked { if bar.liked {
notify(.delete, bar.our_like) notify(.delete, bar.our_like)
} else { } else {
send_like() send_like()
} }
}.overlay {
Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
.offset(x: 22)
.font(.footnote.weight(.medium))
.foregroundColor(bar.liked ? Color.accentColor : Color.gray)
} }
Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
.offset(x: 22)
.font(.footnote.weight(.medium))
.foregroundColor(bar.liked ? Color.accentColor : Color.gray)
} }
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading) Spacer()
EventActionButton(img: "square.and.arrow.up", col: Color.gray) { EventActionButton(img: "square.and.arrow.up", col: Color.gray) {
show_share_sheet = true show_share_sheet = true
} }
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
/*
HStack(alignment: .bottom) {
Text("\(bar.tips > 0 ? "\(bar.tips)" : "")")
.font(.footnote)
.foregroundColor(bar.tipped ? Color.orange : Color.gray)
EventActionButton(img: bar.tipped ? "bitcoinsign.circle.fill" : "bitcoinsign.circle", col: bar.tipped ? Color.orange : nil) {
if bar.tipped {
//notify(.delete, bar.our_tip)
} else {
//notify(.boost, event)
}
}
}
*/
} }
.sheet(isPresented: $show_share_sheet) { .sheet(isPresented: $show_share_sheet) {
if let note_id = bech32_note_id(event.id) { if let note_id = bech32_note_id(event.id) {
@@ -177,8 +156,8 @@ struct EventActionBar_Previews: PreviewProvider {
let ev = NostrEvent(content: "hi", pubkey: pk) let ev = NostrEvent(content: "hi", pubkey: pk)
let bar = ActionBarModel(likes: 0, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil) let bar = ActionBarModel(likes: 0, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
let likedbar = ActionBarModel(likes: 10, boosts: 0, tips: 0, our_like: nil, our_boost: nil, our_tip: nil) let likedbar = ActionBarModel(likes: 10, boosts: 10, tips: 0, our_like: nil, our_boost: nil, our_tip: nil)
let likedbar_ours = ActionBarModel(likes: 10, boosts: 0, tips: 0, our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: nil, our_tip: nil) let likedbar_ours = ActionBarModel(likes: 100, boosts: 100, tips: 0, our_like: NostrEvent(id: "", content: "", pubkey: ""), our_boost: nil, our_tip: nil)
VStack(spacing: 50) { VStack(spacing: 50) {
EventActionBar(damus_state: ds, event: ev, bar: bar) EventActionBar(damus_state: ds, event: ev, bar: bar)