Updated on 2026-08-14
This commit is contained in:
Tangem
parent
788147acb0
commit
0e1d6547d1
230 changed files with 31 additions and 311 deletions
|
|
@ -328,6 +328,7 @@
|
|||
<string name="story_meet_title">Meet\nTangem</string>
|
||||
<string name="story_web3_description">Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services</string>
|
||||
<string name="story_web3_title">DeFi Compatible</string>
|
||||
<string name="swapping_error_wrapper">Error: %s</string>
|
||||
<string name="swapping_generic_error">There was an error. Please try again.</string>
|
||||
<string name="swapping_give_permission">Give Permission</string>
|
||||
<string name="swapping_insufficient_funds">Insufficient funds</string>
|
||||
|
|
|
|||
|
|
@ -328,6 +328,7 @@
|
|||
<string name="story_meet_title">Meet\nTangem</string>
|
||||
<string name="story_web3_description">Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services</string>
|
||||
<string name="story_web3_title">DeFi Compatible</string>
|
||||
<string name="swapping_error_wrapper">Error: %s</string>
|
||||
<string name="swapping_generic_error">There was an error. Please try again.</string>
|
||||
<string name="swapping_give_permission">Give Permission</string>
|
||||
<string name="swapping_insufficient_funds">Insufficient funds</string>
|
||||
|
|
|
|||
|
|
@ -328,6 +328,7 @@
|
|||
<string name="story_meet_title">Meet\nTangem</string>
|
||||
<string name="story_web3_description">Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services</string>
|
||||
<string name="story_web3_title">DeFi Compatible</string>
|
||||
<string name="swapping_error_wrapper">Error: %s</string>
|
||||
<string name="swapping_generic_error">There was an error. Please try again.</string>
|
||||
<string name="swapping_give_permission">Give Permission</string>
|
||||
<string name="swapping_insufficient_funds">Insufficient funds</string>
|
||||
|
|
|
|||
|
|
@ -328,6 +328,7 @@
|
|||
<string name="story_meet_title">Встречайте\nTangem</string>
|
||||
<string name="story_web3_description">Обменивайте, покупайте NFT, получайте займы и делайте вклады в более чем 100 различных децентрализованных сервисах</string>
|
||||
<string name="story_web3_title">Поддержка DeFi</string>
|
||||
<string name="swapping_error_wrapper">Ошибка: %s</string>
|
||||
<string name="swapping_generic_error">Произошла ошибка. Пожалуйста, попробуйте еще раз.</string>
|
||||
<string name="swapping_give_permission">Дать разрешение</string>
|
||||
<string name="swapping_insufficient_funds">Недостаточно средств</string>
|
||||
|
|
|
|||
|
|
@ -328,6 +328,7 @@
|
|||
<string name="story_meet_title">Meet\nTangem</string>
|
||||
<string name="story_web3_description">Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services</string>
|
||||
<string name="story_web3_title">DeFi Compatible</string>
|
||||
<string name="swapping_error_wrapper">Error: %s</string>
|
||||
<string name="swapping_generic_error">There was an error. Please try again.</string>
|
||||
<string name="swapping_give_permission">Give Permission</string>
|
||||
<string name="swapping_insufficient_funds">Insufficient funds</string>
|
||||
|
|
|
|||
|
|
@ -73,7 +73,11 @@ sealed interface TransactionCardType {
|
|||
sealed interface SwapWarning {
|
||||
data class PermissionNeeded(val tokenCurrency: String) : SwapWarning
|
||||
object InsufficientFunds : SwapWarning
|
||||
data class GenericWarning(val message: String?, val onClick: () -> Unit) : SwapWarning
|
||||
data class GenericWarning(
|
||||
val message: String? = null,
|
||||
val shouldWrapMessage: Boolean = false,
|
||||
val onClick: () -> Unit,
|
||||
) : SwapWarning
|
||||
// data class RateExpired(val onClick: () -> Unit) : SwapWarning
|
||||
// object HighPriceImpact : SwapWarning
|
||||
}
|
||||
|
|
@ -289,10 +289,10 @@ internal class StateBuilder(val actions: UiActions) {
|
|||
)
|
||||
}
|
||||
|
||||
fun addWarning(uiState: SwapStateHolder, message: String?): SwapStateHolder {
|
||||
fun addWarning(uiState: SwapStateHolder, message: String?, shouldWrapMessage: Boolean = false): SwapStateHolder {
|
||||
return if (message != null) {
|
||||
val renewWarnings = uiState.warnings.filterNot { it is SwapWarning.GenericWarning }.toMutableList()
|
||||
renewWarnings.add(SwapWarning.GenericWarning(message) {})
|
||||
renewWarnings.add(SwapWarning.GenericWarning(message, shouldWrapMessage = shouldWrapMessage) {})
|
||||
uiState.copy(
|
||||
warnings = renewWarnings,
|
||||
)
|
||||
|
|
@ -306,7 +306,7 @@ internal class StateBuilder(val actions: UiActions) {
|
|||
// todo use if needed later
|
||||
// DataError.InsufficientLiquidity -> TODO()
|
||||
// DataError.NoError -> TODO()
|
||||
is DataError.UnknownError -> addWarning(uiState, error.message)
|
||||
is DataError.UnknownError -> addWarning(uiState, error.message, true)
|
||||
else -> addWarning(uiState, null)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,16 @@ internal fun SwapScreenContent(state: SwapStateHolder, onPermissionWarningClick:
|
|||
.fillMaxSize()
|
||||
.background(color = TangemTheme.colors.background.secondary),
|
||||
) {
|
||||
Image(
|
||||
modifier = Modifier
|
||||
.size(width = TangemTheme.dimens.size164, height = TangemTheme.dimens.size80)
|
||||
.align(Alignment.BottomCenter)
|
||||
.padding(bottom = TangemTheme.dimens.spacing28),
|
||||
painter = painterResource(id = R.drawable.ill_one_inch_powered),
|
||||
contentDescription = null,
|
||||
contentScale = ContentScale.Fit,
|
||||
)
|
||||
|
||||
Column {
|
||||
AppBarWithBackButton(
|
||||
text = stringResource(R.string.swapping_swap),
|
||||
|
|
@ -132,16 +142,6 @@ internal fun SwapScreenContent(state: SwapStateHolder, onPermissionWarningClick:
|
|||
onDismissDialog = state.alert.onClick,
|
||||
)
|
||||
}
|
||||
|
||||
Image(
|
||||
modifier = Modifier
|
||||
.size(width = TangemTheme.dimens.size164, height = TangemTheme.dimens.size80)
|
||||
.align(Alignment.BottomCenter)
|
||||
.padding(bottom = TangemTheme.dimens.spacing28),
|
||||
painter = painterResource(id = R.drawable.ill_one_inch_powered),
|
||||
contentDescription = null,
|
||||
contentScale = ContentScale.Fit
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -290,9 +290,16 @@ private fun SwapWarnings(
|
|||
)
|
||||
}
|
||||
is SwapWarning.GenericWarning -> {
|
||||
val message = warning.message?.let {
|
||||
if (warning.shouldWrapMessage) {
|
||||
String.format(stringResource(id = R.string.swapping_error_wrapper), it)
|
||||
} else {
|
||||
it
|
||||
}
|
||||
} ?: stringResource(id = R.string.swapping_generic_error)
|
||||
RefreshableWaringCard(
|
||||
title = stringResource(id = R.string.common_warning),
|
||||
description = warning.message ?: stringResource(id = R.string.swapping_generic_error),
|
||||
description = message,
|
||||
onClick = warning.onClick,
|
||||
)
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
|
|
@ -1 +0,0 @@
|
|||
i/
|
||||
|
|
@ -1 +0,0 @@
|
|||
i/
|
||||
|
|
@ -1 +0,0 @@
|
|||
o/out
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.tangem.lib.auth" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="33" />
|
||||
|
||||
</manifest>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
aarFormatVersion=1.0
|
||||
aarMetadataVersion=1.0
|
||||
minCompileSdk=1
|
||||
minAndroidGradlePluginVersion=1.0.0
|
||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
|||
o/classes
|
||||
Binary file not shown.
|
|
@ -1,16 +0,0 @@
|
|||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package com.tangem.lib.auth;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = false;
|
||||
public static final String LIBRARY_PACKAGE_NAME = "com.tangem.lib.auth";
|
||||
public static final String BUILD_TYPE = "debug_beta";
|
||||
// Field from build type: debug_beta
|
||||
public static final String ENVIRONMENT = "release";
|
||||
// Field from build type: debug_beta
|
||||
public static final Boolean LOG_ENABLED = true;
|
||||
// Field from build type: debug_beta
|
||||
public static final Boolean TEST_ACTION_ENABLED = true;
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.tangem.lib.auth" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="33" />
|
||||
|
||||
</manifest>
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
{
|
||||
"version": 3,
|
||||
"artifactType": {
|
||||
"type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
|
||||
"kind": "Directory"
|
||||
},
|
||||
"applicationId": "com.tangem.lib.auth",
|
||||
"variantName": "debug_beta",
|
||||
"elements": [
|
||||
{
|
||||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"outputFile": "AndroidManifest.xml"
|
||||
}
|
||||
],
|
||||
"elementType": "File"
|
||||
}
|
||||
Binary file not shown.
|
|
@ -1,4 +0,0 @@
|
|||
aarFormatVersion=1.0
|
||||
aarMetadataVersion=1.0
|
||||
minCompileSdk=1
|
||||
minAndroidGradlePluginVersion=1.0.0
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,2 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/main/jniLibs"/></dataSet><dataSet config="debug_beta" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/debug_beta/jniLibs"/></dataSet></merger>
|
||||
|
|
@ -1 +0,0 @@
|
|||
#Tue Feb 07 19:38:54 MSK 2023
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/main/res"/><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/build/generated/res/rs/debug_beta"/><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/build/generated/res/resValues/debug_beta"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/main/res"/><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/build/generated/res/rs/debug_beta"/><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/build/generated/res/resValues/debug_beta"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug_beta$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/debug_beta/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug_beta" generated-set="debug_beta$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/debug_beta/res"/></dataSet><mergedItems/></merger>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/main/shaders"/></dataSet><dataSet config="debug_beta" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/debug_beta/shaders"/></dataSet></merger>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/main/assets"/><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/build/intermediates/shader_assets/debug_beta/out"/></dataSet><dataSet config="debug_beta" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/debug_beta/assets"/></dataSet></merger>
|
||||
|
|
@ -1 +0,0 @@
|
|||
#Tue Feb 07 19:38:52 MSK 2023
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/main/res"/><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/build/generated/res/rs/debug_beta"/><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/build/generated/res/resValues/debug_beta"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/main/res"/><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/build/generated/res/rs/debug_beta"/><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/build/generated/res/resValues/debug_beta"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug_beta$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/debug_beta/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug_beta" generated-set="debug_beta$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/debug_beta/res"/></dataSet><mergedItems/></merger>
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,2 +0,0 @@
|
|||
mavenArtifactId=auth
|
||||
mavenGroupId=tangem-app-android.libs
|
||||
Binary file not shown.
|
|
@ -1,2 +0,0 @@
|
|||
R_DEF: Internal format may change without notice
|
||||
local
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
3 package="com.tangem.lib.auth" >
|
||||
4
|
||||
5 <uses-sdk
|
||||
6 android:minSdkVersion="21"
|
||||
6-->/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/main/AndroidManifest.xml
|
||||
7 android:targetSdkVersion="33" />
|
||||
7-->/Users/vladislav/Documents/projects/tangem/tangem-app-android/libs/auth/src/main/AndroidManifest.xml
|
||||
8
|
||||
9</manifest>
|
||||
Binary file not shown.
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.tangem.lib.auth" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="33" />
|
||||
|
||||
</manifest>
|
||||
|
|
@ -1 +0,0 @@
|
|||
[]
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
{
|
||||
"version": 3,
|
||||
"artifactType": {
|
||||
"type": "PACKAGED_MANIFESTS",
|
||||
"kind": "Directory"
|
||||
},
|
||||
"applicationId": "com.tangem.lib.auth",
|
||||
"variantName": "debug_beta",
|
||||
"elements": [
|
||||
{
|
||||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"outputFile": "../../merged_manifest/debug_beta/AndroidManifest.xml"
|
||||
}
|
||||
],
|
||||
"elementType": "File"
|
||||
}
|
||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
|||
com.tangem.lib.auth
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,2 +0,0 @@
|
|||
1
|
||||
0
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue