diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/common/src/main/java/de/danoeh/antennapod/ui/common/PagedToolbarFragment.java | 18 | ||||
| -rw-r--r-- | ui/i18n/src/main/res/values/strings.xml | 5 |
2 files changed, 1 insertions, 22 deletions
diff --git a/ui/common/src/main/java/de/danoeh/antennapod/ui/common/PagedToolbarFragment.java b/ui/common/src/main/java/de/danoeh/antennapod/ui/common/PagedToolbarFragment.java index 3d82cb32c..48793ff13 100644 --- a/ui/common/src/main/java/de/danoeh/antennapod/ui/common/PagedToolbarFragment.java +++ b/ui/common/src/main/java/de/danoeh/antennapod/ui/common/PagedToolbarFragment.java @@ -1,6 +1,5 @@ package de.danoeh.antennapod.ui.common; -import androidx.annotation.NonNull; import com.google.android.material.appbar.MaterialToolbar; import androidx.fragment.app.Fragment; import androidx.viewpager2.widget.ViewPager2; @@ -10,23 +9,8 @@ import androidx.viewpager2.widget.ViewPager2; * All items share the same general menu items and are just allowed to show/hide them. */ public abstract class PagedToolbarFragment extends Fragment { - private MaterialToolbar toolbar; - private ViewPager2 viewPager; - /** - * Invalidate the toolbar menu if the current child fragment is visible. - * @param child The fragment to invalidate - */ - public void invalidateOptionsMenuIfActive(@NonNull Fragment child) { - Fragment visibleChild = getChildFragmentManager().findFragmentByTag("f" + viewPager.getCurrentItem()); - if (visibleChild == child) { - visibleChild.onPrepareOptionsMenu(toolbar.getMenu()); - } - } - - protected void setupPagedToolbar(MaterialToolbar toolbar, ViewPager2 viewPager) { - this.toolbar = toolbar; - this.viewPager = viewPager; + protected void setupPagedToolbar(final MaterialToolbar toolbar, final ViewPager2 viewPager) { toolbar.setOnMenuItemClickListener(item -> { if (this.onOptionsItemSelected(item)) { diff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml index 03044a79d..1ce509002 100644 --- a/ui/i18n/src/main/res/values/strings.xml +++ b/ui/i18n/src/main/res/values/strings.xml @@ -320,11 +320,6 @@ <!-- Mediaplayer messages --> <string name="playback_error_generic"><![CDATA[The media file could not be played.\n\n- Try deleting and re-downloading the episode.\n- Check your network connection, and make sure no VPN or login page is blocking access.\n- Try long-pressing and sharing the \"Media address\" to your web browser to see if it can be played there. If not, contact the podcast creators.]]></string> - <string name="playback_error_server_died">Server died</string> - <string name="playback_error_unsupported">Unsupported media type</string> - <string name="playback_error_timeout">Operation timed out</string> - <string name="playback_error_source">Unable to access media file</string> - <string name="playback_error_unknown">Unknown error</string> <string name="no_media_playing_label">No media playing</string> <string name="position_default_label" translatable="false">00:00:00</string> <string name="unknown_media_key">AntennaPod - Unknown media key: %1$d</string> |