Review feedback
This commit is contained in:
ByteHamster
parent
9e780fab40
commit
76afb09d07
|
|
@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
|
|||
import androidx.annotation.StringRes;
|
||||
import android.view.View;
|
||||
|
||||
import de.danoeh.antennapod.model.feed.Feed;
|
||||
import de.danoeh.antennapod.playback.service.PlaybackStatus;
|
||||
import de.danoeh.antennapod.model.feed.FeedItem;
|
||||
import de.danoeh.antennapod.model.feed.FeedMedia;
|
||||
|
|
@ -48,6 +49,8 @@ public abstract class ItemActionButton {
|
|||
return new PlayActionButton(item);
|
||||
} else if (isDownloadingMedia) {
|
||||
return new CancelDownloadActionButton(item);
|
||||
} else if (item.getFeed().getState() != Feed.STATE_SUBSCRIBED) {
|
||||
return new StreamActionButton(item);
|
||||
} else if (UserPreferences.isStreamOverDownload()) {
|
||||
return new StreamActionButton(item);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -86,10 +86,8 @@ public class FeedItemMenuHandler {
|
|||
setItemVisibility(menu, R.id.remove_from_favorites_item, isFavorite);
|
||||
setItemVisibility(menu, R.id.remove_item, fileDownloaded || isLocalFile);
|
||||
|
||||
setItemVisibility(menu, R.id.open_podcast, true);
|
||||
if (selectedItem.getFeed().getState() != Feed.STATE_SUBSCRIBED) {
|
||||
setItemVisibility(menu, R.id.mark_read_item, false);
|
||||
setItemVisibility(menu, R.id.open_podcast, false);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package de.danoeh.antennapod.ui.screen.episode;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MenuItem;
|
||||
|
|
@ -13,7 +14,8 @@ import androidx.fragment.app.Fragment;
|
|||
import androidx.viewpager2.adapter.FragmentStateAdapter;
|
||||
import androidx.viewpager2.widget.ViewPager2;
|
||||
|
||||
import de.danoeh.antennapod.ui.screen.feed.FeedItemlistFragment;
|
||||
import de.danoeh.antennapod.model.feed.Feed;
|
||||
import de.danoeh.antennapod.ui.appstartintent.OnlineFeedviewActivityStarter;
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
import org.greenrobot.eventbus.ThreadMode;
|
||||
|
|
@ -173,8 +175,12 @@ public class ItemPagerFragment extends Fragment implements MaterialToolbar.OnMen
|
|||
if (item == null) {
|
||||
return;
|
||||
}
|
||||
Fragment fragment = FeedItemlistFragment.newInstance(item.getFeedId());
|
||||
((MainActivity) getActivity()).loadChildFragment(fragment);
|
||||
if (item.getFeed().getState() == Feed.STATE_SUBSCRIBED) {
|
||||
Intent intent = MainActivity.getIntentToOpenFeed(getContext(), item.getFeedId());
|
||||
startActivity(intent);
|
||||
} else {
|
||||
startActivity(new OnlineFeedviewActivityStarter(getContext(), item.getFeed().getDownloadUrl()).getIntent());
|
||||
}
|
||||
}
|
||||
|
||||
private class ItemPagerAdapter extends FragmentStateAdapter {
|
||||
|
|
|
|||
|
|
@ -147,7 +147,8 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
|
|||
((MainActivity) getActivity()).setupToolbarToggle(viewBinding.toolbar, displayUpArrow);
|
||||
viewBinding.recyclerView.setRecycledViewPool(((MainActivity) getActivity()).getRecycledViewPool());
|
||||
} else {
|
||||
viewBinding.toolbar.setNavigationIcon(null);
|
||||
viewBinding.toolbar.setNavigationIcon(R.drawable.ic_close);
|
||||
viewBinding.toolbar.setNavigationOnClickListener(view -> getActivity().finish());
|
||||
}
|
||||
updateToolbar();
|
||||
setupLoadMoreScrollListener();
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@
|
|||
android:id="@+id/descriptionContainer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="24dp"
|
||||
android:paddingHorizontal="16dp"
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone">
|
||||
|
|
@ -199,6 +199,10 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:paddingHorizontal="16dp"
|
||||
android:paddingVertical="8dp"
|
||||
android:background="@drawable/bg_message_info"
|
||||
android:textColor="?attr/colorAccent"
|
||||
android:text="@string/state_deleted_not_subscribed" />
|
||||
|
||||
|
|
@ -225,6 +229,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/preview_episodes"
|
||||
android:layout_marginBottom="8dp"
|
||||
style="@style/TextAppearance.Material3.TitleMedium" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt">
|
||||
<stroke
|
||||
android:width="2dp"
|
||||
android:color="?attr/colorPrimary" />
|
||||
|
||||
<corners android:radius="8dp" />
|
||||
|
||||
<solid>
|
||||
<aapt:attr name="android:color" >
|
||||
<selector>
|
||||
<item android:alpha="0.1" android:color="?attr/colorPrimary" />
|
||||
</selector>
|
||||
</aapt:attr>
|
||||
</solid>
|
||||
</shape>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M17.656,6.343L12,12M12,12L6.343,17.656M12,12L17.656,17.656M12,12L6.343,6.343"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="?attr/action_icon_color"/>
|
||||
</vector>
|
||||
Loading…
Reference in New Issue