diff options
| author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-07-24 17:23:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 17:23:34 +0200 |
| commit | 959b7fcebb0515e3b6cc6dab3141bd267987ca85 (patch) | |
| tree | 71a6c49e8f518fb8060c65fbb67ec58e2b0ab974 /app/src/main | |
| parent | f4c92e88dbf29c1403bf28f92c3a6fa3a474b1c0 (diff) | |
| parent | 3cab62348a236f0b836f684f7c2aaa32a765cdc5 (diff) | |
| download | AntennaPod-959b7fcebb0515e3b6cc6dab3141bd267987ca85.zip | |
Merge pull request #5295 from ByteHamster/glow-player
Removed highlighting of episode title
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/cover_fragment.xml | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java index fab4ff441..5dbadaefa 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java @@ -166,7 +166,9 @@ public class CoverFragment extends Fragment { int animUnit = 1500; if (lines > txtvEpisodeTitle.getMaxLines()) { ObjectAnimator verticalMarquee = ObjectAnimator.ofInt( - txtvEpisodeTitle, "scrollY", 0, txtvEpisodeTitle.getHeight()) + txtvEpisodeTitle, "scrollY", 0, (lines - txtvEpisodeTitle.getMaxLines()) * ( + (txtvEpisodeTitle.getHeight() - txtvEpisodeTitle.getPaddingTop() + - txtvEpisodeTitle.getPaddingBottom()) / txtvEpisodeTitle.getMaxLines())) .setDuration(lines * animUnit); ObjectAnimator fadeOut = ObjectAnimator.ofFloat( txtvEpisodeTitle, "alpha", 0); diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index 8333ded1e..548e55774 100644 --- a/app/src/main/res/layout/cover_fragment.xml +++ b/app/src/main/res/layout/cover_fragment.xml @@ -4,10 +4,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/cover_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:id="@+id/cover_fragment" android:padding="8dp" android:gravity="center"> @@ -57,7 +57,6 @@ android:id="@+id/txtvEpisodeTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:selectableItemBackground" android:ellipsize="none" android:gravity="center_horizontal" android:maxLines="2" @@ -125,6 +124,7 @@ android:text="@string/shownotes_label" android:textColor="?android:attr/textColorSecondary" android:textSize="16sp" /> + </LinearLayout> <LinearLayout @@ -168,6 +168,7 @@ android:contentDescription="@string/next_chapter" android:scaleType="fitCenter" app:srcCompat="@drawable/ic_chapter_next" /> + </LinearLayout> </LinearLayout> |