Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5959 from TacoTheDank/removeIconifyNavFailures

Browse Source 
Remove iconify: NavListItem failures
This commit is contained in:
ByteHamster 2022-08-04 20:12:04 +02:00 committed by GitHub
commit 1bab9f7f8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
View File

@ -22,7 +22,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.RequestOptions;
import com.joanzapata.iconify.Iconify; import com.joanzapata.iconify.Iconify;
import com.joanzapata.iconify.widget.IconTextView;
import de.danoeh.antennapod.R; import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.PreferenceActivity; import de.danoeh.antennapod.activity.PreferenceActivity;
import de.danoeh.antennapod.fragment.CompletedDownloadsFragment; import de.danoeh.antennapod.fragment.CompletedDownloadsFragment;
@ -388,7 +387,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder>
static class FeedHolder extends Holder { static class FeedHolder extends Holder {
final ImageView image; final ImageView image;
final TextView title; final TextView title;
final IconTextView failure; final ImageView failure;
final TextView count; final TextView count;
public FeedHolder(@NonNull View itemView) { public FeedHolder(@NonNull View itemView) {

87
app/src/main/res/layout/nav_listitem.xml
View File

@ -1,82 +1,81 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/listitem_iconwithtext_height" android:layout_height="@dimen/listitem_iconwithtext_height"
android:foreground="?attr/selectableItemBackground" > android:foreground="?attr/selectableItemBackground"
android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/imgvCover" android:id="@+id/imgvCover"
android:importantForAccessibility="no"
android:layout_width="@dimen/thumbnail_length_navlist" android:layout_width="@dimen/thumbnail_length_navlist"
android:layout_height="@dimen/thumbnail_length_navlist" android:layout_height="@dimen/thumbnail_length_navlist"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="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_marginStart="@dimen/listitem_icon_leftpadding"
android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="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 <TextView
android:id="@+id/txtvTitle" 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_width="wrap_content"
android:layout_height="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_marginStart="@dimen/listitem_iconwithtext_textleftpadding"
android:layout_marginRight="48dp" android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
android:layout_marginEnd="48dp" android:layout_marginEnd="48dp"
android:layout_toRightOf="@id/imgvCover" android:layout_marginRight="48dp"
android:layout_toEndOf="@id/imgvCover" 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" /> tools:text="Navigation item title" />
<com.joanzapata.iconify.widget.IconTextView <ImageView
android:id="@+id/itxtvFailure" android:id="@+id/itxtvFailure"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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: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_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:visibility="gone"
tools:text="!" app:srcCompat="@drawable/ic_error"
tools:background="@android:color/holo_green_dark"/> app:tint="@color/download_failed_red"
tools:background="@android:color/holo_green_dark"
tools:text="!" />
<TextView <TextView
android:id="@+id/txtvCount" android:id="@+id/txtvCount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:lines="1"
android:padding="8dp"
android:textColor="?android:attr/textColorTertiary" android:textColor="?android:attr/textColorTertiary"
android:textSize="14sp" 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" /> tools:text="23" />
</RelativeLayout> </RelativeLayout>

9
core/src/main/res/drawable/ic_error.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFFFF"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
</vector>