mirror of
				https://github.com/TeamNewPipe/NewPipe
				synced 2025-10-31 07:13:00 +00:00 
			
		
		
		
	BF-11894 : Fix the menu disappearing on performing backGesture
This commit is contained in:
		| @@ -123,62 +123,6 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo> | ||||
|     @Override | ||||
|     public void onCreate(final Bundle savedInstanceState) { | ||||
|         super.onCreate(savedInstanceState); | ||||
|         menuProvider = new MenuProvider() { | ||||
|             @Override | ||||
|             public void onCreateMenu(@NonNull final Menu menu, | ||||
|                                      @NonNull final MenuInflater inflater) { | ||||
|                 inflater.inflate(R.menu.menu_channel, menu); | ||||
|  | ||||
|                 if (DEBUG) { | ||||
|                     Log.d(TAG, "onCreateOptionsMenu() called with: " | ||||
|                             + "menu = [" + menu + "], inflater = [" + inflater + "]"); | ||||
|                 } | ||||
|  | ||||
|             } | ||||
|  | ||||
|             @Override | ||||
|             public void onPrepareMenu(@NonNull final Menu menu) { | ||||
|                 menuRssButton = menu.findItem(R.id.menu_item_rss); | ||||
|                 menuNotifyButton = menu.findItem(R.id.menu_item_notify); | ||||
|                 updateRssButton(); | ||||
|                 updateNotifyButton(channelSubscription); | ||||
|             } | ||||
|  | ||||
|             @Override | ||||
|             public boolean onMenuItemSelected(@NonNull final MenuItem item) { | ||||
|                 switch (item.getItemId()) { | ||||
|                     case R.id.menu_item_notify: | ||||
|                         final boolean value = !item.isChecked(); | ||||
|                         item.setEnabled(false); | ||||
|                         setNotify(value); | ||||
|                         break; | ||||
|                     case R.id.action_settings: | ||||
|                         NavigationHelper.openSettings(requireContext()); | ||||
|                         break; | ||||
|                     case R.id.menu_item_rss: | ||||
|                         if (currentInfo != null) { | ||||
|                             ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl()); | ||||
|                         } | ||||
|                         break; | ||||
|                     case R.id.menu_item_openInBrowser: | ||||
|                         if (currentInfo != null) { | ||||
|                             ShareUtils.openUrlInBrowser(requireContext(), | ||||
|                                     currentInfo.getOriginalUrl()); | ||||
|                         } | ||||
|                         break; | ||||
|                     case R.id.menu_item_share: | ||||
|                         if (currentInfo != null) { | ||||
|                             ShareUtils.shareText(requireContext(), name, | ||||
|                                     currentInfo.getOriginalUrl(), currentInfo.getAvatars()); | ||||
|                         } | ||||
|                         break; | ||||
|                     default: | ||||
|                         return false; | ||||
|                 } | ||||
|                 return true; | ||||
|             } | ||||
|         }; | ||||
|         activity.addMenuProvider(menuProvider); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
| @@ -195,6 +139,67 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo> | ||||
|         return binding.getRoot(); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) { | ||||
|         super.onViewCreated(rootView, savedInstanceState); | ||||
|             menuProvider = new MenuProvider() { | ||||
|                 @Override | ||||
|                 public void onCreateMenu(@NonNull final Menu menu, | ||||
|                                          @NonNull final MenuInflater inflater) { | ||||
|                     inflater.inflate(R.menu.menu_channel, menu); | ||||
|  | ||||
|                     if (DEBUG) { | ||||
|                         Log.d(TAG, "onCreateOptionsMenu() called with: " | ||||
|                                 + "menu = [" + menu + "], inflater = [" + inflater + "]"); | ||||
|                     } | ||||
|  | ||||
|                 } | ||||
|  | ||||
|                 @Override | ||||
|                 public void onPrepareMenu(@NonNull final Menu menu) { | ||||
|                     menuRssButton = menu.findItem(R.id.menu_item_rss); | ||||
|                     menuNotifyButton = menu.findItem(R.id.menu_item_notify); | ||||
|                     updateRssButton(); | ||||
|                     updateNotifyButton(channelSubscription); | ||||
|                 } | ||||
|  | ||||
|                 @Override | ||||
|                 public boolean onMenuItemSelected(@NonNull final MenuItem item) { | ||||
|                     switch (item.getItemId()) { | ||||
|                         case R.id.menu_item_notify: | ||||
|                             final boolean value = !item.isChecked(); | ||||
|                             item.setEnabled(false); | ||||
|                             setNotify(value); | ||||
|                             break; | ||||
|                         case R.id.action_settings: | ||||
|                             NavigationHelper.openSettings(requireContext()); | ||||
|                             break; | ||||
|                         case R.id.menu_item_rss: | ||||
|                             if (currentInfo != null) { | ||||
|                                 ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl()); | ||||
|                             } | ||||
|                             break; | ||||
|                         case R.id.menu_item_openInBrowser: | ||||
|                             if (currentInfo != null) { | ||||
|                                 ShareUtils.openUrlInBrowser(requireContext(), | ||||
|                                         currentInfo.getOriginalUrl()); | ||||
|                             } | ||||
|                             break; | ||||
|                         case R.id.menu_item_share: | ||||
|                             if (currentInfo != null) { | ||||
|                                 ShareUtils.shareText(requireContext(), name, | ||||
|                                         currentInfo.getOriginalUrl(), currentInfo.getAvatars()); | ||||
|                             } | ||||
|                             break; | ||||
|                         default: | ||||
|                             return false; | ||||
|                     } | ||||
|                     return true; | ||||
|                 } | ||||
|             }; | ||||
|             activity.addMenuProvider(menuProvider); | ||||
|     } | ||||
|  | ||||
|     @Override // called from onViewCreated in BaseFragment.onViewCreated | ||||
|     protected void initViews(final View rootView, final Bundle savedInstanceState) { | ||||
|         super.initViews(rootView, savedInstanceState); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Harshita
					Harshita