Skip to content

feat(activity): add transfer banner #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jvsena42 merged 1 commit into from
Dec 1, 2025
Merged

feat(activity): add transfer banner #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 82 additions & 0 deletions Bitkit/Components/Activity/ActivityBanner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
import BitkitCore
import SwiftUI

enum ActivityBannerType {
case spending
case savings
}

struct ActivityBanner: View {
let type: ActivityBannerType

@State private var innerShadowOpacity: Double = 0.32
@State private var dropShadowOpacity: Double = 1.0
@State private var radialGradientOpacity: Double = 0.4
@State private var borderOpacity: Double = 0.32

private var accentColor: Color {
type == .spending ? .purpleAccent : .brandAccent
}

var body: some View {
HStack(spacing: 8) {
Image("transfer")
.resizable()
.scaledToFit()
.frame(width: 20, height: 20)
.foregroundColor(accentColor)

Text(tTodo("TRANSFER IN PROGRESS"))
.font(Fonts.black(size: 20))
.foregroundColor(.textPrimary)
.kerning(0)
.lineLimit(1)
}
.frame(maxWidth: .infinity, alignment: .center)
.frame(height: 72)
.padding(.horizontal, 16)
.background(
ZStack {
// Inner shadow
RoundedRectangle(cornerRadius: 16)
.fill(.shadow(.inner(color: accentColor.opacity(innerShadowOpacity), radius: 40)))
.foregroundColor(.black)

// Linear gradient background
RoundedRectangle(cornerRadius: 16)
.fill(
LinearGradient(
gradient: Gradient(colors: [accentColor.opacity(0.24), accentColor.opacity(0)]),
startPoint: .top,
endPoint: .bottom
)
)

// Radial gradient in top left corner
RadialGradient(
gradient: Gradient(stops: [
.init(color: accentColor.opacity(radialGradientOpacity), location: 0.0),
.init(color: accentColor.opacity(0.0), location: 1.0),
]),
center: UnitPoint(x: 0, y: 0),
startRadius: 0,
endRadius: 160
)
}
.clipShape(RoundedRectangle(cornerRadius: 16))
)
.overlay(
RoundedRectangle(cornerRadius: 16)
.stroke(accentColor.opacity(borderOpacity), lineWidth: 1)
)
.shadow(color: accentColor.opacity(dropShadowOpacity), radius: 12)
.task {
withAnimation(.easeInOut(duration: 1.2).repeatForever(autoreverses: true)) {
innerShadowOpacity = 0.64
dropShadowOpacity = 0.0
radialGradientOpacity = 0.0
borderOpacity = 1.0
}
}
}
}
57 changes: 8 additions & 49 deletions Bitkit/Components/WalletBalanceView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import SwiftUI
struct WalletBalanceView: View {
let type: WalletType
let sats: UInt64
var showTransferIcon: Bool = false

@EnvironmentObject var currency: CurrencyViewModel

Expand All @@ -21,13 +20,6 @@ struct WalletBalanceView: View {
.padding(.trailing, 4)

SubtitleText(btcComponents.value)

if showTransferIcon {
Image("transfer")
.resizable()
.frame(width: 16, height: 16)
.foregroundColor(.white64)
}
}
} else {
HStack(spacing: 4) {
Expand All @@ -38,13 +30,6 @@ struct WalletBalanceView: View {
SubtitleText(converted.symbol)
.frame(maxWidth: 12)
SubtitleText(converted.formatted)

if showTransferIcon {
Image("transfer")
.resizable()
.frame(width: 16, height: 16)
.foregroundColor(.white64)
}
}
}
}
Expand Down Expand Up @@ -82,20 +67,12 @@ struct WalletBalanceView: View {

// Bitcoin display (modern) - with transfer icon
HStack {
WalletBalanceView(
type: .onchain,
sats: 123_456,
showTransferIcon: true
)
WalletBalanceView(type: .onchain, sats: 123_456)

Divider()
.frame(height: 50)

WalletBalanceView(
type: .lightning,
sats: 123_456,
showTransferIcon: true
)
WalletBalanceView(type: .lightning, sats: 123_456)
}
.environmentObject(
{
Expand All @@ -110,18 +87,12 @@ struct WalletBalanceView: View {

// USD display
HStack {
WalletBalanceView(
type: .onchain,
sats: 123_456
)
WalletBalanceView(type: .onchain, sats: 123_456)

Divider()
.frame(height: 50)

WalletBalanceView(
type: .lightning,
sats: 123_456
)
WalletBalanceView(type: .lightning, sats: 123_456)
}
.environmentObject(
{
Expand All @@ -137,18 +108,12 @@ struct WalletBalanceView: View {

// EUR display
HStack {
WalletBalanceView(
type: .onchain,
sats: 123_456
)
WalletBalanceView(type: .onchain, sats: 123_456)

Divider()
.frame(height: 50)

WalletBalanceView(
type: .lightning,
sats: 123_456
)
WalletBalanceView(type: .lightning, sats: 123_456)
}
.environmentObject(
{
Expand All @@ -164,18 +129,12 @@ struct WalletBalanceView: View {

// Bitcoin display with classic unit
HStack {
WalletBalanceView(
type: .onchain,
sats: 123_456
)
WalletBalanceView(type: .onchain, sats: 123_456)

Divider()
.frame(height: 50)

WalletBalanceView(
type: .lightning,
sats: 123_456
)
WalletBalanceView(type: .lightning, sats: 123_456)
}
.environmentObject(
{
Expand Down
20 changes: 20 additions & 0 deletions Bitkit/Views/Wallets/Activity/ActivityLatest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,32 @@ struct ActivityLatest: View {
@EnvironmentObject private var activity: ActivityListViewModel
@EnvironmentObject private var navigation: NavigationViewModel
@EnvironmentObject private var sheets: SheetViewModel
@EnvironmentObject private var wallet: WalletViewModel

private var shouldShowBanner: Bool {
wallet.balanceInTransferToSavings > 0 || wallet.balanceInTransferToSpending > 0
}

private var bannerType: ActivityBannerType {
if wallet.balanceInTransferToSpending > 0 {
return .spending
} else {
return .savings
}
}

var body: some View {
VStack(spacing: 0) {
CaptionMText(t("wallet__activity"))
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.bottom, 16)

if shouldShowBanner {
ActivityBanner(type: bannerType)
.padding(.bottom, 16)
.transition(.opacity)
}

if let items = activity.latestActivities {
LazyVStack(alignment: .leading, spacing: 16) {
ForEach(Array(zip(items.indices, items)), id: \.1) { index, item in
Expand Down Expand Up @@ -40,5 +59,6 @@ struct ActivityLatest: View {
EmptyView()
}
}
.animation(.spring(response: 0.4, dampingFraction: 0.8), value: shouldShowBanner)
}
}
12 changes: 2 additions & 10 deletions Bitkit/Views/Wallets/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ struct HomeView: View {
VStack(spacing: 0) {
HStack(spacing: 0) {
NavigationLink(value: Route.savingsWallet) {
WalletBalanceView(
type: .onchain,
sats: UInt64(wallet.totalOnchainSats),
showTransferIcon: wallet.balanceInTransferToSavings > 0
)
WalletBalanceView(type: .onchain, sats: UInt64(wallet.totalOnchainSats))
}

Divider()
Expand All @@ -40,11 +36,7 @@ struct HomeView: View {
.padding(.leading, 16)

NavigationLink(value: Route.spendingWallet) {
WalletBalanceView(
type: .lightning,
sats: UInt64(wallet.totalLightningSats),
showTransferIcon: wallet.balanceInTransferToSpending > 0
)
WalletBalanceView(type: .lightning, sats: UInt64(wallet.totalLightningSats))
}
}
.frame(maxWidth: .infinity, alignment: .leading)
Expand Down
Loading