Skip to content
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

Jump to bottom

Update layout for market global view #6006

Merged
merged 1 commit into from
Oct 24, 2024
Merged

Update layout for market global view #6006

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
127 changes: 57 additions & 70 deletions UnstoppableWallet/UnstoppableWallet/Modules/Market/Global/MarketGlobalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,49 @@ struct MarketGlobalView: View {
@State private var tvlPresented = false

var body: some View {
VStack(spacing: 0) {
if let marketGlobal = viewModel.marketGlobal {
MarqueeView(targetVelocity: 30) {
content(marketGlobal: marketGlobal, redacted: marketGlobal)
ZStack {
HStack(spacing: 0) {
itemView(
title: "market.global.market_cap".localized,
amount: viewModel.marketGlobal?.marketCap.flatMap { ValueFormatter.instance.formatShort(currency: viewModel.currency, value: $0) },
diff: viewModel.marketGlobal?.marketCapChange.map { .percent(value: $0) },
redacted: viewModel.marketGlobal
) {
marketCapPresented = true
}
} else {
ZStack {
HStack(spacing: .margin8) {
content(marketGlobal: nil, redacted: nil)
}
.padding(.leading, .margin8)
.fixedSize()
divider()
itemView(
title: "market.global.volume".localized,
amount: viewModel.marketGlobal?.volume.flatMap { ValueFormatter.instance.formatShort(currency: viewModel.currency, value: $0) },
diff: viewModel.marketGlobal?.volumeChange.map { .percent(value: $0) },
redacted: viewModel.marketGlobal
) {
volumePresented = true
}
divider()
itemView(
title: "market.global.tvl".localized,
amount: viewModel.marketGlobal?.tvl.flatMap { ValueFormatter.instance.formatShort(currency: viewModel.currency, value: $0) },
diff: viewModel.marketGlobal?.tvlChange.map { .percent(value: $0) },
redacted: viewModel.marketGlobal
) {
tvlPresented = true
}
divider()
itemView(
title: "market.global.etf".localized,
amount: viewModel.marketGlobal?.etfTotalInflow.flatMap { ValueFormatter.instance.formatShort(currency: viewModel.currency, value: $0) },
diff: viewModel.marketGlobal?.etfDailyInflow.map { .change(value: $0, currency: viewModel.currency) },
redacted: viewModel.marketGlobal
) {
etfPresented = true
}
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
}

Rectangle()
.fill(Color.themeSteel10)
.frame(maxWidth: .infinity)
.frame(height: 1)
.fixedSize(horizontal: false, vertical: true)
.modifier(ThemeListStyleModifier())
}
.padding(.horizontal, .margin16)
.padding(.vertical, .margin8)
.animation(.default, value: viewModel.marketGlobal == nil)
.sheet(isPresented: $tvlPresented) {
ThemeNavigationView { MarketTvlView() }
Expand All @@ -51,66 +73,31 @@ struct MarketGlobalView: View {
}
}

@ViewBuilder private func content(marketGlobal: MarketGlobal?, redacted: Any?) -> some View {
diffView(
title: "market.global.market_cap".localized,
amount: marketGlobal?.marketCap.flatMap { ValueFormatter.instance.formatShort(currency: viewModel.currency, value: $0) },
diff: marketGlobal?.marketCapChange.map { .percent(value: $0) },
redacted: redacted
) {
marketCapPresented = true
}

diffView(
title: "market.global.volume".localized,
amount: marketGlobal?.volume.flatMap { ValueFormatter.instance.formatShort(currency: viewModel.currency, value: $0) },
diff: marketGlobal?.volumeChange.map { .percent(value: $0) },
redacted: redacted
) {
volumePresented = true
}

diffView(
title: "market.global.btc_dominance".localized,
amount: marketGlobal?.btcDominance.flatMap { ValueFormatter.instance.format(percentValue: $0, signType: .never) },
diff: marketGlobal?.btcDominanceChange.map { .percent(value: $0) },
redacted: redacted
) {
marketCapPresented = true
}

diffView(
title: "market.global.etf_inflow".localized,
amount: marketGlobal?.etfTotalInflow.flatMap { ValueFormatter.instance.formatShort(currency: viewModel.currency, value: $0) },
diff: marketGlobal?.etfDailyInflow.map { .change(value: $0, currency: viewModel.currency) },
redacted: redacted
) {
etfPresented = true
}

diffView(
title: "market.global.tvl_in_defi".localized,
amount: marketGlobal?.tvl.flatMap { ValueFormatter.instance.formatShort(currency: viewModel.currency, value: $0) },
diff: marketGlobal?.tvlChange.map { .percent(value: $0) },
redacted: redacted
) {
tvlPresented = true
}
}

@ViewBuilder private func diffView(title: String, amount: String?, diff: DiffText.Diff?, redacted: Any?, onTap: @escaping () -> Void) -> some View {
HStack(spacing: .margin4) {
Text(title).textCaption()
@ViewBuilder private func itemView(title: String, amount: String?, diff: DiffText.Diff?, redacted: Any?, onTap: @escaping () -> Void) -> some View {
VStack(alignment: .leading, spacing: .margin4) {
Text(title)
.textMicroSB()
.lineLimit(1)
.truncationMode(.middle)

Text(amount ?? "----")
.textCaption(color: .themeBran)
.textCaptionSB(color: .themeBran)
.lineLimit(1)
.truncationMode(.middle)
.redacted(value: redacted)

DiffText(diff, font: .themeCaption)
.redacted(value: redacted)
}
.padding(.horizontal, .margin8)
.padding(.vertical, .margin16)
.padding(.margin12)
.frame(maxWidth: .infinity, alignment: .leading)
.contentShape(Rectangle())
.onTapGesture(perform: onTap)
}

@ViewBuilder private func divider() -> some View {
Rectangle()
.fill(Color.themeSteel20)
.frame(width: .heightOneDp)
}
}
4 changes: 4 additions & 0 deletions UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/Extensions/Text.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ extension View {
foregroundColor(color).font(.themeMicro)
}

func textMicroSB(color: Color = .themeGray) -> some View {
foregroundColor(color).font(.themeMicroSB)
}

func themeBody(color: Color = .themeLeah, alignment: Alignment = .leading) -> some View {
textBody(color: color).frame(maxWidth: .infinity, alignment: alignment)
}
Expand Down
5 changes: 2 additions & 3 deletions UnstoppableWallet/UnstoppableWallet/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,9 +706,8 @@

"market.global.market_cap" = "Total Cap";
"market.global.volume" = "24h Vol.";
"market.global.btc_dominance" = "BTC Dominance";
"market.global.etf_inflow" = "ETF Inflow";
"market.global.tvl_in_defi" = "TVL in DeFi";
"market.global.tvl" = "TVL";
"market.global.etf" = "ETF";

"market.tab.news" = "News";
"market.tab.coins" = "Coins";
Expand Down