1
0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-17 22:29:54 +01:00

Merge pull request #3197 from mauriciocolli/fix-main-tabs

Fix bug in main screen tabs state management
This commit is contained in:
Tobias Groza 2020-03-11 22:03:16 +01:00 committed by GitHub
commit 33475ef403
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -136,16 +136,17 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
// Tabs // Tabs
//////////////////////////////////////////////////////////////////////////*/ //////////////////////////////////////////////////////////////////////////*/
public void setupTabs() { private void setupTabs() {
tabsList.clear(); tabsList.clear();
tabsList.addAll(tabsManager.getTabs()); tabsList.addAll(tabsManager.getTabs());
if (pagerAdapter == null || !pagerAdapter.sameTabs(tabsList)) { if (pagerAdapter == null || !pagerAdapter.sameTabs(tabsList)) {
pagerAdapter = new SelectedTabsPagerAdapter(requireContext(), getChildFragmentManager(), tabsList); pagerAdapter = new SelectedTabsPagerAdapter(requireContext(), getChildFragmentManager(), tabsList);
} }
// Clear previous tabs/fragments and set new adapter
viewPager.setAdapter(pagerAdapter); viewPager.setAdapter(null);
viewPager.setOffscreenPageLimit(tabsList.size()); viewPager.setOffscreenPageLimit(tabsList.size());
viewPager.setAdapter(pagerAdapter);
updateTabsIconAndDescription(); updateTabsIconAndDescription();
updateTitleForTab(viewPager.getCurrentItem()); updateTitleForTab(viewPager.getCurrentItem());
@ -194,6 +195,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
this.internalTabsList = new ArrayList<>(tabsList); this.internalTabsList = new ArrayList<>(tabsList);
} }
@NonNull
@Override @Override
public Fragment getItem(int position) { public Fragment getItem(int position) {
final Tab tab = internalTabsList.get(position); final Tab tab = internalTabsList.get(position);