summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java63
-rw-r--r--app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java13
3 files changed, 46 insertions, 32 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java
index 8104d3539..614cc1e71 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ShareDialog.java
@@ -18,21 +18,21 @@ import de.danoeh.antennapod.core.feed.FeedItem;
import de.danoeh.antennapod.core.util.ShareUtils;
public class ShareDialog extends DialogFragment {
-
private static final String ARGUMENT_FEED_ITEM = "feedItem";
+ private static final String PREF_NAME = "ShareDialog";
+ private static final String PREF_SHARE_DIALOG_OPTION = "prefShareDialogOption";
+ private static final String PREF_SHARE_EPISODE_START_AT = "prefShareEpisodeStartAt";
+ private static final String PREF_VALUE_WEBSITE = "website";
+ private static final String PREF_VALUE_MEDIA_URL = "media";
- private static final String TAG = "ShareDialog";
private Context ctx;
private FeedItem item;
+ private SharedPreferences prefs;
- private static final String PREF_SHARE_DIALOG_OPTION = "prefShareDialogOption";
- private static final String PREF_SHARE_EPISODE_START_AT = "prefShareEpisodeStartAt";
-
- private RadioGroup radioGroup;
private RadioButton radioEpisodeWebsite;
+ private RadioButton radioMediaFileUrl;
private RadioButton radioMediaFile;
private CheckBox checkBoxStartAt;
- private SharedPreferences prefs;
public ShareDialog() {
// Empty constructor required for DialogFragment
@@ -52,7 +52,7 @@ public class ShareDialog extends DialogFragment {
if (getArguments() != null) {
ctx = getActivity();
item = (FeedItem) getArguments().getSerializable(ARGUMENT_FEED_ITEM);
- prefs = getActivity().getSharedPreferences("ShareDialog", Context.MODE_PRIVATE);
+ prefs = getActivity().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
}
View content = View.inflate(ctx, R.layout.share_episode_dialog, null);
@@ -60,8 +60,12 @@ public class ShareDialog extends DialogFragment {
builder.setTitle(R.string.share_label);
builder.setView(content);
- radioGroup = content.findViewById(R.id.share_dialog_radio_group);
+ RadioGroup radioGroup = content.findViewById(R.id.share_dialog_radio_group);
+ radioGroup.setOnCheckedChangeListener((group, checkedId) ->
+ checkBoxStartAt.setEnabled(checkedId != R.id.share_media_file_radio));
+
radioEpisodeWebsite = content.findViewById(R.id.share_episode_website_radio);
+ radioMediaFileUrl = content.findViewById(R.id.share_media_file_url_radio);
radioMediaFile = content.findViewById(R.id.share_media_file_radio);
checkBoxStartAt = content.findViewById(R.id.share_start_at_timer_dialog);
@@ -71,10 +75,14 @@ public class ShareDialog extends DialogFragment {
boolean includePlaybackPosition = checkBoxStartAt.isChecked();
if (radioEpisodeWebsite.isChecked()) {
ShareUtils.shareFeedItemLink(ctx, item, includePlaybackPosition);
- prefs.edit().putString(PREF_SHARE_DIALOG_OPTION, "website").apply();
- } else {
+ prefs.edit().putString(PREF_SHARE_DIALOG_OPTION, PREF_VALUE_WEBSITE).apply();
+ } else if (radioMediaFileUrl.isChecked()) {
ShareUtils.shareFeedItemDownloadLink(ctx, item, includePlaybackPosition);
- prefs.edit().putString(PREF_SHARE_DIALOG_OPTION, "media").apply();
+ prefs.edit().putString(PREF_SHARE_DIALOG_OPTION, PREF_VALUE_MEDIA_URL).apply();
+ } else if (radioMediaFile.isChecked()) {
+ ShareUtils.shareFeedItemFile(ctx, item.getMedia());
+ } else {
+ throw new IllegalStateException("Unknown share method");
}
prefs.edit().putBoolean(PREF_SHARE_EPISODE_START_AT, includePlaybackPosition).apply();
}).setNegativeButton(R.string.cancel_label, (dialog, id) -> dialog.dismiss());
@@ -85,26 +93,23 @@ public class ShareDialog extends DialogFragment {
private void setupOptions() {
final boolean hasMedia = item.getMedia() != null;
- if (!ShareUtils.hasLinkToShare(item)) {
- radioEpisodeWebsite.setVisibility(View.GONE);
- radioMediaFile.setChecked(true);
- }
+ boolean downloaded = hasMedia && item.getMedia().isDownloaded();
+ radioMediaFile.setVisibility(downloaded ? View.VISIBLE : View.GONE);
- if (!hasMedia || item.getMedia().getDownload_url() == null) {
- radioMediaFile.setVisibility(View.GONE);
- radioEpisodeWebsite.setChecked(true);
- }
+ radioEpisodeWebsite.setVisibility(ShareUtils.hasLinkToShare(item) ? View.VISIBLE : View.GONE);
- if (radioEpisodeWebsite.getVisibility() == View.VISIBLE && radioMediaFile.getVisibility() == View.VISIBLE) {
- String option = prefs.getString(PREF_SHARE_DIALOG_OPTION, "website");
- if (option.equals("website")) {
- radioEpisodeWebsite.setChecked(true);
- radioMediaFile.setChecked(false);
- } else {
- radioEpisodeWebsite.setChecked(false);
- radioMediaFile.setChecked(true);
- }
+ boolean hasDownloadUrl = hasMedia && item.getMedia().getDownload_url() != null;
+ radioMediaFileUrl.setVisibility(hasDownloadUrl ? View.VISIBLE : View.GONE);
+
+ String option = prefs.getString(PREF_SHARE_DIALOG_OPTION, PREF_VALUE_WEBSITE);
+ if (option.equals(PREF_VALUE_WEBSITE)) {
+ radioEpisodeWebsite.setChecked(true);
+ radioMediaFileUrl.setChecked(false);
+ } else {
+ radioEpisodeWebsite.setChecked(false);
+ radioMediaFileUrl.setChecked(true);
}
+ radioMediaFile.setChecked(false);
boolean switchIsChecked = prefs.getBoolean(PREF_SHARE_EPISODE_START_AT, false);
checkBoxStartAt.setChecked(switchIsChecked);
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index 7604b94d6..3d8f3fe09 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -78,7 +78,7 @@ public class FeedItemMenuHandler {
setItemVisibility(menu, R.id.reset_position, false);
}
- if(!UserPreferences.isEnableAutodownload() || fileDownloaded) {
+ if (!UserPreferences.isEnableAutodownload() || fileDownloaded || selectedItem.getFeed().isLocalFeed()) {
setItemVisibility(menu, R.id.activate_auto_download, false);
setItemVisibility(menu, R.id.deactivate_auto_download, false);
} else if (selectedItem.getAutoDownload()) {
diff --git a/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java b/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java
index 89d9e26c7..eaad11d1a 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java
@@ -3,7 +3,9 @@ package de.danoeh.antennapod.view;
import android.content.Context;
import android.database.DataSetObserver;
import android.graphics.drawable.Drawable;
+import android.view.Gravity;
import android.widget.AbsListView;
+import android.widget.FrameLayout;
import android.widget.ListAdapter;
import androidx.annotation.AttrRes;
import androidx.core.content.ContextCompat;
@@ -21,7 +23,7 @@ public class EmptyViewHandler {
private boolean layoutAdded = false;
private View list;
private ListAdapter listAdapter;
- private RecyclerView.Adapter recyclerAdapter;
+ private RecyclerView.Adapter<?> recyclerAdapter;
private final Context context;
private final View emptyView;
@@ -92,12 +94,19 @@ public class EmptyViewHandler {
layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
emptyView.setLayoutParams(layoutParams);
break;
+ } else if (parent instanceof FrameLayout) {
+ parent.addView(emptyView);
+ FrameLayout.LayoutParams layoutParams =
+ (FrameLayout.LayoutParams) emptyView.getLayoutParams();
+ layoutParams.gravity = Gravity.CENTER;
+ emptyView.setLayoutParams(layoutParams);
+ break;
}
parent = (ViewGroup) parent.getParent();
}
}
- public void updateAdapter(RecyclerView.Adapter adapter) {
+ public void updateAdapter(RecyclerView.Adapter<?> adapter) {
if (this.recyclerAdapter != null) {
this.recyclerAdapter.unregisterAdapterDataObserver(adapterObserver);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 13:18:27 +0000