mirror/AntennaPod
3
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-10-29 19:59:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix: Prevent error icon from overlapping title text (#7904)

Browse Source
This commit is contained in:
Soumyadip 2025-08-03 23:38:23 +05:30 committed by GitHub
parent 9e0859aab8
commit 448e1c1b8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavListAdapter.java
View File

@ -11,7 +11,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
@ -262,15 +261,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder>
.dontAnimate()) .dontAnimate())
.into(holder.image); .into(holder.image);
if (feed.hasLastUpdateFailed()) { holder.failure.setVisibility(feed.hasLastUpdateFailed() ? View.VISIBLE : View.GONE);
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);
}
} }
private void bindTagView(NavDrawerData.TagDrawerItem tag, FeedHolder holder) { private void bindTagView(NavDrawerData.TagDrawerItem tag, FeedHolder holder) {

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

@ -33,10 +33,12 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/listitem_iconwithtext_textleftpadding" android:layout_marginStart="@dimen/listitem_iconwithtext_textleftpadding"
android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
android:layout_marginEnd="48dp" android:layout_marginEnd="16dp"
android:layout_marginRight="48dp" android:layout_marginRight="16dp"
android:layout_toEndOf="@id/imgvCover" android:layout_toEndOf="@id/imgvCover"
android:layout_toRightOf="@id/imgvCover" android:layout_toRightOf="@id/imgvCover"
android:layout_toStartOf="@+id/rightGroup"
android:layout_toLeftOf="@+id/rightGroup"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:singleLine="true" android:singleLine="true"
@ -44,38 +46,38 @@
android:textSize="@dimen/text_size_navdrawer" android:textSize="@dimen/text_size_navdrawer"
tools:text="Navigation item title" /> tools:text="Navigation item title" />
<ImageView <LinearLayout
android:id="@+id/itxtvFailure" android:id="@+id/rightGroup"
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"
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_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="4dp" android:orientation="horizontal"
android:layout_marginLeft="4dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:lines="1" android:layout_marginEnd="8dp"
android:padding="8dp" android:gravity="center_vertical">
android:textColor="?android:attr/textColorTertiary"
android:textSize="14sp" <ImageView
tools:text="23" /> 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> </RelativeLayout>