Skip to content

Consolidate ChartScreen #51

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
gemdev111 merged 10 commits into from
Apr 6, 2026
Merged

Consolidate ChartScreen #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dc46faf
Replace VICO chart with custom GemLineChart
gemdev111 Mar 31, 2026
597a3c9
Switch to listOfNotNull and add TradingVolume
gemdev111 Mar 31, 2026
8295118
Add periodic market sync in AssetChartViewModel
gemdev111 Apr 1, 2026
2ec5725
Improved PulsingDot
gemdev111 Apr 1, 2026
cc1e7c2
Add ChipBadge and replace Badge usage
gemdev111 Apr 1, 2026
3bd74bc
Update AssetChartScene.kt
gemdev111 Apr 1, 2026
abebf60
Merge branch 'main' into charts-android
gemdev111 Apr 1, 2026
111cc4e
Use ChartSceneMetrics and space4 spacing
gemdev111 Apr 1, 2026
90961c1
Add Asset.formatSupply and use in chart
gemdev111 Apr 1, 2026
2982d82
Merge branch 'main' into charts-android
gemdev111 Apr 6, 2026
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: 56 additions & 71 deletions ...ts/src/main/kotlin/com/gemwallet/android/features/asset/presents/chart/AssetChartScene.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.gemwallet.android.features.asset.presents.chart

import androidx.compose.foundation.clickable
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.defaultMinSize
Expand Down Expand Up @@ -28,11 +30,12 @@ import com.gemwallet.android.domains.percentage.formatAsPercentage
import com.gemwallet.android.domains.price.toPriceState
import com.gemwallet.android.ext.AddressFormatter
import com.gemwallet.android.model.compactFormatter
import com.gemwallet.android.model.formatSupply
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.InfoSheetEntity
import com.gemwallet.android.ui.components.clipboard.setPlainText
import com.gemwallet.android.ui.components.image.AsyncImage
import com.gemwallet.android.ui.components.list_item.Badge
import com.gemwallet.android.ui.components.list_item.ChipBadge
import com.gemwallet.android.ui.components.list_item.ListItem
import com.gemwallet.android.ui.components.list_item.ListItemSupportText
import com.gemwallet.android.ui.components.list_item.ListItemTitleText
Expand Down Expand Up @@ -172,80 +175,63 @@ private fun LazyListScope.links(links: List<AssetMarketUIModel.Link>) {

private fun LazyListScope.assetMarket(currency: Currency, asset: Asset, marketInfo: AssetMarket?, explorerName: String) {
marketInfo ?: return
val marketItems = mutableListOf<MarketInfoUIModel>().apply {
val marketItems = listOfNotNull(
asset.id.tokenId?.let {
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.Contract,
value = it,
)
},
marketInfo.marketCap?.let {
add(
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.MarketCap,
value = currency.compactFormatter(it),
badge = marketInfo.marketCapRank?.takeIf { it > 0 }
.let { "#${marketInfo.marketCapRank}" }
)
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.MarketCap,
value = currency.compactFormatter(it),
badge = marketInfo.marketCapRank?.takeIf { rank -> rank > 0 }?.let { "#$it" },
)
}
},
marketInfo.totalVolume?.let {
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.TradingVolume,
value = currency.compactFormatter(it),
)
},
marketInfo.marketCapFdv?.let {
add(
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.FDV,
value = currency.compactFormatter(it),
info = InfoSheetEntity.FullyDilutedValuation,
)
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.FDV,
value = currency.compactFormatter(it),
info = InfoSheetEntity.FullyDilutedValuation,
)
}
}
},
)

val supplyItems = mutableListOf<MarketInfoUIModel>().apply {
val supplyItems = listOfNotNull(
marketInfo.circulatingSupply?.let {
add(
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.CirculatingSupply,
value = currency.compactFormatter(it),
info = InfoSheetEntity.CirculatingSupply,
)
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.CirculatingSupply,
value = asset.compactFormatter(it),
info = InfoSheetEntity.CirculatingSupply,
)
}
},
marketInfo.totalSupply?.let {
add(
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.TotalSupply,
value = currency.compactFormatter(it),
info = InfoSheetEntity.TotalSupply,
)
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.TotalSupply,
value = asset.compactFormatter(it),
info = InfoSheetEntity.TotalSupply,
)
}

},
marketInfo.maxSupply?.let {
add(
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.MaxSupply,
value = currency.compactFormatter(it),
info = InfoSheetEntity.MaxSupply,
)
)
}
asset.id.tokenId?.let {
add(
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.Contract,
value = it,
)
)
}
}

val allTime = mutableListOf<AllTimeUIModel>().apply {
marketInfo.allTimeHighValue?.let {
add(
AllTimeUIModel.High(it.date, it.value.toDouble(), it.percentage.toDouble())
MarketInfoUIModel(
type = MarketInfoUIModel.MarketInfoTypeUIModel.MaxSupply,
value = asset.formatSupply(it),
info = InfoSheetEntity.MaxSupply,
)
}
},
)

marketInfo.allTimeLowValue?.let {
add(
AllTimeUIModel.Low(it.date, it.value.toDouble(), it.percentage.toDouble())
)
}
}
val allTime = listOfNotNull(
marketInfo.allTimeHighValue?.let { AllTimeUIModel.High(it.date, it.value.toDouble(), it.percentage.toDouble()) },
marketInfo.allTimeLowValue?.let { AllTimeUIModel.Low(it.date, it.value.toDouble(), it.percentage.toDouble()) },
)

marketProperties(asset, explorerName, marketItems)
marketProperties(asset, explorerName, supplyItems)
Expand All @@ -256,14 +242,15 @@ private fun LazyListScope.marketProperties(asset: Asset, explorerName: String, i
itemsPositioned(items) { position, item ->
when (item.type) {
MarketInfoUIModel.MarketInfoTypeUIModel.FDV,
MarketInfoUIModel.MarketInfoTypeUIModel.TradingVolume,
MarketInfoUIModel.MarketInfoTypeUIModel.CirculatingSupply,
MarketInfoUIModel.MarketInfoTypeUIModel.TotalSupply,
MarketInfoUIModel.MarketInfoTypeUIModel.MaxSupply -> PropertyItem(item.type.label, item.value, listPosition = position, info = item.info)
MarketInfoUIModel.MarketInfoTypeUIModel.MarketCap -> PropertyItem(
title = {
PropertyTitleText(
text = item.type.label,
badge = item.badge?.let { { Badge(it) } }
badge = item.badge?.let { { ChipBadge(it) } }
)
},
data = { PropertyDataText(item.value) },
Expand Down Expand Up @@ -306,17 +293,15 @@ private fun LazyListScope.allTimeProperties(asset: Asset, currency: Currency, it
}
ListItem(
listPosition = position,
title = @Composable { ListItemTitleText(stringResource(title)) },
title = { PropertyTitleText(text = stringResource(title)) },
subtitle = { ListItemSupportText(dateFormat.format(Date(item.date))) },
trailing = {
Column(
modifier = Modifier.defaultMinSize(40.dp),
horizontalAlignment = Alignment.End
) {
ListItemTitleText(currency.compactFormatter(item.value))
val rowScope = this
Column(horizontalAlignment = Alignment.End) {
with(rowScope) { PropertyDataText(currency.compactFormatter(item.value)) }
ListItemSupportText(item.percentage.formatAsPercentage(), color = item.percentage.toPriceState().color())
}
},
},
)
}

Expand Down
Loading