From d501d7ce3e9ae2f9fb8b4a8efa7435293dab4337 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 25 Sep 2020 22:17:50 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/ic_launcher-playstore.png | Bin 0 -> 13028 bytes .../details/ui/CurrencySelectionDialog.kt | 5 ++--- app/src/main/res/layout/fragment_details.xml | 19 ++---------------- app/src/main/res/layout/layout_address.xml | 10 ++++----- 4 files changed, 9 insertions(+), 25 deletions(-) create mode 100644 app/src/main/ic_launcher-playstore.png diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..4c55d07eb370f80fd96871f09565bbab0f90a8c5 GIT binary patch literal 13028 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 literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/CurrencySelectionDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/CurrencySelectionDialog.kt index a2267999e0..dc00b896f8 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/CurrencySelectionDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/CurrencySelectionDialog.kt @@ -2,7 +2,6 @@ package com.tangem.tap.features.details.ui import android.content.Context import androidx.appcompat.app.AlertDialog -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.tangem.tap.common.extensions.toFormattedString import com.tangem.tap.common.redux.global.FiatCurrencyName import com.tangem.tap.features.details.redux.DetailsAction @@ -20,9 +19,9 @@ class CurrencySelectionDialog { val currenciesToShow = currencies.map { it.toFormattedString() }.toTypedArray() var currentSelection = currencies.indexOfFirst { it.symbol == currentAppCurrency } - dialog = MaterialAlertDialogBuilder(context) + dialog = AlertDialog.Builder(context) .setTitle(context.getString(R.string.details_currency)) - .setNeutralButton(context.getString(R.string.generic_cancel)) { _, _ -> + .setNegativeButton(context.getString(R.string.generic_cancel)) { _, _ -> store.dispatch(DetailsAction.AppCurrencyAction.Cancel) } .setPositiveButton(context.getString(R.string.generic_done)) { _, _ -> diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml index e15c215225..7582d69d9f 100644 --- a/app/src/main/res/layout/fragment_details.xml +++ b/app/src/main/res/layout/fragment_details.xml @@ -177,20 +177,6 @@ android:background="@color/separatorGrey2" app:layout_constraintTop_toBottomOf="@id/tv_card_title" /> - - + app:layout_constraintTop_toBottomOf="@id/tv_card_title" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_address.xml b/app/src/main/res/layout/layout_address.xml index 36accca525..960f7cd9f0 100644 --- a/app/src/main/res/layout/layout_address.xml +++ b/app/src/main/res/layout/layout_address.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:ellipsize="middle" android:paddingStart="16dp" - android:paddingTop="20dp" + android:paddingTop="16dp" android:paddingEnd="16dp" android:singleLine="true" android:textColor="@color/darkGray1" @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:drawablePadding="9dp" android:paddingStart="16dp" - android:paddingTop="6dp" + android:paddingTop="4dp" android:paddingEnd="16dp" android:paddingBottom="25dp" android:text="@string/wallet_explore_address" @@ -109,7 +109,7 @@