From 6989986c9e7eba05b3880be79d7479e915053c0f Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 15 Jul 2022 12:38:49 +0300 Subject: [PATCH 01/12] Updated on 2026-08-14 --- .../main/java/com/tangem/tap/common/feedback/FeedbackManager.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt index dccb805723..4e551608e5 100644 --- a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt +++ b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt @@ -12,6 +12,7 @@ import java.io.FileWriter import java.io.StringWriter import timber.log.Timber import zendesk.configurations.Configuration +import zendesk.core.AnonymousIdentity import zendesk.core.Zendesk import zendesk.support.Support import zendesk.support.request.RequestConfiguration @@ -36,6 +37,7 @@ class FeedbackManager( /* oauthClientId = */ zendeskConfig.clientId, ) Support.INSTANCE.init(Zendesk.INSTANCE) + Zendesk.INSTANCE.setIdentity(AnonymousIdentity()) } fun sendEmail(feedbackData: FeedbackData, onFail: ((Exception) -> Unit)? = null) { From a72ba0edea4600d842a3d33ea127b70915a83ba5 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 15 Jul 2022 11:50:34 +0300 Subject: [PATCH 02/12] Updated on 2026-08-14 --- .../tap/features/wallet/ui/WalletFragment.kt | 3 ++ app/src/main/res/layout/fragment_wallet.xml | 37 +++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt index 176fa48a14..73f315e29b 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.transition.TransitionInflater import by.kirich1409.viewbindingdelegate.viewBinding import coil.load +import coil.size.Scale import com.tangem.tap.MainActivity import com.tangem.tap.common.extensions.show import com.tangem.tap.common.recyclerView.SpaceItemDecoration @@ -166,6 +167,8 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber + android:id="@+id/cl_wallet" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="74dp"> + android:id="@+id/iv_card" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="12dp" + android:scaleType="fitCenter" + android:adjustViewBounds="true" + android:elevation="3dp" + android:maxHeight="215dp" + android:contentDescription="@null" + app:layout_constraintTop_toTopOf="parent" + tools:src="@drawable/card_placeholder_black" /> Date: Fri, 15 Jul 2022 13:28:19 +0300 Subject: [PATCH 03/12] Updated on 2026-08-14 --- app/src/main/res/layout/fragment_wallet.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 1545257fc9..e77908ee26 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -174,6 +174,8 @@ android:layout_height="wrap_content" android:visibility="gone" android:layout_marginTop="30dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" app:layout_constraintTop_toBottomOf="@id/l_address" app:layout_constraintVertical_bias="1" app:layout_constraintBottom_toBottomOf="parent" /> @@ -185,6 +187,8 @@ android:layout_height="wrap_content" android:visibility="gone" android:layout_marginTop="30dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" app:layout_constraintTop_toBottomOf="@id/l_address" app:layout_constraintVertical_bias="1" app:layout_constraintBottom_toBottomOf="parent" /> From 926dd78d1a02c13331196900cc3ee0e8d8deeab0 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 15 Jul 2022 16:18:47 +0300 Subject: [PATCH 04/12] Updated on 2026-08-14 --- .../wallet/ui/adapters/WalletAdapter.kt | 3 ++ .../drawable/shape_badge_custom_currency.xml | 2 +- .../main/res/layout/item_currency_wallet.xml | 45 +++++++++++++------ 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt index 8514f1e384..b4f5f84a1f 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt @@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.Token import com.tangem.domain.common.TapWorkarounds.derivationStyle +import com.tangem.tap.common.extensions.getGreyedOutIconRes import com.tangem.tap.common.extensions.getString import com.tangem.tap.common.extensions.hide import com.tangem.tap.common.extensions.show @@ -116,6 +117,8 @@ class WalletAdapter ?: root.getString(id = R.string.token_item_no_rate) badgeCustomBalance.isVisible = isCustomCurrency + ivBlockchain.isVisible = wallet.currency.isToken() + ivBlockchain.setImageResource(wallet.currency.blockchain.getGreyedOutIconRes()) cardWallet.setOnClickListener { store.dispatch(WalletAction.MultiWallet.SelectWallet(wallet)) diff --git a/app/src/main/res/drawable/shape_badge_custom_currency.xml b/app/src/main/res/drawable/shape_badge_custom_currency.xml index 2c3b7f7bd4..cfd740103d 100644 --- a/app/src/main/res/drawable/shape_badge_custom_currency.xml +++ b/app/src/main/res/drawable/shape_badge_custom_currency.xml @@ -7,7 +7,7 @@ android:height="12dp" /> diff --git a/app/src/main/res/layout/item_currency_wallet.xml b/app/src/main/res/layout/item_currency_wallet.xml index de692cfa83..7f145c3e1d 100644 --- a/app/src/main/res/layout/item_currency_wallet.xml +++ b/app/src/main/res/layout/item_currency_wallet.xml @@ -18,11 +18,12 @@ + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:animateLayoutChanges="true" + android:clipToPadding="false"> + tools:src="@drawable/shape_circle" + tools:tint="@color/iconGray" /> + + + android:id="@+id/badge_custom_balance" + android:layout_width="10dp" + android:layout_height="10dp" + android:background="@drawable/shape_badge_custom_currency" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@id/iv_currency" + app:layout_constraintEnd_toEndOf="@id/iv_currency" + tools:visibility="visible" /> Date: Fri, 15 Jul 2022 17:10:13 +0300 Subject: [PATCH 05/12] Updated on 2026-08-14 --- app/src/main/res/layout/fragment_wallet.xml | 43 ++++++++++----------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 55fe30d0a9..d9339cbb3a 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -43,10 +43,11 @@ android:overScrollMode="never"> + android:id="@+id/cl_wallet" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="74dp" + android:clipToPadding="false"> + + - - - - - From f683452b864b2c32360b3486214a9a6be9895b90 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 20 Jul 2022 16:42:17 +0300 Subject: [PATCH 06/12] Updated on 2026-08-14 --- app/src/main/res/values/zendesk_styles.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/src/main/res/values/zendesk_styles.xml b/app/src/main/res/values/zendesk_styles.xml index ebb4fcab6b..0022b241b1 100644 --- a/app/src/main/res/values/zendesk_styles.xml +++ b/app/src/main/res/values/zendesk_styles.xml @@ -4,4 +4,15 @@ @color/darkGray6 @color/darkGray6 + + // Contact us FAB style + From 2c36329434af1de61638c152259095115e43ce79 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 21 Jul 2022 09:31:33 +0300 Subject: [PATCH 07/12] Updated on 2026-08-14 --- app/src/main/res/values-ru/strings_final.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ru/strings_final.xml b/app/src/main/res/values-ru/strings_final.xml index d2028c922e..f7c9df689f 100644 --- a/app/src/main/res/values-ru/strings_final.xml +++ b/app/src/main/res/values-ru/strings_final.xml @@ -61,7 +61,7 @@ Скрыть Вы скрываете токен с главного экрана, но в любой момент сможете добавить его обратно. Невозможно скрыть %s - Токен %s является основной валютой в сети %s и не может быть скрыт, до тех пор пока у вас в списке есть другие токены этой сети. + Токен %s является основной валютой в сети %s и не может быть скрыт до тех пор, пока у вас в списке есть другие токены этой сети. Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново. Сеть %s From 5f22df243a2ea26325ff8a72c32bb558a13e6dc6 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 21 Jul 2022 09:41:27 +0300 Subject: [PATCH 08/12] Updated on 2026-08-14 --- .../wallet/redux/middlewares/WalletMiddleware.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt index 7a4ac13ea5..1f8060618a 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt @@ -15,12 +15,7 @@ import com.tangem.domain.common.extensions.withMainContext import com.tangem.operations.attestation.Attestation import com.tangem.operations.attestation.OnlineCardVerifier import com.tangem.tap.common.analytics.Analytics -import com.tangem.tap.common.extensions.copyToClipboard -import com.tangem.tap.common.extensions.dispatchDebugErrorNotification -import com.tangem.tap.common.extensions.dispatchOnMain -import com.tangem.tap.common.extensions.onCardScanned -import com.tangem.tap.common.extensions.shareText -import com.tangem.tap.common.extensions.stripZeroPlainString +import com.tangem.tap.common.extensions.* import com.tangem.tap.common.redux.AppState import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.common.redux.navigation.AppScreen @@ -29,6 +24,7 @@ import com.tangem.tap.domain.failedRates import com.tangem.tap.domain.loadedRates import com.tangem.tap.features.demo.DemoHelper import com.tangem.tap.features.home.redux.HomeAction +import com.tangem.tap.features.home.redux.HomeMiddleware import com.tangem.tap.features.send.redux.PrepareSendScreen import com.tangem.tap.features.wallet.models.PendingTransactionType import com.tangem.tap.features.wallet.models.filterByCoin @@ -233,9 +229,7 @@ class WalletMiddleware { action.context.shareText(action.address) } is WalletAction.ExploreAddress -> { - val uri = Uri.parse(action.exploreUrl) - val intent = Intent(Intent.ACTION_VIEW, uri) - ContextCompat.startActivity(action.context, intent, null) + store.dispatchOpenUrl(action.exploreUrl) } is WalletAction.Send -> { val newAction = prepareSendAction(action.amount, store.state.walletState) From 42d15b8957a9b24092de003a8da281fc3325e05b Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 4 Jul 2022 18:48:26 +0300 Subject: [PATCH 09/12] Updated on 2026-08-14 --- .gitignore | 4 +- .idea/codeStyles/Project.xml | 202 +++++++++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/inspectionProfiles/Project_Default.xml | 92 +++++++++ 4 files changed, 302 insertions(+), 1 deletion(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml diff --git a/.gitignore b/.gitignore index 4cc00a7e1f..dd64e70b22 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ local.properties # User-specific configurations .idea +!.idea/codeStyles +!.idea/inspectionProfiles # LayoutInspector files /captures @@ -26,4 +28,4 @@ local.properties **/fastlane/report.xml **/fastlane/Preview.html **/fastlane/screenshots -**/fastlane/test_output \ No newline at end of file +**/fastlane/test_output diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000000..96ff0f5af3 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000..79ee123c2b --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000000..ba5af7a4ce --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,92 @@ + + + + \ No newline at end of file From 36a9ea3e8a198722a9589d2126bbd56a5b9ded9a Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 22 Jul 2022 13:45:15 +0300 Subject: [PATCH 10/12] Updated on 2026-08-14 --- .idea/codeStyles/Project.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 96ff0f5af3..ad9c1261c4 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,7 @@ +