Skip to content

Commit f26bf33

Browse files
authored
Merge pull request #8966 from Stypox/feed-menuitem-tooltip
Show correct tooltips for actions in feed
2 parents ca29f6c + 051c572 commit f26bf33

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import androidx.appcompat.app.AlertDialog
4141
import androidx.appcompat.content.res.AppCompatResources
4242
import androidx.core.content.edit
4343
import androidx.core.os.bundleOf
44+
import androidx.core.view.MenuItemCompat
4445
import androidx.core.view.isVisible
4546
import androidx.lifecycle.ViewModelProvider
4647
import androidx.preference.PreferenceManager
@@ -286,6 +287,15 @@ class FeedFragment : BaseStateFragment<FeedState>() {
286287
requireContext(),
287288
if (showPlayedItems) R.drawable.ic_visibility_on else R.drawable.ic_visibility_off
288289
)
290+
MenuItemCompat.setTooltipText(
291+
menuItem,
292+
getString(
293+
if (showPlayedItems)
294+
R.string.feed_toggle_hide_played_items
295+
else
296+
R.string.feed_toggle_show_played_items
297+
)
298+
)
289299
}
290300

291301
private fun updateToggleFutureItemsButton(menuItem: MenuItem) {
@@ -294,6 +304,15 @@ class FeedFragment : BaseStateFragment<FeedState>() {
294304
requireContext(),
295305
if (showFutureItems) R.drawable.ic_history_future else R.drawable.ic_history
296306
)
307+
MenuItemCompat.setTooltipText(
308+
menuItem,
309+
getString(
310+
if (showPlayedItems)
311+
R.string.feed_toggle_hide_future_items
312+
else
313+
R.string.feed_toggle_show_future_items
314+
)
315+
)
297316
}
298317

299318
// //////////////////////////////////////////////////////////////////////////

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,7 @@
684684
\n
685685
\nSo the choice boils down to what you prefer: speed or precise information.</string>
686686
<string name="feed_toggle_show_played_items">Show watched items</string>
687+
<string name="feed_toggle_hide_played_items">Hide watched items</string>
687688
<string name="content_not_supported">This content is not yet supported by NewPipe.\n\nIt will hopefully be supported in a future version.</string>
688689
<string name="detail_sub_channel_thumbnail_view_description">Channel\'s avatar thumbnail</string>
689690
<string name="channel_created_by">Created by %s</string>
@@ -746,5 +747,6 @@
746747
<string name="select_quality_external_players">Select quality for external players</string>
747748
<string name="unknown_format">Unknown format</string>
748749
<string name="unknown_quality">Unknown quality</string>
749-
<string name="feed_toggle_show_future_items">Show future videos</string>
750+
<string name="feed_toggle_show_future_items">Show future items</string>
751+
<string name="feed_toggle_hide_future_items">Hide future items</string>
750752
</resources>

0 commit comments

Comments
 (0)