From fd09e6147f5ffab9bfab80dd0c8a307435536efc Mon Sep 17 00:00:00 2001 From: Diana Victoria Furrer Date: Sat, 31 May 2025 01:30:49 +0200 Subject: [PATCH] # Fixed Feed Group Titlebar - use default fragment_feed_title for TabName - only clear FeedFragment bar subtitle when it matches the groupName to clear. --- .../org/schabi/newpipe/local/feed/FeedFragment.kt | 15 +++++++++++++-- .../org/schabi/newpipe/settings/tabs/Tab.java | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt index 61eb4c8d2..91f98f5d2 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt @@ -269,7 +269,12 @@ class FeedFragment : BaseStateFragment() { override fun onDestroyOptionsMenu() { super.onDestroyOptionsMenu() - activity?.supportActionBar?.subtitle = null + if ( + (groupName != "") && + (activity?.supportActionBar?.subtitle == groupName) + ) { + activity?.supportActionBar?.subtitle = null + } } override fun onDestroy() { @@ -281,7 +286,13 @@ class FeedFragment : BaseStateFragment() { } super.onDestroy() - activity?.supportActionBar?.subtitle = null + + if ( + (groupName != "") && + (activity?.supportActionBar?.subtitle == groupName) + ) { + activity?.supportActionBar?.subtitle = null + } } override fun onDestroyView() { diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java index d44badd68..83abf87d4 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java +++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java @@ -687,7 +687,7 @@ public abstract class Tab { @Override public String getTabName(final Context context) { - return feedGroupName; + return context.getString(R.string.fragment_feed_title); } @DrawableRes