Address non-final resource IDs warnings

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>

Author: theimpulson

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -309,25 +309,21 @@ private void addDrawerMenuForCurrentService() throws ExtractionException {
     }
 
     private boolean drawerItemSelected(final MenuItem item) {
-        switch (item.getGroupId()) {
-            case R.id.menu_services_group:
-                changeService(item);
-                break;
-            case R.id.menu_tabs_group:
-                tabSelected(item);
-                break;
-            case R.id.menu_kiosks_group:
-                try {
-                    kioskSelected(item);
-                } catch (final Exception e) {
-                    ErrorUtil.showUiErrorSnackbar(this, "Selecting drawer kiosk", e);
-                }
-                break;
-            case R.id.menu_options_about_group:
-                optionsAboutSelected(item);
-                break;
-            default:
-                return false;
+        final int groupId = item.getGroupId();
+        if (groupId == R.id.menu_services_group) {
+            changeService(item);
+        } else if (groupId == R.id.menu_tabs_group) {
+            tabSelected(item);
+        } else if (groupId == R.id.menu_kiosks_group) {
+            try {
+                kioskSelected(item);
+            } catch (final Exception e) {
+                ErrorUtil.showUiErrorSnackbar(this, "Selecting drawer kiosk", e);
+            }
+        } else if (groupId == R.id.menu_options_about_group) {
+            optionsAboutSelected(item);
+        } else {
+            return false;
         }
 
         mainBinding.getRoot().closeDrawers();

app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java

@@ -41,50 +41,50 @@ public static void openPopupMenu(final PlayQueue playQueue,
         }
 
         popupMenu.setOnMenuItemClickListener(menuItem -> {
-            switch (menuItem.getItemId()) {
-                case R.id.menu_item_remove:
-                    final int index = playQueue.indexOf(item);
-                    playQueue.remove(index);
-                    return true;
-                case R.id.menu_item_details:
-                    // playQueue is null since we don't want any queue change
-                    NavigationHelper.openVideoDetail(context, item.getServiceId(),
-                            item.getUrl(), item.getTitle(), null,
-                            false);
-                    return true;
-                case R.id.menu_item_append_playlist:
-                    PlaylistDialog.createCorrespondingDialog(
-                            context,
-                            List.of(new StreamEntity(item)),
-                            dialog -> dialog.show(
-                                    fragmentManager,
-                                    "QueueItemMenuUtil@append_playlist"
-                            )
-                    );
+            final int itemId = menuItem.getItemId();
+            if (itemId == R.id.menu_item_remove) {
+                final int index = playQueue.indexOf(item);
+                playQueue.remove(index);
+                return true;
+            } else if (itemId == R.id.menu_item_details) {
+                // playQueue is null since we don't want any queue change
+                NavigationHelper.openVideoDetail(context, item.getServiceId(),
+                        item.getUrl(), item.getTitle(), null,
+                        false);
+                return true;
+            } else if (itemId == R.id.menu_item_append_playlist) {
+                PlaylistDialog.createCorrespondingDialog(
+                        context,
+                        List.of(new StreamEntity(item)),
+                        dialog -> dialog.show(
+                                fragmentManager,
+                                "QueueItemMenuUtil@append_playlist"
+                        )
+                );
 
-                    return true;
-                case R.id.menu_item_channel_details:
-                    SparseItemUtil.fetchUploaderUrlIfSparse(context, item.getServiceId(),
-                            item.getUrl(), item.getUploaderUrl(),
-                            // An intent must be used here.
-                            // Opening with FragmentManager transactions is not working,
-                            // as PlayQueueActivity doesn't use fragments.
-                            uploaderUrl -> NavigationHelper.openChannelFragmentUsingIntent(
-                                    context, item.getServiceId(), uploaderUrl, item.getUploader()
-                            ));
-                    return true;
-                case R.id.menu_item_share:
-                    shareText(context, item.getTitle(), item.getUrl(),
-                            item.getThumbnails());
-                    return true;
-                case R.id.menu_item_download:
-                    fetchStreamInfoAndSaveToDatabase(context, item.getServiceId(), item.getUrl(),
-                            info -> {
-                                final DownloadDialog downloadDialog = new DownloadDialog(context,
-                                        info);
-                                downloadDialog.show(fragmentManager, "downloadDialog");
-                            });
-                    return true;
+                return true;
+            } else if (itemId == R.id.menu_item_channel_details) {
+                SparseItemUtil.fetchUploaderUrlIfSparse(context, item.getServiceId(),
+                        item.getUrl(), item.getUploaderUrl(),
+                        // An intent must be used here.
+                        // Opening with FragmentManager transactions is not working,
+                        // as PlayQueueActivity doesn't use fragments.
+                        uploaderUrl -> NavigationHelper.openChannelFragmentUsingIntent(
+                                context, item.getServiceId(), uploaderUrl, item.getUploader()
+                        ));
+                return true;
+            } else if (itemId == R.id.menu_item_share) {
+                shareText(context, item.getTitle(), item.getUrl(),
+                        item.getThumbnails());
+                return true;
+            } else if (itemId == R.id.menu_item_download) {
+                fetchStreamInfoAndSaveToDatabase(context, item.getServiceId(), item.getUrl(),
+                        info -> {
+                            final DownloadDialog downloadDialog = new DownloadDialog(context,
+                                    info);
+                            downloadDialog.show(fragmentManager, "downloadDialog");
+                        });
+                return true;
             }
             return false;
         });