Skip to content

Commit 48b2008

Browse files
har-123HatakeKakashri
authored andcommitted
BF-11894 : Fix the menu disappearing on performing backGesture
1 parent 54bf7f0 commit 48b2008

1 file changed

Lines changed: 61 additions & 56 deletions

File tree

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -123,62 +123,6 @@ private void setInitialData(final int sid, final String u, final String title) {
123123
@Override
124124
public void onCreate(final Bundle savedInstanceState) {
125125
super.onCreate(savedInstanceState);
126-
menuProvider = new MenuProvider() {
127-
@Override
128-
public void onCreateMenu(@NonNull final Menu menu,
129-
@NonNull final MenuInflater inflater) {
130-
inflater.inflate(R.menu.menu_channel, menu);
131-
132-
if (DEBUG) {
133-
Log.d(TAG, "onCreateOptionsMenu() called with: "
134-
+ "menu = [" + menu + "], inflater = [" + inflater + "]");
135-
}
136-
137-
}
138-
139-
@Override
140-
public void onPrepareMenu(@NonNull final Menu menu) {
141-
menuRssButton = menu.findItem(R.id.menu_item_rss);
142-
menuNotifyButton = menu.findItem(R.id.menu_item_notify);
143-
updateRssButton();
144-
updateNotifyButton(channelSubscription);
145-
}
146-
147-
@Override
148-
public boolean onMenuItemSelected(@NonNull final MenuItem item) {
149-
switch (item.getItemId()) {
150-
case R.id.menu_item_notify:
151-
final boolean value = !item.isChecked();
152-
item.setEnabled(false);
153-
setNotify(value);
154-
break;
155-
case R.id.action_settings:
156-
NavigationHelper.openSettings(requireContext());
157-
break;
158-
case R.id.menu_item_rss:
159-
if (currentInfo != null) {
160-
ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl());
161-
}
162-
break;
163-
case R.id.menu_item_openInBrowser:
164-
if (currentInfo != null) {
165-
ShareUtils.openUrlInBrowser(requireContext(),
166-
currentInfo.getOriginalUrl());
167-
}
168-
break;
169-
case R.id.menu_item_share:
170-
if (currentInfo != null) {
171-
ShareUtils.shareText(requireContext(), name,
172-
currentInfo.getOriginalUrl(), currentInfo.getAvatars());
173-
}
174-
break;
175-
default:
176-
return false;
177-
}
178-
return true;
179-
}
180-
};
181-
activity.addMenuProvider(menuProvider);
182126
}
183127

184128
@Override
@@ -195,6 +139,67 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
195139
return binding.getRoot();
196140
}
197141

142+
@Override
143+
public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
144+
super.onViewCreated(rootView, savedInstanceState);
145+
menuProvider = new MenuProvider() {
146+
@Override
147+
public void onCreateMenu(@NonNull final Menu menu,
148+
@NonNull final MenuInflater inflater) {
149+
inflater.inflate(R.menu.menu_channel, menu);
150+
151+
if (DEBUG) {
152+
Log.d(TAG, "onCreateOptionsMenu() called with: "
153+
+ "menu = [" + menu + "], inflater = [" + inflater + "]");
154+
}
155+
156+
}
157+
158+
@Override
159+
public void onPrepareMenu(@NonNull final Menu menu) {
160+
menuRssButton = menu.findItem(R.id.menu_item_rss);
161+
menuNotifyButton = menu.findItem(R.id.menu_item_notify);
162+
updateRssButton();
163+
updateNotifyButton(channelSubscription);
164+
}
165+
166+
@Override
167+
public boolean onMenuItemSelected(@NonNull final MenuItem item) {
168+
switch (item.getItemId()) {
169+
case R.id.menu_item_notify:
170+
final boolean value = !item.isChecked();
171+
item.setEnabled(false);
172+
setNotify(value);
173+
break;
174+
case R.id.action_settings:
175+
NavigationHelper.openSettings(requireContext());
176+
break;
177+
case R.id.menu_item_rss:
178+
if (currentInfo != null) {
179+
ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl());
180+
}
181+
break;
182+
case R.id.menu_item_openInBrowser:
183+
if (currentInfo != null) {
184+
ShareUtils.openUrlInBrowser(requireContext(),
185+
currentInfo.getOriginalUrl());
186+
}
187+
break;
188+
case R.id.menu_item_share:
189+
if (currentInfo != null) {
190+
ShareUtils.shareText(requireContext(), name,
191+
currentInfo.getOriginalUrl(), currentInfo.getAvatars());
192+
}
193+
break;
194+
default:
195+
return false;
196+
}
197+
return true;
198+
}
199+
};
200+
activity.addMenuProvider(menuProvider);
201+
}
202+
198203
@Override // called from onViewCreated in BaseFragment.onViewCreated
199204
protected void initViews(final View rootView, final Bundle savedInstanceState) {
200205
super.initViews(rootView, savedInstanceState);

0 commit comments

Comments
 (0)