From a09e90e5d3d4c93cb08ca8a8dd41420c59a06faa Mon Sep 17 00:00:00 2001
From: pokkst <pokkst@protonmail.com>
Date: Sun, 9 Jul 2023 23:11:02 -0500
Subject: [PATCH] More UTXO list UI adjustments and fixes (0.4.4.2)

---
 app/build.gradle                              |  4 ++--
 .../wallet/adapter/CoinsInfoAdapter.java      |  2 ++
 app/src/main/res/layout/fragment_utxos.xml    |  2 --
 .../main/res/layout/utxo_selection_item.xml   | 20 ++++++++++---------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3fcb1b0..9b6507f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "net.mynero.wallet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 40401
-        versionName "0.4.4.1 'Fluorine Fermi'"
+        versionCode 40402
+        versionName "0.4.4.2 'Fluorine Fermi'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.java b/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.java
index a1a14b2..e989853 100644
--- a/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.java
+++ b/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.java
@@ -126,6 +126,7 @@ public class CoinsInfoAdapter extends RecyclerView.Adapter<CoinsInfoAdapter.View
                         listener.onUtxoSelected(coinsInfo);
                     }
                 });
+                itemView.setOnLongClickListener(null);
             } else {
                 itemView.setOnLongClickListener(view -> {
                     boolean unlocked = coinsInfo.isUnlocked();
@@ -134,6 +135,7 @@ public class CoinsInfoAdapter extends RecyclerView.Adapter<CoinsInfoAdapter.View
                     }
                     return unlocked;
                 });
+                itemView.setOnClickListener(null);
             }
 
             if (selected) {
diff --git a/app/src/main/res/layout/fragment_utxos.xml b/app/src/main/res/layout/fragment_utxos.xml
index 24bf6a1..72b37fa 100644
--- a/app/src/main/res/layout/fragment_utxos.xml
+++ b/app/src/main/res/layout/fragment_utxos.xml
@@ -27,8 +27,6 @@
         android:layout_marginTop="16dp"
         android:clipToPadding="false"
         android:paddingBottom="128dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/utxo_selection_item.xml b/app/src/main/res/layout/utxo_selection_item.xml
index 96de12f..161923a 100644
--- a/app/src/main/res/layout/utxo_selection_item.xml
+++ b/app/src/main/res/layout/utxo_selection_item.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:text="Coin"
         android:textStyle="bold"
-        android:textSize="12sp"
+        android:textSize="20sp"
         android:textColor="@color/oled_addressListColor"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@id/utxo_outpoint_textview"
@@ -26,7 +26,7 @@
         android:ellipsize="middle"
         android:layout_marginStart="8dp"
         android:textStyle="bold"
-        android:textSize="16sp"
+        android:textSize="14sp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toEndOf="@id/utxo_coin_label"
         app:layout_constraintEnd_toEndOf="parent"
@@ -38,7 +38,9 @@
         android:layout_height="wrap_content"
         android:text="Public Key"
         android:textStyle="bold"
-        android:textSize="12sp"
+        android:textSize="20sp"
+        android:layout_marginStart="16dp"
+
         android:textColor="@color/oled_addressListColor"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -49,10 +51,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Public Key"
-        android:textStyle="bold"
-        android:textSize="16sp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:textSize="14sp"
+        android:layout_marginStart="32dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@id/utxo_amount_label"
@@ -64,7 +64,7 @@
         android:text="Amount"
         android:textStyle="bold"
         android:ellipsize="middle"
-        android:textSize="12sp"
+        android:textSize="20sp"
         android:layout_marginStart="16dp"
         android:textColor="@color/oled_addressListColor"
         app:layout_constraintTop_toBottomOf="@id/utxo_pub_key_textview"
@@ -78,6 +78,7 @@
         android:layout_height="wrap_content"
         android:text="Amount"
         android:ellipsize="middle"
+        android:textSize="14sp"
         android:layout_marginStart="32dp"
         app:layout_constraintTop_toBottomOf="@id/utxo_amount_label"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -92,7 +93,7 @@
         android:ellipsize="middle"
         android:gravity="end"
         android:textStyle="bold"
-        android:textSize="12sp"
+        android:textSize="20sp"
         android:textColor="@color/oled_addressListColor"
         app:layout_constraintTop_toBottomOf="@id/utxo_pub_key_textview"
         app:layout_constraintBottom_toTopOf="@id/utxo_global_index_textview"
@@ -106,6 +107,7 @@
         android:text="999999999999"
         android:ellipsize="middle"
         android:gravity="end"
+        android:textSize="14sp"
         app:layout_constraintTop_toBottomOf="@id/utxo_global_index_label"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/utxo_amount_textview"