diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2022-11-30 20:20:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-30 20:20:02 +0100 |
commit | 97ab1725db74c4fd2dec693ec1e97fbb871ef70a (patch) | |
tree | 40b53ce2f1a43fd2dca6a4aaa788808b8f2b34ab /app | |
parent | 1ee85b5bb0e586ed69dab6c64d69d87791efebb4 (diff) | |
parent | 63c5e2dc72d66edcad797aabed9c6f9c67756344 (diff) | |
download | AntennaPod-97ab1725db74c4fd2dec693ec1e97fbb871ef70a.zip |
Merge pull request #6204 from ByteHamster/various-tweaks
Various tweaks
Diffstat (limited to 'app')
5 files changed, 19 insertions, 7 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/DrawerPreferencesDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/DrawerPreferencesDialog.java index e8cfe81f0..8f174f207 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/DrawerPreferencesDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/DrawerPreferencesDialog.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.dialog; import android.content.Context; -import androidx.appcompat.app.AlertDialog; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import de.danoeh.antennapod.R; import de.danoeh.antennapod.storage.preferences.UserPreferences; import de.danoeh.antennapod.fragment.NavDrawerFragment; @@ -19,7 +19,7 @@ public class DrawerPreferencesDialog { checked[i] = true; } } - AlertDialog.Builder builder = new AlertDialog.Builder(context); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context); builder.setTitle(R.string.drawer_preferences); builder.setMultiChoiceItems(navTitles, checked, (dialog, which, isChecked) -> { if (isChecked) { diff --git a/app/src/main/java/de/danoeh/antennapod/ui/home/HomeSectionsSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/home/HomeSectionsSettingsDialog.java index aa8ef8de3..e651aea48 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/home/HomeSectionsSettingsDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/home/HomeSectionsSettingsDialog.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.text.TextUtils; -import androidx.appcompat.app.AlertDialog; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import de.danoeh.antennapod.R; import java.util.List; @@ -22,7 +22,7 @@ public class HomeSectionsSettingsDialog { } } - AlertDialog.Builder builder = new AlertDialog.Builder(context); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context); builder.setTitle(R.string.configure_home); builder.setMultiChoiceItems(sectionLabels, checked, (dialog, which, isChecked) -> { if (isChecked) { diff --git a/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java b/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java index 92bb0c381..3e7b02fd3 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java @@ -20,6 +20,7 @@ import de.danoeh.antennapod.core.menuhandler.MenuItemUtils; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.util.FeedItemUtil; import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.FeedListUpdateEvent; import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.fragment.InboxFragment; import de.danoeh.antennapod.fragment.swipeactions.SwipeActions; @@ -89,6 +90,11 @@ public class InboxSection extends HomeSection { loadItems(); } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onFeedListChanged(FeedListUpdateEvent event) { + loadItems(); + } + @Subscribe(sticky = true, threadMode = ThreadMode.MAIN) public void onEventMainThread(DownloadEvent event) { Log.d(TAG, "onEventMainThread() called with DownloadEvent"); diff --git a/app/src/main/java/de/danoeh/antennapod/view/viewholder/HorizontalItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/viewholder/HorizontalItemViewHolder.java index 5293338b6..42b0cb57c 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/viewholder/HorizontalItemViewHolder.java +++ b/app/src/main/java/de/danoeh/antennapod/view/viewholder/HorizontalItemViewHolder.java @@ -1,11 +1,11 @@ package de.danoeh.antennapod.view.viewholder; import android.view.LayoutInflater; -import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.cardview.widget.CardView; import androidx.recyclerview.widget.RecyclerView; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.MainActivity; @@ -21,9 +21,10 @@ import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.ui.common.CircularProgressBar; import de.danoeh.antennapod.ui.common.SquareImageView; +import de.danoeh.antennapod.ui.common.ThemeUtils; public class HorizontalItemViewHolder extends RecyclerView.ViewHolder { - public final View card; + public final CardView card; public final ImageView secondaryActionIcon; private final SquareImageView cover; private final TextView title; @@ -67,6 +68,12 @@ public class HorizontalItemViewHolder extends RecyclerView.ViewHolder { if (media == null) { circularProgressBar.setPercentage(0, item); } else { + if (PlaybackStatus.isCurrentlyPlaying(media)) { + card.setCardBackgroundColor(ThemeUtils.getColorFromAttr(activity, R.attr.card_background_playing)); + } else { + card.setCardBackgroundColor(ThemeUtils.getColorFromAttr(activity, R.attr.card_background)); + } + if (item.getMedia().getDuration() > 0) { progressBar.setProgress(100 * item.getMedia().getPosition() / item.getMedia().getDuration()); } diff --git a/app/src/main/res/layout/horizontal_itemlist_item.xml b/app/src/main/res/layout/horizontal_itemlist_item.xml index 5b4787d11..b69a3f445 100644 --- a/app/src/main/res/layout/horizontal_itemlist_item.xml +++ b/app/src/main/res/layout/horizontal_itemlist_item.xml @@ -21,7 +21,6 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/background_elevated" android:orientation="vertical"> <androidx.cardview.widget.CardView |