From c226f1124575b141f2038bdbe227d3cf895ea4f9 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 27 Apr 2024 17:00:12 +0700 Subject: [PATCH] simplify controll flows for ChannelTabHelper --- .../schabi/newpipe/util/ChannelTabHelper.java | 75 +++++++------------ 1 file changed, 27 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/util/ChannelTabHelper.java b/app/src/main/java/org/schabi/newpipe/util/ChannelTabHelper.java index 8e8d38490..bc4f87ac8 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ChannelTabHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ChannelTabHelper.java @@ -47,62 +47,41 @@ public final class ChannelTabHelper { @StringRes private static int getShowTabKey(final String tab) { - switch (tab) { - case ChannelTabs.VIDEOS: - return R.string.show_channel_tabs_videos; - case ChannelTabs.TRACKS: - return R.string.show_channel_tabs_tracks; - case ChannelTabs.SHORTS: - return R.string.show_channel_tabs_shorts; - case ChannelTabs.LIVESTREAMS: - return R.string.show_channel_tabs_livestreams; - case ChannelTabs.CHANNELS: - return R.string.show_channel_tabs_channels; - case ChannelTabs.PLAYLISTS: - return R.string.show_channel_tabs_playlists; - case ChannelTabs.ALBUMS: - return R.string.show_channel_tabs_albums; - default: - return -1; - } + return switch (tab) { + case ChannelTabs.VIDEOS -> R.string.show_channel_tabs_videos; + case ChannelTabs.TRACKS -> R.string.show_channel_tabs_tracks; + case ChannelTabs.SHORTS -> R.string.show_channel_tabs_shorts; + case ChannelTabs.LIVESTREAMS -> R.string.show_channel_tabs_livestreams; + case ChannelTabs.CHANNELS -> R.string.show_channel_tabs_channels; + case ChannelTabs.PLAYLISTS -> R.string.show_channel_tabs_playlists; + case ChannelTabs.ALBUMS -> R.string.show_channel_tabs_albums; + default -> -1; + }; } @StringRes private static int getFetchFeedTabKey(final String tab) { - switch (tab) { - case ChannelTabs.VIDEOS: - return R.string.fetch_channel_tabs_videos; - case ChannelTabs.TRACKS: - return R.string.fetch_channel_tabs_tracks; - case ChannelTabs.SHORTS: - return R.string.fetch_channel_tabs_shorts; - case ChannelTabs.LIVESTREAMS: - return R.string.fetch_channel_tabs_livestreams; - default: - return -1; - } + return switch (tab) { + case ChannelTabs.VIDEOS -> R.string.fetch_channel_tabs_videos; + case ChannelTabs.TRACKS -> R.string.fetch_channel_tabs_tracks; + case ChannelTabs.SHORTS -> R.string.fetch_channel_tabs_shorts; + case ChannelTabs.LIVESTREAMS -> R.string.fetch_channel_tabs_livestreams; + default -> -1; + }; } @StringRes public static int getTranslationKey(final String tab) { - switch (tab) { - case ChannelTabs.VIDEOS: - return R.string.channel_tab_videos; - case ChannelTabs.TRACKS: - return R.string.channel_tab_tracks; - case ChannelTabs.SHORTS: - return R.string.channel_tab_shorts; - case ChannelTabs.LIVESTREAMS: - return R.string.channel_tab_livestreams; - case ChannelTabs.CHANNELS: - return R.string.channel_tab_channels; - case ChannelTabs.PLAYLISTS: - return R.string.channel_tab_playlists; - case ChannelTabs.ALBUMS: - return R.string.channel_tab_albums; - default: - return R.string.unknown_content; - } + return switch (tab) { + case ChannelTabs.VIDEOS -> R.string.channel_tab_videos; + case ChannelTabs.TRACKS -> R.string.channel_tab_tracks; + case ChannelTabs.SHORTS -> R.string.channel_tab_shorts; + case ChannelTabs.LIVESTREAMS -> R.string.channel_tab_livestreams; + case ChannelTabs.CHANNELS -> R.string.channel_tab_channels; + case ChannelTabs.PLAYLISTS -> R.string.channel_tab_playlists; + case ChannelTabs.ALBUMS -> R.string.channel_tab_albums; + default -> R.string.unknown_content; + }; } public static boolean showChannelTab(final Context context,