Merge 54b0eef8f1 into 2827f41430

Improve layout for missing chapter images (#7164 )
If only some chapters have images the other chapters don't display anything but reserve space for the image. Now those chapters display the image of the episode. If no chapters have images no images will be displayed (just like before).
2024-05-07 22:06:54 +02:00 · 2024-05-06 22:14:26 +02:00 · 2024-05-06 22:04:24 +02:00 · 2023-12-04 12:46:19 -06:00 · 2023-12-04 12:18:59 -06:00 · 2023-12-04 11:38:09 -06:00
13 changed files with 33 additions and 23 deletions
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/chapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/chapter/ChaptersListAdapter.java
@ -19,6 +19,7 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.model.feed.Chapter;
 import de.danoeh.antennapod.ui.common.Converter;
 import de.danoeh.antennapod.model.feed.EmbeddedChapterImage;
+import de.danoeh.antennapod.ui.common.ImagePlaceholder;
 import de.danoeh.antennapod.ui.common.IntentUtils;
 import de.danoeh.antennapod.model.playback.Playable;
 import de.danoeh.antennapod.ui.common.CircularProgressBar;
@ -99,15 +100,27 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte

        if (hasImages) {
            holder.image.setVisibility(View.VISIBLE);
+
+            float radius = 4 * context.getResources().getDisplayMetrics().density;
+            RequestOptions options = new RequestOptions()
+                    .placeholder(ImagePlaceholder.getDrawable(context, radius))
+                    .dontAnimate()
+                    .transform(new FitCenter(), new RoundedCorners((int) radius));
+
            if (TextUtils.isEmpty(sc.getImageUrl())) {
-                Glide.with(context).clear(holder.image);
+                if (media.getImageLocation() == null) {
+                    Glide.with(context).clear(holder.image);
+                    holder.image.setVisibility(View.GONE);
+                } else {
+                    Glide.with(context)
+                            .load(media.getImageLocation())
+                            .apply(options)
+                            .into(holder.image);
+                }
            } else {
                Glide.with(context)
                        .load(EmbeddedChapterImage.getModelFor(media, position))
-                        .apply(new RequestOptions()
-                                .dontAnimate()
-                                .transform(new FitCenter(), new RoundedCorners((int)
-                                        (4 * context.getResources().getDisplayMetrics().density))))
+                        .apply(options)
                        .into(holder.image);
            }
        } else {
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java
@ -157,7 +157,7 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
        viewBinding.progressBar.setVisibility(View.VISIBLE);

        ToolbarIconTintManager iconTintManager = new ToolbarIconTintManager(
-                getContext(), viewBinding.toolbar, viewBinding.collapsingToolbar) {
+                viewBinding.toolbar.getContext(), viewBinding.toolbar, viewBinding.collapsingToolbar) {
            @Override
            protected void doTint(Context themedContext) {
                viewBinding.toolbar.getMenu().findItem(R.id.refresh_item)
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@ -18,7 +18,6 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:minHeight="?attr/actionBarSize"
-            android:theme="?attr/actionBarTheme"
            app:title="@string/add_feed_label"
            app:navigationContentDescription="@string/toolbar_back_button_content_description"
            app:navigationIcon="?homeAsUpIndicator" />
--- a/app/src/main/res/layout/audioplayer_fragment.xml
+++ b/app/src/main/res/layout/audioplayer_fragment.xml
@ -26,7 +26,6 @@
            android:layout_height="wrap_content"
            android:layout_alignParentTop="true"
            android:minHeight="?attr/actionBarSize"
-            android:theme="?attr/actionBarTheme"
            app:navigationContentDescription="@string/toolbar_back_button_content_description"
            app:navigationIcon="@drawable/ic_arrow_down" />

--- a/app/src/main/res/layout/download_log_fragment.xml
+++ b/app/src/main/res/layout/download_log_fragment.xml
@ -11,7 +11,6 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
        android:layout_alignParentTop="true"
        app:title="@string/downloads_log_label" />

--- a/app/src/main/res/layout/feedinfo.xml
+++ b/app/src/main/res/layout/feedinfo.xml
@ -41,7 +41,6 @@
                android:layout_height="wrap_content"
                android:layout_alignParentTop="true"
                android:minHeight="?attr/actionBarSize"
-                android:theme="?attr/actionBarTheme"
                app:layout_collapseMode="pin"
                app:navigationContentDescription="@string/toolbar_back_button_content_description"
                app:navigationIcon="?homeAsUpIndicator" />
--- a/app/src/main/res/layout/feeditem_pager_fragment.xml
+++ b/app/src/main/res/layout/feeditem_pager_fragment.xml
@ -12,7 +12,6 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
        app:navigationContentDescription="@string/toolbar_back_button_content_description"
        app:navigationIcon="?homeAsUpIndicator" />

--- a/app/src/main/res/layout/feedsettings.xml
+++ b/app/src/main/res/layout/feedsettings.xml
@ -12,8 +12,6 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
-        android:elevation="4dp"
        app:title="@string/feed_settings_label"
        app:navigationContentDescription="@string/toolbar_back_button_content_description"
        app:navigationIcon="?homeAsUpIndicator" />
--- a/app/src/main/res/layout/search_fragment.xml
+++ b/app/src/main/res/layout/search_fragment.xml
@ -17,7 +17,6 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:minHeight="?attr/actionBarSize"
-            android:theme="?attr/actionBarTheme"
            app:title="@string/search_label"
            app:navigationContentDescription="@string/toolbar_back_button_content_description"
            app:navigationIcon="?homeAsUpIndicator" />
--- a/app/src/main/res/layout/subscription_selection_activity.xml
+++ b/app/src/main/res/layout/subscription_selection_activity.xml
@ -25,7 +25,6 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:minHeight="?attr/actionBarSize"
-                android:theme="?attr/actionBarTheme"
                android:layout_alignParentTop="true" />

            <View
--- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java
+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedItem.java
@ -140,6 +140,9 @@ public class FeedItem implements Serializable {
            link = other.link;
        }
        if (other.pubDate != null && !other.pubDate.equals(pubDate)) {
+            if (pubDate.before(other.pubDate)) {
+                setNew();
+            }
            pubDate = other.pubDate;
        }
        if (other.media != null) {
--- a/ui/common/src/main/res/values/styles.xml
+++ b/ui/common/src/main/res/values/styles.xml
@ -12,7 +12,6 @@
    <style name="Theme.Base.AntennaPod.Dynamic.Light" parent="Theme.Material3.DynamicColors.Light">
        <item name="progressBarTheme">@style/ProgressBarLight</item>
        <item name="background_color">@color/background_light</item>
-        <item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar</item>
        <item name="background_elevated">@color/background_elevated_light</item>
        <item name="action_icon_color">@color/black</item>
        <item name="android:textAllCaps">false</item>
@ -27,6 +26,7 @@
        <item name="android:splitMotionEvents">false</item>
        <item name="android:fitsSystemWindows">false</item>
        <item name="android:windowContentTransitions">true</item>
+        <item name="toolbarStyle">@style/Style.AntennaPod.Toolbar</item>
        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
    </style>

@ -52,7 +52,6 @@
    <style name="Theme.Base.AntennaPod.Dynamic.Dark" parent="Theme.Material3.DynamicColors.Dark">
        <item name="progressBarTheme">@style/ProgressBarDark</item>
        <item name="background_color">@color/background_darktheme</item>
-        <item name="actionBarStyle">@style/Widget.AntennaPod.ActionBar</item>
        <item name="background_elevated">@color/background_elevated_darktheme</item>
        <item name="action_icon_color">@color/white</item>
        <item name="android:textAllCaps">false</item>
@ -70,6 +69,7 @@
        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
        <item name="android:windowContentTransitions">true</item>
        <item name="android:navigationBarColor">@color/background_darktheme</item>
+        <item name="toolbarStyle">@style/Style.AntennaPod.Toolbar</item>
        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
    </style>

@ -227,6 +227,15 @@
        <item name="windowSplashScreenAnimatedIcon">@drawable/launcher_animate</item>
    </style>

+    <style name="Style.AntennaPod.Toolbar" parent="Widget.Material3.Toolbar">
+        <item name="materialThemeOverlay">@style/Theme.AntennaPod.Toolbar</item>
+    </style>
+
+    <style name="Theme.AntennaPod.Toolbar" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
+        <item name="action_icon_color">?attr/colorOnSurface</item>
+        <item name="colorControlNormal">?attr/colorOnSurface</item>
+    </style>
+
    <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark">
        <item name="windowActionBarOverlay">true</item>
    </style>
@ -280,11 +289,6 @@
        <item name="fastScrollVerticalTrackDrawable">@drawable/scrollbar_track</item>
    </style>

-    <style name="Widget.AntennaPod.ActionBar" parent="Widget.Material3.Light.ActionBar.Solid">
-        <item name="background">?android:attr/colorBackground</item>
-        <item name="elevation">0dp</item>
-    </style>
-
    <style name="AddPodcastTextView">
        <item name="android:drawablePadding">8dp</item>
        <item name="android:paddingTop">8dp</item>
--- a/ui/discovery/src/main/res/layout/fragment_online_search.xml
+++ b/ui/discovery/src/main/res/layout/fragment_online_search.xml
@ -19,7 +19,6 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:minHeight="?attr/actionBarSize"
-            android:theme="?attr/actionBarTheme"
            app:title="@string/discover"
            app:navigationContentDescription="@string/toolbar_back_button_content_description"
            app:navigationIcon="?homeAsUpIndicator" />
Author	SHA1	Message	Date
Erik Johnson	23ec87922e	Merge `54b0eef8f1` into `2827f41430`	2024-05-07 22:06:54 +02:00
flofriday	2827f41430	Improve layout for missing chapter images (#7164 ) If only some chapters have images the other chapters don't display anything but reserve space for the image. Now those chapters display the image of the episode. If no chapters have images no images will be displayed (just like before).	2024-05-06 22:14:26 +02:00
flofriday	6f572faa77	Fix inconsistent icons in the app toolbar. (#7163 )	2024-05-06 22:04:24 +02:00
Erik Johnson	54b0eef8f1	Set item as new when pubDate from newer object is newer than existing	2023-12-04 12:46:19 -06:00
Erik Johnson	9b5c90637d	Revert "Detect re-posted episodes" This reverts commit `4ac08c7584`.	2023-12-04 12:18:59 -06:00
Erik Johnson	4ac08c7584	Detect re-posted episodes See #6792	2023-12-04 11:38:09 -06:00