From 331a15b433be5a127b9a2ba48e6d0c36b0a2b6ce Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 10 Apr 2023 11:33:11 +0300 Subject: [PATCH] Updated on 2026-08-14 --- ...{ic_onboarding_chat.xml => ic_onboarding_chat_24.xml} | 0 ...r_code_scan.xml => ic_onboarding_qr_code_scan_24.xml} | 0 .../src/main/java/com/tangem/core/ui/res/TangemColors.kt | 4 ---- core/ui/src/main/res/drawable/ic_arrow_top_right.xml | 9 --------- ...ding_text_edit.xml => ic_onboarding_text_edit_56.xml} | 0 features/onboarding/build.gradle.kts | 3 --- .../feature/onboarding/data/SeedPhraseRepository.kt | 2 +- .../feature/onboarding/domain/SeedPhraseInteractor.kt | 2 +- 8 files changed, 2 insertions(+), 18 deletions(-) rename app/src/main/res/drawable/{ic_onboarding_chat.xml => ic_onboarding_chat_24.xml} (100%) rename app/src/main/res/drawable/{ic_onboarding_qr_code_scan.xml => ic_onboarding_qr_code_scan_24.xml} (100%) delete mode 100644 core/ui/src/main/res/drawable/ic_arrow_top_right.xml rename core/ui/src/main/res/drawable/{ic_onboarding_text_edit.xml => ic_onboarding_text_edit_56.xml} (100%) diff --git a/app/src/main/res/drawable/ic_onboarding_chat.xml b/app/src/main/res/drawable/ic_onboarding_chat_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_onboarding_chat.xml rename to app/src/main/res/drawable/ic_onboarding_chat_24.xml diff --git a/app/src/main/res/drawable/ic_onboarding_qr_code_scan.xml b/app/src/main/res/drawable/ic_onboarding_qr_code_scan_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_onboarding_qr_code_scan.xml rename to app/src/main/res/drawable/ic_onboarding_qr_code_scan_24.xml diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt index ec957fea57..8dc45fd453 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt @@ -148,7 +148,6 @@ class TangemColors internal constructor( plain: Color, action: Color, fade: Color, - warning: Color = TangemColorPalette.Flamingo, ) { var primary by mutableStateOf(primary) private set @@ -160,8 +159,6 @@ class TangemColors internal constructor( private set var fade by mutableStateOf(fade) private set - var warning by mutableStateOf(warning) - private set fun update(other: Background) { primary = other.primary @@ -169,7 +166,6 @@ class TangemColors internal constructor( plain = other.plain action = other.action fade = other.fade - warning = other.warning } } diff --git a/core/ui/src/main/res/drawable/ic_arrow_top_right.xml b/core/ui/src/main/res/drawable/ic_arrow_top_right.xml deleted file mode 100644 index e790dac466..0000000000 --- a/core/ui/src/main/res/drawable/ic_arrow_top_right.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_onboarding_text_edit.xml b/core/ui/src/main/res/drawable/ic_onboarding_text_edit_56.xml similarity index 100% rename from core/ui/src/main/res/drawable/ic_onboarding_text_edit.xml rename to core/ui/src/main/res/drawable/ic_onboarding_text_edit_56.xml diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts index 4edec7192d..848e2870d9 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -36,9 +36,6 @@ dependencies { implementation(deps.compose.shimmer) implementation(deps.tangem.card.core) - // implementation(deps.tangem.card.android) { - // exclude(module = "joda-time") - // } /** Other libraries */ implementation(deps.compose.shimmer) diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/data/SeedPhraseRepository.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/data/SeedPhraseRepository.kt index 017d0e1b7d..42270141ed 100644 --- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/data/SeedPhraseRepository.kt +++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/data/SeedPhraseRepository.kt @@ -21,7 +21,7 @@ class DummyWordlist( private var _wordlist: List = listOf() - override val wordlist: List + override val words: List get() = _wordlist init { diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/domain/SeedPhraseInteractor.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/domain/SeedPhraseInteractor.kt index fef12f2d0d..8d8dadd98a 100644 --- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/domain/SeedPhraseInteractor.kt +++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/domain/SeedPhraseInteractor.kt @@ -16,6 +16,6 @@ class DummySeedPhraseInteractor( ) : SeedPhraseInteractor, SeedPhraseChecker by seedPhraseChecker { override suspend fun generateSeedPhrase(): List { - return sdkSeedPhraseRepository.getWordList().wordlist + return sdkSeedPhraseRepository.getWordList().words } } \ No newline at end of file