From f3dddc6021d084ca8046fdf8ba33d25e3baed0bd Mon Sep 17 00:00:00 2001 From: doubiez <31129629+doubiez@users.noreply.github.com> Date: Fri, 18 Aug 2017 13:22:41 +0200 Subject: [PATCH] You can do better! --- .../Tablayout/TabLayoutActivity.java | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/example/ben/fileexplorer/Tablayout/TabLayoutActivity.java b/app/src/main/java/com/example/ben/fileexplorer/Tablayout/TabLayoutActivity.java index db3d20e..7b935cb 100644 --- a/app/src/main/java/com/example/ben/fileexplorer/Tablayout/TabLayoutActivity.java +++ b/app/src/main/java/com/example/ben/fileexplorer/Tablayout/TabLayoutActivity.java @@ -29,11 +29,13 @@ protected void onCreate(Bundle savedInstanceState) { initTabLayout(); } - private void initTabLayout() { - TabLayout tabLayout = (TabLayout) findViewById(R.id.TabLayout); - addtabs(tabLayout); - PagerAdapter adapter = new PagerAdapter(getSupportFragmentManager(), tabLayout.getTabCount(), this, getTabs()); + TabLayout tabLayout; + PagerAdapter adapter; + + tabLayout = (TabLayout) findViewById(R.id.TabLayout); + addTabs(tabLayout); + adapter = new PagerAdapter(getSupportFragmentManager(), tabLayout.getTabCount(), this, getTabs()); final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); viewPager.setAdapter(adapter); viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); @@ -55,8 +57,8 @@ public void onTabReselected(TabLayout.Tab tab) { }); } - private void addtabs(TabLayout tabLayout) { - tabLayout.addTab(tabLayout.newTab().setText("Bilder")); + private void addTabs(TabLayout tabLayout) { + tabLayout.addTab(tabLayout.newTab().setText("Bilder")); // just beautiful! Everyone loves hard coded, un-localized strings! tabLayout.addTab(tabLayout.newTab().setText("Videos")); tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); } @@ -65,6 +67,7 @@ private void addtabs(TabLayout tabLayout) { public void onBackPressed() { fragmentManager = getSupportFragmentManager(); final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); + if (fragmentManager.getBackStackEntryCount() > 0) { if (viewPager.getCurrentItem() == 0) { fragmentManager.popBackStack("Pictures", FragmentManager.POP_BACK_STACK_INCLUSIVE); @@ -77,18 +80,26 @@ public void onBackPressed() { } private List getTabs() { - List fragments = new ArrayList<>(); - FileExplorerFragment pictures = new FileExplorerFragment(); - Bundle picBundle = new Bundle(); + List fragments; + FileExplorerFragment pictures; + FileExplorerFragment videos; + Bundle picBundle; + Bundle vidBundle; + + fragments = new ArrayList<>(); + pictures = new FileExplorerFragment(); + picBundle = new Bundle(); picBundle.putString("filetype", "Pictures"); pictures.setArguments(picBundle); fragments.add(pictures); - FileExplorerFragment videos = new FileExplorerFragment(); - Bundle vidBundle = new Bundle(); + videos = new FileExplorerFragment(); + vidBundle = new Bundle(); + vidBundle.putString("filetype", "Videos"); videos.setArguments(vidBundle); fragments.add(videos); + return fragments; } }