From 1d7cf5ae39e6f5422a97948d1da125036f7648d5 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 11 Oct 2025 22:31:32 +0200
Subject: [PATCH] [android] Improve phone item view

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../app/organicmaps/editor/PhoneListAdapter.java  |  3 ---
 android/app/src/main/res/layout/item_phone.xml    | 15 +++++++--------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
index cab90f3b4..6a685515b 100644
--- a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
@@ -113,9 +113,6 @@ public class PhoneListAdapter extends RecyclerView.Adapter<PhoneListAdapter.View
 
       deleteButton = itemView.findViewById(R.id.delete_icon);
       deleteButton.setOnClickListener(this);
-      // TODO: setting icons from code because icons defined in layout XML are white.
-      deleteButton.setImageResource(R.drawable.ic_delete);
-      ((ShapeableImageView) itemView.findViewById(R.id.phone_icon)).setImageResource(R.drawable.ic_phone);
     }
 
     public void setPosition(int position)
diff --git a/android/app/src/main/res/layout/item_phone.xml b/android/app/src/main/res/layout/item_phone.xml
index 7b30e90cf..8733fb748 100644
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -6,7 +6,7 @@
     android:layout_height="@dimen/height_item_oneline"
     android:background="?clickableBackground"
     android:paddingStart="@dimen/margin_half_plus"
-    android:paddingEnd="@dimen/margin_half">
+    android:paddingEnd="@dimen/margin_half_plus">
 
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/phone_icon"
@@ -15,14 +15,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/phone_input"
-        tools:ignore="ContentDescription"
-        tools:src="@drawable/ic_phone"/>
+        app:srcCompat="@drawable/ic_phone"
+        tools:ignore="ContentDescription" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/phone_input"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_half"
+        android:layout_marginEnd="@dimen/margin_half"
         android:layout_toStartOf="@id/delete_icon"
         android:textColorHint="?android:textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -41,13 +42,11 @@
       android:id="@+id/delete_icon"
       style="@style/MwmWidget.Editor.MetadataIcon"
       android:layout_marginStart="@dimen/margin_half"
-      android:layout_marginTop="@dimen/margin_half"
-      android:layout_marginEnd="@dimen/margin_half"
-      android:layout_marginBottom="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      tools:ignore="ContentDescription"
-      tools:src="@drawable/ic_delete" />
+      app:layout_constraintStart_toEndOf="@+id/phone_input"
+      app:srcCompat="@drawable/ic_delete"
+      tools:ignore="ContentDescription" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>