1 files changed, 19 insertions, 38 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
index 380f6741a..e34f1ea1c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
@@ -1,18 +1,17 @@
 package de.danoeh.antennapod.fragment.gpodnet;
 
-import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
-import com.google.android.material.tabs.TabLayout;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
+import com.google.android.material.tabs.TabLayout;
 import de.danoeh.antennapod.R;
 
 /**
@@ -20,49 +19,25 @@ import de.danoeh.antennapod.R;
  */
 public class GpodnetMainFragment extends Fragment {
 
-    private static final String TAG = "GpodnetMainFragment";
-
-    private static final String PREF_LAST_TAB_POSITION = "tab_position";
-    private TabLayout tabLayout;
-    private ViewPager viewPager;
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         View root = inflater.inflate(R.layout.pager_fragment, container, false);
+        Toolbar toolbar = root.findViewById(R.id.toolbar);
+        toolbar.setTitle(R.string.gpodnet_main_label);
+        ((AppCompatActivity) getActivity()).setSupportActionBar(toolbar);
 
-        viewPager = root.findViewById(R.id.viewpager);
+        ViewPager viewPager = root.findViewById(R.id.viewpager);
         GpodnetPagerAdapter pagerAdapter = new GpodnetPagerAdapter(getChildFragmentManager(), getResources());
         viewPager.setAdapter(pagerAdapter);
 
         // Give the TabLayout the ViewPager
-        tabLayout = root.findViewById(R.id.sliding_tabs);
+        TabLayout tabLayout = root.findViewById(R.id.sliding_tabs);
         tabLayout.setupWithViewPager(viewPager);
 
         return root;
     }
 
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        // save our tab selection
-        SharedPreferences prefs = getActivity().getSharedPreferences(TAG, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = prefs.edit();
-        editor.putInt(PREF_LAST_TAB_POSITION, tabLayout.getSelectedTabPosition());
-        editor.apply();
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-
-        // restore our last position
-        SharedPreferences prefs = getActivity().getSharedPreferences(TAG, Context.MODE_PRIVATE);
-        int lastPosition = prefs.getInt(PREF_LAST_TAB_POSITION, 0);
-        viewPager.setCurrentItem(lastPosition);
-    }
-
     public class GpodnetPagerAdapter extends FragmentPagerAdapter {
 
 
@@ -80,13 +55,19 @@ public class GpodnetMainFragment extends Fragment {
 
         @Override
         public Fragment getItem(int i) {
+            Bundle arguments = new Bundle();
+            arguments.putBoolean(PodcastListFragment.ARGUMENT_HIDE_TOOLBAR, true);
             switch (i) {
                 case POS_TAGS:
                     return new TagListFragment();
                 case POS_TOPLIST:
-                    return new PodcastTopListFragment();
+                    PodcastListFragment topListFragment = new PodcastTopListFragment();
+                    topListFragment.setArguments(arguments);
+                    return topListFragment;
                 case POS_SUGGESTIONS:
-                    return new SuggestionListFragment();
+                    PodcastListFragment suggestionsFragment = new SuggestionListFragment();
+                    suggestionsFragment.setArguments(arguments);
+                    return suggestionsFragment;
                 default:
                     return null;
             }