Merge pull request #5959 from TacoTheDank/removeIconifyNavFailures

Remove iconify: NavListItem failures

2 files changed, 44 insertions, 46 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 6fcdca416..aaf914ebc 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -22,7 +22,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.joanzapata.iconify.Iconify;
-import com.joanzapata.iconify.widget.IconTextView;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.PreferenceActivity;
 import de.danoeh.antennapod.fragment.CompletedDownloadsFragment;
@@ -388,7 +387,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder>
     static class FeedHolder extends Holder {
         final ImageView image;
         final TextView title;
-        final IconTextView failure;
+        final ImageView failure;
         final TextView count;
 
         public FeedHolder(@NonNull View itemView) {
diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index 607b328e6..37b629abb 100644
--- a/app/src/main/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
@@ -1,82 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/listitem_iconwithtext_height"
-        android:foreground="?attr/selectableItemBackground" >
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/listitem_iconwithtext_height"
+    android:foreground="?attr/selectableItemBackground"
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/imgvCover"
-        android:importantForAccessibility="no"
         android:layout_width="@dimen/thumbnail_length_navlist"
         android:layout_height="@dimen/thumbnail_length_navlist"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:adjustViewBounds="true"
-        android:cropToPadding="true"
-        android:scaleType="centerInside"
-        android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
         android:layout_marginStart="@dimen/listitem_icon_leftpadding"
+        android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
-        tools:src="@drawable/ic_download_black"/>
-
+        android:adjustViewBounds="true"
+        android:cropToPadding="true"
+        android:importantForAccessibility="no"
+        android:scaleType="centerInside"
+        tools:src="@drawable/ic_download_black" />
 
     <TextView
         android:id="@+id/txtvTitle"
-        android:lines="1"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:layout_centerVertical="true"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="@dimen/text_size_navdrawer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
+        android:layout_centerVertical="true"
         android:layout_marginStart="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_marginRight="48dp"
+        android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
         android:layout_marginEnd="48dp"
-        android:layout_toRightOf="@id/imgvCover"
+        android:layout_marginRight="48dp"
         android:layout_toEndOf="@id/imgvCover"
+        android:layout_toRightOf="@id/imgvCover"
+        android:ellipsize="end"
+        android:lines="1"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/text_size_navdrawer"
         tools:text="Navigation item title" />
 
-    <com.joanzapata.iconify.widget.IconTextView
+    <ImageView
         android:id="@+id/itxtvFailure"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/txtvCount"
-        android:layout_toStartOf="@id/txtvCount"
-        android:layout_marginLeft="@dimen/list_vertical_padding"
-        android:layout_marginStart="@dimen/list_vertical_padding"
-        android:layout_marginRight="@dimen/list_vertical_padding"
-        android:layout_marginEnd="@dimen/list_vertical_padding"
         android:layout_alignWithParentIfMissing="true"
-        android:lines="1"
-        android:text="{fa-exclamation-circle}"
-        android:textColor="@color/download_failed_red"
-        android:textSize="@dimen/text_size_navdrawer"
         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"
-        tools:text="!"
-        tools:background="@android:color/holo_green_dark"/>
+        app:srcCompat="@drawable/ic_error"
+        app:tint="@color/download_failed_red"
+        tools:background="@android:color/holo_green_dark"
+        tools:text="!" />
 
     <TextView
         android:id="@+id/txtvCount"
         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:layout_marginRight="8dp"
         android:lines="1"
+        android:padding="8dp"
         android:textColor="?android:attr/textColorTertiary"
         android:textSize="14sp"
-        android:padding="8dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
         tools:text="23" />
+
 </RelativeLayout>