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

Shaka button improvements

Browse Source 
Changelog-Changed: Move counts to right side like Birdsite
Changelog-Changed: Use custom icon for shaka button
Changelog-Fixed: Fixed shaka moving when you press it
This commit is contained in:
Joel Klabo
2023-01-12 11:29:32 -08:00
committed by William Casarin
parent 9d44ed0bfe c76f92c6ed
commit db64a73f87
9 changed files with 453 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,9 +37,6 @@ struct EventActionBar: View {
}
HStack(alignment: .bottom) {
Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
.font(.footnote.weight(.medium))
.foregroundColor(bar.boosted ? Color.green : Color.gray)
EventActionButton(img: "arrow.2.squarepath", col: bar.boosted ? Color.green : nil) {
if bar.boosted {
@@ -47,21 +44,27 @@ struct EventActionBar: View {
} else {
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)
}
}
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
HStack(alignment: .bottom) {
Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
.font(.footnote.weight(.medium))
.foregroundColor(bar.liked ? Color.orange : Color.gray)
LikeButton(liked: bar.liked) {
if bar.liked {
notify(.delete, bar.our_like)
} else {
send_like()
}
}.overlay {
Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
.offset(x: 22)
.font(.footnote.weight(.medium))
.foregroundColor(bar.liked ? Color.orange : Color.gray)
}
}
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
@@ -160,13 +163,8 @@ struct LikeButton: View {
var body: some View {
Button(action: action) {
if liked {
Text("🤙", comment: "Button with emoji to like an event.")
} else {
Image("shaka")
.renderingMode(.template)
.foregroundColor(.gray)
}
Image(liked ? "shaka-full" : "shaka-line")
.foregroundColor(liked ? .orange : .gray)
}
}
}