Merge pull request #6204 from ByteHamster/various-tweaks

Various tweaks

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) {

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) {

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");

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());
             }

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

core/src/main/res/values/attrs.xml

@@ -16,4 +16,6 @@
     <attr name="icon_green" format="color" />
     <attr name="icon_purple" format="color" />
     <attr name="icon_gray" format="color" />
+    <attr name="card_background" format="color" />
+    <attr name="card_background_playing" format="color" />
 </resources>

core/src/main/res/values/styles.xml

@@ -29,6 +29,8 @@
         <item name="navigation_up">@drawable/navigation_up</item>
         <item name="dragview_background">@drawable/ic_drag_lighttheme</item>
         <item name="scrollbar_thumb">@drawable/scrollbar_thumb_light</item>
+        <item name="card_background">#EFEEEE</item>
+        <item name="card_background_playing">#D8D8D8</item>
         <item name="icon_red">#CF1800</item>
         <item name="icon_yellow">#F59F00</item>
         <item name="icon_green">#008537</item>
@@ -68,6 +70,8 @@
         <item name="navigation_up">@drawable/navigation_up_dark</item>
         <item name="dragview_background">@drawable/ic_drag_darktheme</item>
         <item name="scrollbar_thumb">@drawable/scrollbar_thumb_dark</item>
+        <item name="card_background">#2d3337</item>
+        <item name="card_background_playing">#444D53</item>
         <item name="icon_red">#CF1800</item>
         <item name="icon_yellow">#F59F00</item>
         <item name="icon_green">#008537</item>

storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java

@@ -1434,7 +1434,7 @@ public class PodDBAdapter {
     public Cursor searchFeeds(String searchQuery) {
         String[] queryWords = prepareSearchQuery(searchQuery);
 
-        String queryStart = "SELECT * FROM " + TABLE_NAME_FEEDS + " WHERE ";
+        String queryStart = "SELECT " + KEYS_FEED + " FROM " + TABLE_NAME_FEEDS + " WHERE ";
         StringBuilder sb = new StringBuilder(queryStart);
 
         for (int i = 0; i < queryWords.length; i++) {