diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000000..4c55d07eb3 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ 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 @@