Merge pull request #4101 from ByteHamster/snackbars-covered

Fixed Snackbars being covered by audio player

4 files changed, 19 insertions, 19 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
index 4953ccc6c..4f8b4f00c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
@@ -10,6 +10,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.view.viewholder.EpisodeItemViewHolder;
 import org.greenrobot.eventbus.Subscribe;
 
@@ -68,9 +69,8 @@ public class FavoriteEpisodesFragment extends EpisodesListFragment {
                 if (item != null) {
                     DBWriter.removeFavoriteItem(item);
 
-                    Snackbar snackbar = Snackbar.make(root, getString(R.string.removed_item), Snackbar.LENGTH_LONG);
-                    snackbar.setAction(getString(R.string.undo), v -> DBWriter.addFavoriteItem(item));
-                    snackbar.show();
+                    ((MainActivity) getActivity()).showSnackbarAbovePlayer(R.string.removed_item, Snackbar.LENGTH_LONG)
+                        .setAction(getString(R.string.undo), v -> DBWriter.addFavoriteItem(item));
                 }
             }
         };
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
index af3c5d303..5b8238717 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
@@ -91,7 +91,7 @@ public class FeedInfoFragment extends Fragment {
                 android.content.ClipboardManager cm = (android.content.ClipboardManager) getContext()
                         .getSystemService(Context.CLIPBOARD_SERVICE);
                 cm.setPrimaryClip(clipData);
-                Snackbar.make(getView(), R.string.copied_url_msg, Snackbar.LENGTH_SHORT).show();
+                ((MainActivity) getActivity()).showSnackbarAbovePlayer(R.string.copied_url_msg, Snackbar.LENGTH_SHORT);
             }
         }
     };
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index 84a303b3d..72dd0e0c7 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -142,7 +142,8 @@ public class ItemFragment extends Fragment {
                     && ObjectsCompat.equals(item.getMedia().getIdentifier(), controller.getMedia().getIdentifier())) {
                 controller.seekTo(time);
             } else {
-                Snackbar.make(getView(), R.string.play_this_to_seek_position, Snackbar.LENGTH_LONG).show();
+                ((MainActivity) getActivity()).showSnackbarAbovePlayer(R.string.play_this_to_seek_position,
+                        Snackbar.LENGTH_LONG);
             }
         });
         registerForContextMenu(webvDescription);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 390e1facd..49c53627f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -16,6 +16,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
@@ -388,11 +389,9 @@ public class QueueFragment extends Fragment {
             recyclerAdapter.setLocked(locked);
         }
         if (locked) {
-            Snackbar.make(getActivity().findViewById(android.R.id.content),
-                    R.string.queue_locked, Snackbar.LENGTH_SHORT).show();
+            ((MainActivity) getActivity()).showSnackbarAbovePlayer(R.string.queue_locked, Snackbar.LENGTH_SHORT);
         } else {
-            Snackbar.make(getActivity().findViewById(android.R.id.content),
-                    R.string.queue_unlocked, Snackbar.LENGTH_SHORT).show();
+            ((MainActivity) getActivity()).showSnackbarAbovePlayer(R.string.queue_unlocked, Snackbar.LENGTH_SHORT);
         }
     }
 
@@ -497,16 +496,16 @@ public class QueueFragment extends Fragment {
                     final boolean isRead = item.isPlayed();
                     DBWriter.markItemPlayed(FeedItem.PLAYED, false, item.getId());
                     DBWriter.removeQueueItem(getActivity(), true, item);
-                    Snackbar snackbar = Snackbar.make(root, getString(item.hasMedia()
-                            ? R.string.marked_as_read_label : R.string.marked_as_read_no_media_label),
-                            Snackbar.LENGTH_LONG);
-                    snackbar.setAction(getString(R.string.undo), v -> {
-                        DBWriter.addQueueItemAt(getActivity(), item.getId(), position, false);
-                        if(!isRead) {
-                            DBWriter.markItemPlayed(FeedItem.UNPLAYED, item.getId());
-                        }
-                    });
-                    snackbar.show();
+
+                    ((MainActivity) getActivity()).showSnackbarAbovePlayer(
+                            item.hasMedia() ? R.string.marked_as_read_label : R.string.marked_as_read_no_media_label,
+                            Snackbar.LENGTH_LONG)
+                            .setAction(getString(R.string.undo), v -> {
+                                DBWriter.addQueueItemAt(getActivity(), item.getId(), position, false);
+                                if (!isRead) {
+                                    DBWriter.markItemPlayed(FeedItem.UNPLAYED, item.getId());
+                                }
+                            });
                 }
 
                 @Override