From af474cda5e013910204b1bf34112acb0c2dfc722 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 14 Sep 2020 19:32:23 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../tap/features/send/ui/SendFragment.kt      |  2 -
 app/src/main/res/layout/btn_arrow_up_down.xml | 21 ---------
 app/src/main/res/layout/btn_paste.xml         | 22 ----------
 app/src/main/res/layout/btn_qr_code.xml       | 21 ---------
 app/src/main/res/layout/layout_address.xml    |  8 ++--
 .../res/layout/layout_send_address_payid.xml  | 44 ++++++++++++++-----
 app/src/main/res/values/dimens.xml            |  1 +
 7 files changed, 38 insertions(+), 81 deletions(-)
 delete mode 100644 app/src/main/res/layout/btn_arrow_up_down.xml
 delete mode 100644 app/src/main/res/layout/btn_paste.xml
 delete mode 100644 app/src/main/res/layout/btn_qr_code.xml

diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt
index 04c4888ec0..18311e70fe 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt
@@ -30,8 +30,6 @@ import com.tangem.tap.features.send.ui.stateSubscribers.SendStateSubscriber
 import com.tangem.tap.mainScope
 import com.tangem.tap.store
 import com.tangem.wallet.R
-import kotlinx.android.synthetic.main.btn_paste.*
-import kotlinx.android.synthetic.main.btn_qr_code.*
 import kotlinx.android.synthetic.main.fragment_send.*
 import kotlinx.android.synthetic.main.layout_send_address_payid.*
 import kotlinx.android.synthetic.main.layout_send_amount.*
diff --git a/app/src/main/res/layout/btn_arrow_up_down.xml b/app/src/main/res/layout/btn_arrow_up_down.xml
deleted file mode 100644
index 6f9c5f9bc0..0000000000
--- a/app/src/main/res/layout/btn_arrow_up_down.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/flArrowUpDown"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/shape_ellipse"
-    android:backgroundTint="@android:color/transparent"
-    android:clickable="true"
-    android:focusable="true">
-
-    <ImageView
-        android:id="@+id/imvArrowUpDown"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="4dp"
-        app:srcCompat="@drawable/ic_arrows_up_down" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/btn_paste.xml b/app/src/main/res/layout/btn_paste.xml
deleted file mode 100644
index e561f4477f..0000000000
--- a/app/src/main/res/layout/btn_paste.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/flPaste"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="12dp"
-    android:layout_marginBottom="8dp"
-    android:background="@drawable/shape_ellipse"
-    android:clickable="true"
-    android:focusable="true">
-
-    <ImageView
-        android:id="@+id/imvPaste"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="5dp"
-        app:srcCompat="@drawable/ic_paste" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/btn_qr_code.xml b/app/src/main/res/layout/btn_qr_code.xml
deleted file mode 100644
index ec3f704035..0000000000
--- a/app/src/main/res/layout/btn_qr_code.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/flQrCode"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="8dp"
-    android:background="@drawable/shape_ellipse"
-    android:clickable="true"
-    android:focusable="true">
-
-    <ImageView
-        android:id="@+id/imvQrCode"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="4dp"
-        app:srcCompat="@drawable/ic_qr_code_scan" />
-
-</FrameLayout>
\ 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 3fafd3e5cb..d54f709499 100644
--- a/app/src/main/res/layout/layout_address.xml
+++ b/app/src/main/res/layout/layout_address.xml
@@ -60,8 +60,8 @@
 
             <FrameLayout
                 android:id="@+id/btn_copy"
-                android:layout_width="43dp"
-                android:layout_height="43dp"
+                android:layout_width="@dimen/btn_rounded_size"
+                android:layout_height="@dimen/btn_rounded_size"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
                 android:background="@drawable/shape_ellipse"
@@ -84,8 +84,8 @@
 
             <FrameLayout
                 android:id="@+id/btn_show_qr"
-                android:layout_width="43dp"
-                android:layout_height="43dp"
+                android:layout_width="@dimen/btn_rounded_size"
+                android:layout_height="@dimen/btn_rounded_size"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
                 android:background="@drawable/shape_ellipse"
diff --git a/app/src/main/res/layout/layout_send_address_payid.xml b/app/src/main/res/layout/layout_send_address_payid.xml
index 61d371ae01..3a93463a6a 100644
--- a/app/src/main/res/layout/layout_send_address_payid.xml
+++ b/app/src/main/res/layout/layout_send_address_payid.xml
@@ -31,23 +31,45 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <include
+    <FrameLayout
         android:id="@+id/flPaste"
-        layout="@layout/btn_paste"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/btn_rounded_size"
+        android:layout_height="@dimen/btn_rounded_size"
         android:layout_marginEnd="12dp"
+        android:background="@drawable/shape_ellipse"
         app:layout_constraintBottom_toBottomOf="@+id/flQrCode"
         app:layout_constraintEnd_toStartOf="@+id/flQrCode"
-        app:layout_constraintTop_toTopOf="@+id/flQrCode" />
+        app:layout_constraintTop_toTopOf="@+id/flQrCode">
 
-    <include
+        <ImageView
+            android:id="@+id/imvPaste"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="?selectableItemBackgroundBorderless"
+            android:padding="6dp"
+            app:srcCompat="@drawable/ic_paste" />
+
+    </FrameLayout>
+
+    <FrameLayout
         android:id="@+id/flQrCode"
-        layout="@layout/btn_qr_code"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="14dp"
+        android:layout_width="@dimen/btn_rounded_size"
+        android:layout_height="@dimen/btn_rounded_size"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/shape_ellipse"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/tilAddressOrPayId" />
+        app:layout_constraintTop_toTopOf="@+id/tilAddressOrPayId">
+
+        <ImageView
+            android:id="@+id/imvQrCode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="?selectableItemBackgroundBorderless"
+            android:padding="5dp"
+            app:srcCompat="@drawable/ic_qr_code_scan" />
+
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c3b19a53d6..49798d893b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -30,6 +30,7 @@
     <dimen name="size_progress_bar_big">135dp</dimen>
 
     <dimen name="btn_corner_radius">4dp</dimen>
+    <dimen name="btn_rounded_size">44dp</dimen>
 
     <dimen name="text_size_amount_to_send">32sp</dimen>