summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java2
-rw-r--r--app/src/main/res/layout/nav_feedlistitem.xml83
-rw-r--r--app/src/main/res/layout/nav_listitem.xml21
3 files changed, 20 insertions, 86 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 6a16949cc..f491a8b29 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -317,7 +317,7 @@ public class NavListAdapter extends BaseAdapter
LayoutInflater inflater = (LayoutInflater) context
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- convertView = inflater.inflate(R.layout.nav_feedlistitem, parent, false);
+ convertView = inflater.inflate(R.layout.nav_listitem, parent, false);
holder.image = convertView.findViewById(R.id.imgvCover);
holder.title = convertView.findViewById(R.id.txtvTitle);
diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
deleted file mode 100644
index 52833b3cd..000000000
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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:paddingLeft="@dimen/listitem_icon_leftpadding"
- android:paddingStart="@dimen/listitem_icon_leftpadding"
- android:paddingRight="@dimen/listitem_icon_rightpadding"
- android:paddingEnd="@dimen/listitem_icon_rightpadding"
- tools:background="@android:color/darker_gray"
- android:foreground="?attr/selectableItemBackground">
-
- <ImageView
- android:id="@+id/imgvCover"
- android:contentDescription="@string/cover_label"
- android:layout_width="@dimen/thumbnail_length_navlist"
- android:layout_height="@dimen/thumbnail_length_navlist"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- android:adjustViewBounds="true"
- android:cropToPadding="true"
- android:scaleType="centerCrop"
- android:layout_marginTop="4dp"
- android:layout_marginBottom="4dp"
- tools:src="@drawable/ic_antenna"
- tools:background="@android:color/holo_green_dark"/>
-
- <TextView
- android:id="@+id/txtvCount"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/list_vertical_padding"
- android:layout_marginStart="@dimen/list_vertical_padding"
- android:lines="1"
- android:textColor="?android:attr/textColorTertiary"
- android:textSize="@dimen/text_size_navdrawer"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- tools:text="23"
- tools:background="@android:color/holo_green_dark"/>
-
- <com.joanzapata.iconify.widget.IconTextView
- 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_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"
- tools:text="!"
- tools:background="@android:color/holo_green_dark"/>
-
- <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_marginStart="@dimen/listitem_iconwithtext_textleftpadding"
- android:layout_toRightOf="@id/imgvCover"
- android:layout_toEndOf="@id/imgvCover"
- android:layout_toLeftOf="@id/itxtvFailure"
- android:layout_toStartOf="@id/itxtvFailure"
- android:layout_alignWithParentIfMissing="true"
- tools:text="Navigation feed item title"
- tools:background="@android:color/holo_green_dark"/>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index 87f07793c..f03ebc09f 100644
--- a/app/src/main/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
@@ -18,7 +18,6 @@
android:adjustViewBounds="true"
android:cropToPadding="true"
android:scaleType="centerInside"
- android:padding="4dp"
android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
android:layout_marginStart="@dimen/listitem_icon_leftpadding"
android:layout_marginTop="4dp"
@@ -44,13 +43,31 @@
android:layout_toEndOf="@id/imgvCover"
tools:text="Navigation item title" />
+ <com.joanzapata.iconify.widget.IconTextView
+ 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_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:visibility="gone"
+ tools:text="!"
+ tools:background="@android:color/holo_green_dark"/>
+
<TextView
android:id="@+id/txtvCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
android:textColor="?android:attr/textColorTertiary"
- android:textSize="@dimen/text_size_navdrawer"
+ android:textSize="14sp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="@dimen/listitem_icon_rightpadding"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 13:22:50 +0000