From 0e8ea42dc94b3b76b140741ca012f2939c5de1b3 Mon Sep 17 00:00:00 2001
From: simonfi <simonfi@datacom.co.nz>
Date: Thu, 6 Apr 2017 13:29:07 +1200
Subject: [PATCH] add some more fragments to those which dynamically resize
 their status bars.

---
 .../mainactivity/folders/FoldersFragment.java          |  3 +++
 .../mainactivity/library/LibraryFragment.java          |  2 ++
 .../ui/fragments/player/card/CardPlayerFragment.java   | 10 ++++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java
index 52e815fd..bc6cb58e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java
@@ -92,6 +92,8 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
     AppBarLayout appbar;
     @BindView(R.id.recycler_view)
     FastScrollRecyclerView recyclerView;
+    @BindView(R.id.status_bar)
+    View statusBar;
 
     private SongFileAdapter adapter;
     private MaterialCab cab;
@@ -168,6 +170,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
         setUpBreadCrumbs();
         setUpRecyclerView();
         setUpAdapter();
+        ViewUtil.setStatusBarHeight(getActivity(), statusBar);
     }
 
     private void setUpAppbarColor() {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
index 9aa3cfbc..97828cd0 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
@@ -39,6 +39,7 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.kabouzeid.gramophone.util.Util;
+import com.kabouzeid.gramophone.util.ViewUtil;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -93,6 +94,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         setUpToolbar();
         setUpViewPager();
         setUpStatusBar();
+        ViewUtil.setStatusBarHeight(getActivity(), statusBar);
     }
 
     private void setUpToolbar() {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java
index 739cf30d..ce7d05d6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java
@@ -119,6 +119,12 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
         setUpPlayerToolbar();
         setUpSubFragments();
 
+        // portrait view doesn't have a statusBar, so can't bind it up top as will throw an exception.
+        View statusBar = view.findViewById(R.id.status_bar);
+        if (statusBar != null) {
+            ViewUtil.setStatusBarHeight(getActivity(), statusBar);
+        }
+
         setUpRecyclerView();
 
         slidingUpPanelLayout.addPanelSlideListener(this);
@@ -232,10 +238,6 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
             }
         });
         toolbar.setOnMenuItemClickListener(this);
-
-        ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams)toolbar.getLayoutParams();
-        lp.setMargins(lp.leftMargin, Util.getStatusBarHeight(getActivity()), lp.rightMargin, lp.bottomMargin);
-        toolbar.requestLayout();
     }
 
     @Override