From e55a54cb2131e0fcb7643bc66a96aa5b92803ba9 Mon Sep 17 00:00:00 2001
From: orhoj <jo@concordium.com>
Date: Mon, 4 Mar 2024 14:09:45 +0100
Subject: [PATCH] Center identity name when edit icon is visible

---
 CHANGELOG.md                                  |  1 +
 .../wallet/uicore/view/IdentityView.kt        | 11 ++----
 app/src/main/res/layout/view_identity.xml     | 36 +++++++++++++------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26f85aeb..7f7cf2fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Exiting the wallet after accepting an identity verification error
 - Incorrect environment name in a private key export file for Mainnet
 - Improper handling of rejected identity verification when setting up a new wallet
+- An issue where the identity name was off-center when the edit name icon was visible
 
 ### Changed
 - Suggest running a recovery when facing account or identity creation errors
diff --git a/app/src/main/java/com/concordium/wallet/uicore/view/IdentityView.kt b/app/src/main/java/com/concordium/wallet/uicore/view/IdentityView.kt
index de1b0986..8fc0076d 100644
--- a/app/src/main/java/com/concordium/wallet/uicore/view/IdentityView.kt
+++ b/app/src/main/java/com/concordium/wallet/uicore/view/IdentityView.kt
@@ -46,15 +46,8 @@ constructor(
     private var onChangeNameClickListener: OnChangeNameClickListener? = null
 
     fun enableChangeNameOption(identity: Identity) {
-        binding.nameTextview.compoundDrawablePadding = 20
-        val drawable = AppCompatResources.getDrawable(context, R.drawable.cryptox_ico_edit)
-        binding.nameTextview.setCompoundDrawablesRelativeWithIntrinsicBounds(
-            null,
-            null,
-            drawable,
-            null
-        )
-        binding.nameTextview.setOnClickListener {
+        binding.nameIcon.isVisible = true
+        binding.nameTextAndIcon.setOnClickListener {
             onChangeNameClickListener?.onChangeNameClicked(identity)
         }
     }
diff --git a/app/src/main/res/layout/view_identity.xml b/app/src/main/res/layout/view_identity.xml
index 6b703b53..87293fab 100644
--- a/app/src/main/res/layout/view_identity.xml
+++ b/app/src/main/res/layout/view_identity.xml
@@ -31,18 +31,34 @@
         tools:text="@string/view_identity_status_done"
         tools:textColor="@color/ccx_status_success" />
 
-    <TextView
-        android:id="@+id/name_textview"
+    <RelativeLayout
+        android:id="@+id/name_text_and_icon"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_marginTop="8dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:textAppearance="@style/CCX_Typography_H2"
-        android:textColor="@color/ccx_neutral_tint_1"
-        tools:drawableEndCompat="@drawable/cryptox_ico_edit"
-        tools:text="Identity 1" />
+        >
+
+        <TextView
+            android:id="@+id/name_textview"
+            android:layout_width="match_parent"
+            android:layout_marginHorizontal="25dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textAppearance="@style/CCX_Typography_H2"
+            android:textColor="@color/ccx_neutral_tint_1"
+            tools:text="Identity 1" />
+
+        <ImageView
+            android:id="@+id/name_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:visibility="invisible"
+            android:src="@drawable/cryptox_ico_edit"/>
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/expires_textview"