From 20bcb8a781fc9c7289b1437a5c11dac1fd673128 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 3 May 2020 17:18:10 +0200 Subject: Replaced some Toasts with Snackbars --- .../java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 4 ---- .../java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java | 9 ++++++--- .../adapter/actionbutton/CancelDownloadActionButton.java | 2 -- .../antennapod/adapter/actionbutton/MobileDownloadHelper.java | 3 --- .../main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java | 3 ++- .../java/de/danoeh/antennapod/fragment/EpisodesListFragment.java | 6 ++++-- .../java/de/danoeh/antennapod/fragment/FeedInfoFragment.java | 3 ++- .../java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java | 3 ++- .../de/danoeh/antennapod/fragment/RunningDownloadsFragment.java | 8 ++++---- .../fragment/preferences/GpodderPreferencesFragment.java | 4 ++-- 10 files changed, 22 insertions(+), 23 deletions(-) (limited to 'app/src') diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index a239458c0..34c7e3aba 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -366,8 +366,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements DBWriter.addFavoriteItem(feedItem); isFavorite = true; invalidateOptionsMenu(); - Toast.makeText(this, R.string.added_to_favorites, Toast.LENGTH_SHORT) - .show(); } break; case R.id.remove_from_favorites_item: @@ -375,8 +373,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements DBWriter.removeFavoriteItem(feedItem); isFavorite = false; invalidateOptionsMenu(); - Toast.makeText(this, R.string.removed_from_favorites, Toast.LENGTH_SHORT) - .show(); } break; case R.id.disable_sleeptimer_item: // Fall-through diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java index 90ac6ea1b..153f4abc3 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java @@ -1,5 +1,6 @@ package de.danoeh.antennapod.adapter; +import android.app.Activity; import android.content.Context; import android.os.Build; import android.text.Layout; @@ -18,6 +19,7 @@ import com.joanzapata.iconify.widget.IconButton; import com.joanzapata.iconify.widget.IconTextView; import de.danoeh.antennapod.R; +import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator; import de.danoeh.antennapod.core.feed.Feed; import de.danoeh.antennapod.core.feed.FeedMedia; @@ -35,10 +37,10 @@ import de.danoeh.antennapod.view.viewholder.DownloadItemViewHolder; public class DownloadLogAdapter extends BaseAdapter { private static final String TAG = "DownloadLogAdapter"; - private final Context context; + private final Activity context; private final ItemAccess itemAccess; - public DownloadLogAdapter(Context context, ItemAccess itemAccess) { + public DownloadLogAdapter(Activity context, ItemAccess itemAccess) { super(); this.itemAccess = itemAccess; this.context = context; @@ -116,7 +118,8 @@ public class DownloadLogAdapter extends BaseAdapter { } try { DownloadRequester.getInstance().downloadMedia(context, true, media.getItem()); - Toast.makeText(context, R.string.status_downloading_label, Toast.LENGTH_SHORT).show(); + ((MainActivity) context).showSnackbarAbovePlayer( + R.string.status_downloading_label, Toast.LENGTH_SHORT); } catch (DownloadRequestException e) { e.printStackTrace(); DownloadRequestErrorDialogCreator.newRequestErrorDialog(context, e.getMessage()); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java index 3b5baadef..a31d2fdc0 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java @@ -37,8 +37,6 @@ public class CancelDownloadActionButton extends ItemActionButton { if (UserPreferences.isEnableAutodownload()) { DBWriter.setFeedItemAutoDownload(media.getItem(), false); Toast.makeText(context, R.string.download_canceled_autodownload_enabled_msg, Toast.LENGTH_LONG).show(); - } else { - Toast.makeText(context, R.string.download_canceled_msg, Toast.LENGTH_LONG).show(); } } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java index 80ecd4994..49b785056 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MobileDownloadHelper.java @@ -1,7 +1,6 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import android.widget.Toast; import androidx.appcompat.app.AlertDialog; import de.danoeh.antennapod.R; @@ -42,14 +41,12 @@ class MobileDownloadHelper { private static void addToQueue(Context context, FeedItem item) { addToQueueTimestamp = System.currentTimeMillis(); DBWriter.addQueueItem(context, item); - Toast.makeText(context, R.string.added_to_queue_label, Toast.LENGTH_SHORT).show(); } private static void downloadFeedItems(Context context, FeedItem item) { allowMobileDownloadTimestamp = System.currentTimeMillis(); try { DownloadRequester.getInstance().downloadMedia(context, true, item); - Toast.makeText(context, R.string.status_downloading_label, Toast.LENGTH_SHORT).show(); } catch (DownloadRequestException e) { e.printStackTrace(); DownloadRequestErrorDialogCreator.newRequestErrorDialog(context, e.getMessage()); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java index 0a35c95ff..fafe888ee 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java @@ -18,6 +18,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; +import com.google.android.material.snackbar.Snackbar; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.preferences.SleepTimerPreferences; import de.danoeh.antennapod.core.service.playback.PlaybackService; @@ -141,7 +142,7 @@ public class SleepTimerDialog extends DialogFragment { Button setButton = content.findViewById(R.id.setSleeptimerButton); setButton.setOnClickListener(v -> { if (!PlaybackService.isRunning) { - Toast.makeText(getContext(), R.string.no_media_playing_label, Toast.LENGTH_LONG).show(); + Snackbar.make(content, R.string.no_media_playing_label, Snackbar.LENGTH_LONG).show(); } try { savePreferences(); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java index 4f283a9ab..29b6a1b16 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java @@ -146,7 +146,8 @@ public abstract class EpisodesListFragment extends Fragment { public void onConfirmButtonPressed(DialogInterface dialog) { dialog.dismiss(); DBWriter.markAllItemsRead(); - Toast.makeText(getActivity(), R.string.mark_all_read_msg, Toast.LENGTH_SHORT).show(); + ((MainActivity) getActivity()).showSnackbarAbovePlayer( + R.string.mark_all_read_msg, Toast.LENGTH_SHORT); } }; markAllReadConfirmationDialog.createNewDialog().show(); @@ -160,7 +161,8 @@ public abstract class EpisodesListFragment extends Fragment { public void onConfirmButtonPressed(DialogInterface dialog) { dialog.dismiss(); DBWriter.removeAllNewFlags(); - Toast.makeText(getActivity(), R.string.removed_all_new_flags_msg, Toast.LENGTH_SHORT).show(); + ((MainActivity) getActivity()).showSnackbarAbovePlayer( + R.string.removed_all_new_flags_msg, Toast.LENGTH_SHORT); } }; removeAllNewFlagsConfirmationDialog.createNewDialog().show(); 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 5b8238717..c58e6c15f 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java @@ -234,7 +234,8 @@ public class FeedInfoFragment extends Fragment { @Override public boolean onOptionsItemSelected(MenuItem item) { if (feed == null) { - Toast.makeText(getContext(), R.string.please_wait_for_data, Toast.LENGTH_LONG).show(); + ((MainActivity) getActivity()).showSnackbarAbovePlayer( + R.string.please_wait_for_data, Toast.LENGTH_LONG); return super.onOptionsItemSelected(item); } boolean handled = false; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java index 9bfb4d6dc..1f96c12f2 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -249,7 +249,8 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem public boolean onOptionsItemSelected(MenuItem item) { if (!super.onOptionsItemSelected(item)) { if (feed == null) { - Toast.makeText(getContext(), R.string.please_wait_for_data, Toast.LENGTH_LONG).show(); + ((MainActivity) getActivity()).showSnackbarAbovePlayer( + R.string.please_wait_for_data, Toast.LENGTH_LONG); return true; } try { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java index 1bfbd2d78..ddcf09992 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java @@ -7,6 +7,7 @@ import android.view.View; import android.widget.ListView; import android.widget.Toast; +import de.danoeh.antennapod.activity.MainActivity; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -108,10 +109,9 @@ public class RunningDownloadsFragment extends ListFragment { && UserPreferences.isEnableAutodownload()) { FeedMedia media = DBReader.getFeedMedia(downloadRequest.getFeedfileId()); DBWriter.setFeedItemAutoDownload(media.getItem(), false); - Toast.makeText(getActivity(), R.string.download_canceled_autodownload_enabled_msg, - Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getActivity(), R.string.download_canceled_msg, Toast.LENGTH_SHORT).show(); + + ((MainActivity) getActivity()).showSnackbarAbovePlayer( + R.string.download_canceled_autodownload_enabled_msg, Toast.LENGTH_SHORT); } } }; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java index 11afb9b4f..8f8b4675d 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java @@ -8,6 +8,7 @@ import androidx.preference.PreferenceFragmentCompat; import android.text.Html; import android.text.format.DateUtils; import android.widget.Toast; +import com.google.android.material.snackbar.Snackbar; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.PreferenceActivity; import de.danoeh.antennapod.core.event.SyncServiceEvent; @@ -91,8 +92,7 @@ public class GpodderPreferencesFragment extends PreferenceFragmentCompat { }); findPreference(PREF_GPODNET_LOGOUT).setOnPreferenceClickListener(preference -> { GpodnetPreferences.logout(); - Toast toast = Toast.makeText(activity, R.string.pref_gpodnet_logout_toast, Toast.LENGTH_SHORT); - toast.show(); + Snackbar.make(getView(), R.string.pref_gpodnet_logout_toast, Snackbar.LENGTH_LONG).show(); updateGpodnetPreferenceScreen(); return true; }); -- cgit v1.2.3