From 448e1c1b8bb25ea3f731c29a84716a27f0b9d16b Mon Sep 17 00:00:00 2001
From: Soumyadip <105947032+soumya9832@users.noreply.github.com>
Date: Sun, 3 Aug 2025 23:38:23 +0530
Subject: [PATCH] Fix: Prevent error icon from overlapping title text (#7904)

---
 .../ui/screen/drawer/NavListAdapter.java      | 11 +---
 app/src/main/res/layout/nav_listitem.xml      | 62 ++++++++++---------
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavListAdapter.java
index 898a55c90..763b0ca1f 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavListAdapter.java
@@ -11,7 +11,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
@@ -262,15 +261,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder>
                     .dontAnimate())
                 .into(holder.image);
 
-        if (feed.hasLastUpdateFailed()) {
-            RelativeLayout.LayoutParams p = (RelativeLayout.LayoutParams) holder.title.getLayoutParams();
-            p.addRule(RelativeLayout.LEFT_OF, R.id.itxtvFailure);
-            holder.failure.setVisibility(View.VISIBLE);
-        } else {
-            RelativeLayout.LayoutParams p = (RelativeLayout.LayoutParams) holder.title.getLayoutParams();
-            p.addRule(RelativeLayout.LEFT_OF, R.id.txtvCount);
-            holder.failure.setVisibility(View.GONE);
-        }
+        holder.failure.setVisibility(feed.hasLastUpdateFailed() ? View.VISIBLE : View.GONE);
     }
 
     private void bindTagView(NavDrawerData.TagDrawerItem tag, FeedHolder holder) {
diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index b6ff744c8..1d969301e 100644
--- a/app/src/main/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
@@ -33,10 +33,12 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="@dimen/listitem_iconwithtext_textleftpadding"
         android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_marginEnd="48dp"
-        android:layout_marginRight="48dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/imgvCover"
         android:layout_toRightOf="@id/imgvCover"
+        android:layout_toStartOf="@+id/rightGroup"
+        android:layout_toLeftOf="@+id/rightGroup"
         android:ellipsize="end"
         android:lines="1"
         android:singleLine="true"
@@ -44,38 +46,38 @@
         android:textSize="@dimen/text_size_navdrawer"
         tools:text="Navigation item title" />
 
-    <ImageView
-        android:id="@+id/itxtvFailure"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/list_vertical_padding"
-        android:layout_marginLeft="@dimen/list_vertical_padding"
-        android:layout_marginEnd="@dimen/list_vertical_padding"
-        android:layout_marginRight="@dimen/list_vertical_padding"
-        android:layout_toStartOf="@id/txtvCount"
-        android:layout_toLeftOf="@id/txtvCount"
-        android:visibility="gone"
-        android:contentDescription="@string/refresh_failed_msg"
-        app:srcCompat="@drawable/ic_error"
-        tools:text="!" />
-
-    <TextView
-        android:id="@+id/txtvCount"
+    <LinearLayout
+        android:id="@+id/rightGroup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_marginStart="4dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginEnd="8dp"
+        android:orientation="horizontal"
         android:layout_marginRight="8dp"
-        android:lines="1"
-        android:padding="8dp"
-        android:textColor="?android:attr/textColorTertiary"
-        android:textSize="14sp"
-        tools:text="23" />
+        android:layout_marginEnd="8dp"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/itxtvFailure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:visibility="gone"
+            android:contentDescription="@string/refresh_failed_msg"
+            app:srcCompat="@drawable/ic_error"
+            tools:text="!"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/txtvCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:padding="8dp"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textSize="14sp"
+            tools:text="23" />
+
+    </LinearLayout>
 
 </RelativeLayout>