GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2025-11-28 14:12:13 +05:00
parent 21dc2682cc
commit ff55704d32
3 changed files with 46 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/apy/YieldSupplyApyComponent.kt
View file

@ -6,6 +6,7 @@ import androidx.compose.runtime.getValue
import com.tangem.core.decompose.context.AppComponentContext
import com.tangem.core.decompose.context.child
import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
import com.tangem.core.ui.extensions.stringReference
import com.tangem.domain.models.currency.CryptoCurrency
import com.tangem.features.yield.supply.impl.apy.ui.YieldSupplyApyContent
import com.tangem.features.yield.supply.impl.chart.DefaultYieldSupplyChartComponent
@ -48,6 +49,7 @@ internal class YieldSupplyApyComponent(
override fun BottomSheet() {
val state by loadingState.collectAsState()
YieldSupplyApyContent(
apy = stringReference("${params.apy}%"),
isLoading = state,
onBackClick = params.onBackClick,
chartComponent = chartComponent,
@ -56,6 +58,7 @@ internal class YieldSupplyApyComponent(
data class Params(
val cryptoCurrency: CryptoCurrency,
val apy: String,
val onBackClick: () -> Unit,
)
}

42
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/apy/ui/YieldSupplyApyContent.kt
View file

@ -7,12 +7,14 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.InlineTextContent
import androidx.compose.foundation.text.appendInlineContent
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
@ -32,6 +34,7 @@ import com.tangem.core.ui.components.SpacerH16
import com.tangem.core.ui.components.SpacerH2
import com.tangem.core.ui.components.SpacerH24
import com.tangem.core.ui.components.SpacerH8
import com.tangem.core.ui.components.SpacerW12
import com.tangem.core.ui.components.SpacerW4
import com.tangem.core.ui.components.TextShimmer
import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
@ -39,6 +42,9 @@ import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheet
import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetTitle
import com.tangem.core.ui.decompose.ComposableContentComponent
import com.tangem.core.ui.extensions.TextReference
import com.tangem.core.ui.extensions.resolveReference
import com.tangem.core.ui.extensions.stringReference
import com.tangem.core.ui.extensions.stringResourceSafe
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.res.TangemThemePreview
@ -47,6 +53,7 @@ import com.tangem.features.yield.supply.impl.R
@Suppress("LongMethod")
@Composable
internal fun YieldSupplyApyContent(
apy: TextReference,
isLoading: Boolean,
onBackClick: () -> Unit,
chartComponent: ComposableContentComponent,
@ -114,6 +121,7 @@ internal fun YieldSupplyApyContent(
SpacerH24()
ApyChart(
apy = apy,
isChartLoading = isLoading,
chartComponent = chartComponent,
modifier = Modifier
@ -137,6 +145,7 @@ internal fun YieldSupplyApyContent(
@Composable
private fun ApyChart(
apy: TextReference,
isChartLoading: Boolean,
chartComponent: ComposableContentComponent,
modifier: Modifier = Modifier,
@ -171,6 +180,38 @@ private fun ApyChart(
}
SpacerH12()
chartComponent.Content(Modifier)
SpacerH12()
Box(
modifier = Modifier
.background(TangemTheme.colors.stroke.primary)
.fillMaxWidth()
.height(1.dp),
)
SpacerH12()
Row(
verticalAlignment = Alignment.CenterVertically,
) {
Text(
modifier = Modifier.weight(1.0f),
text = stringResourceSafe(R.string.yield_module_earn_sheet_current_apy_title),
style = TangemTheme.typography.body1,
color = TangemTheme.colors.text.primary1,
)
SpacerW12()
Icon(
painter = painterResource(R.drawable.ic_arrow_up_8),
tint = TangemTheme.colors.text.accent,
contentDescription = null,
modifier = Modifier
.padding(end = 6.dp)
.size(8.dp),
)
Text(
text = apy.resolveReference(),
style = TangemTheme.typography.body1,
color = TangemTheme.colors.text.accent,
)
}
}
}
@ -191,6 +232,7 @@ private fun AccentDot(modifier: Modifier = Modifier) {
private fun YieldSupplyApyContentContentPreview() {
TangemThemePreview {
YieldSupplyApyContent(
apy = stringReference("5.1%"),
isLoading = false,
onBackClick = {},
chartComponent = ComposableContentComponent.EMPTY,

1
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/promo/DefaultYieldSupplyPromoComponent.kt
View file

@ -56,6 +56,7 @@ internal class DefaultYieldSupplyPromoComponent @AssistedInject constructor(
appComponentContext = childByContext(componentContext),
params = YieldSupplyApyComponent.Params(
cryptoCurrency = params.currency,
apy = params.apy,
onBackClick = {
model.bottomSheetNavigation.dismiss()
},