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 2024-05-03 11:18:10 +03:00
parent 91ca2a23eb
commit 0bbe6b8a4a
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendNavigationButtons.kt
View file

@ -1,12 +1,10 @@
package com.tangem.features.send.impl.presentation.ui
import androidx.compose.animation.*
import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
@ -21,18 +19,19 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import com.tangem.core.ui.R
import com.tangem.core.ui.components.Keyboard
import com.tangem.core.ui.components.SecondaryButtonIconStart
import com.tangem.core.ui.components.SpacerW12
import com.tangem.core.ui.components.buttons.common.TangemButton
import com.tangem.core.ui.components.buttons.common.TangemButtonIconPosition
import com.tangem.core.ui.components.buttons.common.TangemButtonsDefaults
import com.tangem.core.ui.components.keyboardAsState
import com.tangem.core.ui.extensions.shareText
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.utils.BigDecimalFormatter
import com.tangem.features.send.impl.presentation.state.SendUiCurrentScreen
import com.tangem.features.send.impl.presentation.state.SendUiState
import com.tangem.features.send.impl.presentation.state.SendUiStateType
import kotlinx.coroutines.delay
@Composable
internal fun SendNavigationButtons(
@ -144,11 +143,12 @@ private fun SendingText(
modifier: Modifier = Modifier,
) {
var isVisibleProxy by remember { mutableStateOf(isVisible) }
val keyboard by keyboardAsState()
// text appearance delay for smooth screen transitions
LaunchedEffect(key1 = isVisible) {
if (isVisible) {
delay(timeMillis = 400)
// the text should appear when the keyboard is closed
LaunchedEffect(isVisible, keyboard) {
if (isVisible && keyboard is Keyboard.Opened) {
return@LaunchedEffect
}
isVisibleProxy = isVisible
}
@ -156,8 +156,8 @@ private fun SendingText(
AnimatedVisibility(
visible = isVisibleProxy,
modifier = modifier,
enter = slideInVertically().plus(fadeIn()),
exit = slideOutVertically().plus(fadeOut()),
enter = slideInVertically() + fadeIn(),
exit = fadeOut(tween(durationMillis = 300)),
label = "Animate show sending state text",
) {
val amountState = uiState.getAmountState(isEditState)

1
features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendScreen.kt
View file

@ -134,6 +134,7 @@ private fun SendScreenContent(uiState: SendUiState, currentState: SendUiCurrentS
Box(modifier = modifier.fillMaxSize()) {
AnimatedContent(
targetState = currentStateProxy,
contentAlignment = Alignment.TopCenter,
label = "Send Scree Navigation",
transitionSpec = {
val direction = if (initialState.type.ordinal < targetState.type.ordinal) {

7
features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/amount/AmountField.kt
View file

@ -22,7 +22,7 @@ import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.utils.BigDecimalFormatter
import com.tangem.core.ui.utils.rememberDecimalFormat
import com.tangem.features.send.impl.presentation.state.fields.SendTextField
import kotlinx.coroutines.job
import kotlinx.coroutines.delay
@Composable
internal fun AmountField(sendField: SendTextField.AmountField, appCurrencyCode: String) {
@ -66,9 +66,8 @@ internal fun AmountField(sendField: SendTextField.AmountField, appCurrencyCode:
)
LaunchedEffect(key1 = Unit) {
this.coroutineContext.job.invokeOnCompletion {
requester.requestFocus()
}
delay(timeMillis = 200)
requester.requestFocus()
}
AmountSecondary(sendField, appCurrencyCode)