Revert Merge pull request 128 from syphe dynamic size status bars Dynamic size status bars

app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java

@@ -25,7 +25,7 @@ import java.util.ArrayList;
 public class HorizontalAlbumAdapter extends AlbumAdapter {
     public static final String TAG = AlbumAdapter.class.getSimpleName();
 
-    public HorizontalAlbumAdapter(@NonNull AppCompatActivity activity, ArrayList<Album> dataSet,boolean usePalette, @Nullable CabHolder cabHolder) {
+    public HorizontalAlbumAdapter(@NonNull AppCompatActivity activity, ArrayList<Album> dataSet, boolean usePalette, @Nullable CabHolder cabHolder) {
         super(activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, usePalette, cabHolder);
     }
 

app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java

@@ -21,7 +21,6 @@ import com.kabouzeid.gramophone.dialogs.DonationsDialog;
 import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
 import com.kabouzeid.gramophone.ui.activities.bugreport.BugReportActivity;
 import com.kabouzeid.gramophone.ui.activities.intro.AppIntroActivity;
-import com.kabouzeid.gramophone.util.ViewUtil;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -33,11 +32,10 @@ import de.psdev.licensesdialog.LicensesDialog;
 @SuppressWarnings("FieldCanBeLocal")
 public class AboutActivity extends AbsBaseActivity implements View.OnClickListener {
 
-    private static String GITHUB = "https://github.com/kabouzeid/Phonograph";
-
     private static String GOOGLE_PLUS = "https://google.com/+KarimAbouZeid23697";
     private static String TWITTER = "https://twitter.com/karim23697";
-    private static String WEBSITE = "https://kabouzeid.com/";
+    private static String GITHUB = "https://github.com/kabouzeid";
+    private static String WEBSITE = "http://kabouzeid.com/";
 
     private static String GOOGLE_PLUS_COMMUNITY = "https://plus.google.com/u/0/communities/106227738496107108513";
     private static String TRANSLATE = "https://phonograph.oneskyapp.com/collaboration/project?id=26521";
@@ -63,8 +61,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
     LinearLayout intro;
     @BindView(R.id.licenses)
     LinearLayout licenses;
-    @BindView(R.id.write_an_email)
-    LinearLayout writeAnEmail;
     @BindView(R.id.add_to_google_plus_circles)
     LinearLayout addToGooglePlusCircles;
     @BindView(R.id.follow_on_twitter)
@@ -95,8 +91,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
     AppCompatButton maartenCorpelGooglePlus;
     @BindView(R.id.aleksandar_tesic_google_plus)
     AppCompatButton aleksandarTesicGooglePlus;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -108,7 +102,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
         setStatusbarColorAuto();
         setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
-        ViewUtil.setStatusBarHeight(this, statusBar);
 
         setUpViews();
     }
@@ -139,7 +132,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
         forkOnGitHub.setOnClickListener(this);
         visitWebsite.setOnClickListener(this);
         reportBugs.setOnClickListener(this);
-        writeAnEmail.setOnClickListener(this);
         joinGooglePlusCommunity.setOnClickListener(this);
         translate.setOnClickListener(this);
         rateOnGooglePlay.setOnClickListener(this);
@@ -188,12 +180,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
             openUrl(WEBSITE);
         } else if (v == reportBugs) {
             startActivity(new Intent(this, BugReportActivity.class));
-        } else if (v == writeAnEmail) {
-            Intent intent = new Intent(Intent.ACTION_SENDTO);
-            intent.setData(Uri.parse("mailto:contact@kabouzeid.com"));
-            intent.putExtra(Intent.EXTRA_EMAIL, "contact@kabouzeid.com");
-            intent.putExtra(Intent.EXTRA_SUBJECT, "Phonograph");
-            startActivity(Intent.createChooser(intent, "E-Mail"));
         } else if (v == joinGooglePlusCommunity) {
             openUrl(GOOGLE_PLUS_COMMUNITY);
         } else if (v == translate) {

app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java

@@ -44,7 +44,6 @@ import com.kabouzeid.gramophone.ui.activities.tageditor.AlbumTagEditorActivity;
 import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.Util;
-import com.kabouzeid.gramophone.util.ViewUtil;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -72,8 +71,6 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
     TextView albumTitleView;
     @BindView(R.id.list_background)
     View songsBackgroundView;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     private AlbumSongAdapter adapter;
 
@@ -95,7 +92,6 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
         setUpObservableListViewParams();
         setUpToolBar();
         setUpViews();
-        ViewUtil.setStatusBarHeight(this, statusBar);
 
         getSupportLoaderManager().initLoader(LOADER_ID, getIntent().getExtras(), this);
     }

app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java

@@ -53,9 +53,7 @@ import com.kabouzeid.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
 import com.kabouzeid.gramophone.util.ArtistSignatureUtil;
 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;
@@ -83,8 +81,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
     TextView artistName;
     @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     View songListHeader;
     RecyclerView albumRecyclerView;
@@ -95,7 +91,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
     private int artistImageViewHeight;
     private int toolbarColor;
     private float toolbarAlpha;
-    private boolean usePalette;
 
     private Artist artist;
     @Nullable
@@ -114,13 +109,11 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
         supportPostponeEnterTransition();
 
         lastFMRestClient = new LastFMRestClient(this);
-        usePalette=PreferenceUtil.getInstance(this).albumArtistColoredFooters();
 
         initViews();
         setUpObservableListViewParams();
         setUpViews();
         setUpToolbar();
-        ViewUtil.setStatusBarHeight(this, statusBar);
 
         getSupportLoaderManager().initLoader(LOADER_ID, getIntent().getExtras(), this);
     }
@@ -201,7 +194,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
 
     private void setUpAlbumRecyclerView() {
         albumRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
-        albumAdapter = new HorizontalAlbumAdapter(this, getArtist().albums, usePalette, this);
+        albumAdapter = new HorizontalAlbumAdapter(this, getArtist().albums, true, this);
         albumRecyclerView.setAdapter(albumAdapter);
         albumAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
             @Override
@@ -212,12 +205,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
         });
     }
 
-    protected void setUsePalette(boolean usePalette) {
-        albumAdapter.usePalette(usePalette);
-        PreferenceUtil.getInstance(this).setAlbumArtistColoredFooters(usePalette);
-        this.usePalette = usePalette;
-    }
-
     private void reload() {
         getSupportLoaderManager().restartLoader(LOADER_ID, getIntent().getExtras(), this);
     }
@@ -322,7 +309,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_artist_detail, menu);
-        menu.findItem(R.id.action_colored_footers).setChecked(usePalette);
         return true;
     }
 
@@ -353,10 +339,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
                 Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.updating), Toast.LENGTH_SHORT).show();
                 loadArtistImage(true);
                 return true;
-            case R.id.action_colored_footers:
-                item.setChecked(!item.isChecked());
-                setUsePalette(item.isChecked());
-                return true;
         }
         return super.onOptionsItemSelected(item);
     }

app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java

@@ -61,8 +61,6 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
     Toolbar toolbar;
     @BindView(android.R.id.empty)
     TextView empty;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     private Playlist playlist;
 
@@ -81,7 +79,6 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
         setStatusbarColorAuto();
         setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
-        ViewUtil.setStatusBarHeight(this, statusBar);
 
         playlist = getIntent().getExtras().getParcelable(EXTRA_PLAYLIST);
 

app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java

@@ -27,7 +27,6 @@ import com.kabouzeid.gramophone.loader.SongLoader;
 import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
 import com.kabouzeid.gramophone.ui.activities.base.AbsMusicServiceActivity;
 import com.kabouzeid.gramophone.util.Util;
-import com.kabouzeid.gramophone.util.ViewUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,8 +46,6 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
     Toolbar toolbar;
     @BindView(android.R.id.empty)
     TextView empty;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     SearchView searchView;
 
@@ -65,7 +62,6 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
         setStatusbarColorAuto();
         setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
-        ViewUtil.setStatusBarHeight(this, statusBar);
 
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         adapter = new SearchAdapter(this, Collections.emptyList());

app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java

@@ -25,15 +25,11 @@ import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEColorPreference;
 import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat;
 import com.kabouzeid.appthemehelper.util.ColorUtil;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.appshortcuts.DynamicShortcutManager;
-import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.preferences.NowPlayingScreenPreference;
 import com.kabouzeid.gramophone.preferences.NowPlayingScreenPreferenceDialog;
-import com.kabouzeid.gramophone.service.MusicService;
 import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
 import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
-import com.kabouzeid.gramophone.util.ViewUtil;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -43,8 +39,6 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
 
     @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -56,7 +50,6 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
         setStatusbarColorAuto();
         setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
-        ViewUtil.setStatusBarHeight(this, statusBar);
 
         toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
         setSupportActionBar(toolbar);
@@ -85,10 +78,6 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
                         .commit();
                 break;
         }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            new DynamicShortcutManager(this).updateDynamicShortcuts();
-        }
         recreate();
     }
 
@@ -133,12 +122,10 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
         public void onCreatePreferences(Bundle bundle, String s) {
             addPreferencesFromResource(R.xml.pref_general);
             addPreferencesFromResource(R.xml.pref_colors);
-            addPreferencesFromResource(R.xml.pref_notification);
             addPreferencesFromResource(R.xml.pref_now_playing_screen);
             addPreferencesFromResource(R.xml.pref_images);
             addPreferencesFromResource(R.xml.pref_lockscreen);
             addPreferencesFromResource(R.xml.pref_audio);
-            addPreferencesFromResource(R.xml.pref_playlists);
         }
 
         @Nullable
@@ -184,13 +171,6 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
                     ThemeStore.editTheme(getActivity())
                             .activityTheme(PreferenceUtil.getThemeResFromPrefValue((String) o))
                             .commit();
-
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-                        //Set the new theme so that updateAppShortcuts can pull it
-                        getActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue((String) o));
-                        new DynamicShortcutManager(getActivity()).updateDynamicShortcuts();
-                    }
-
                     getActivity().recreate();
                     return true;
                 }
@@ -206,7 +186,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
                 }
             });
 
-            final ATEColorPreference primaryColorPref = (ATEColorPreference) findPreference("primary_color");
+            ATEColorPreference primaryColorPref = (ATEColorPreference) findPreference("primary_color");
             final int primaryColor = ThemeStore.primaryColor(getActivity());
             primaryColorPref.setColor(primaryColor, ColorUtil.darkenColor(primaryColor));
             primaryColorPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@@ -222,7 +202,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
                 }
             });
 
-            final ATEColorPreference accentColorPref = (ATEColorPreference) findPreference("accent_color");
+            ATEColorPreference accentColorPref = (ATEColorPreference) findPreference("accent_color");
             final int accentColor = ThemeStore.accentColor(getActivity());
             accentColorPref.setColor(accentColor, ColorUtil.darkenColor(accentColor));
             accentColorPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@@ -256,50 +236,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
                 });
             }
 
-            final TwoStatePreference classicNotification = (TwoStatePreference) findPreference("classic_notification");
+            Preference equalizer = findPreference("equalizer");
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
-                classicNotification.setEnabled(false);
-                classicNotification.setSummary(R.string.pref_only_nougat);
-            } else {
-                classicNotification.setChecked(PreferenceUtil.getInstance(getActivity()).classicNotification());
-                classicNotification.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-                    @Override
-                    public boolean onPreferenceChange(Preference preference, Object newValue) {
-                        //Save preference
-                        PreferenceUtil.getInstance(getActivity()).setClassicNotification((Boolean)newValue);
-
-                        final MusicService service = MusicPlayerRemote.musicService;
-                        if (service != null) {
-                            service.initNotification();
-                            service.updateNotification();
-                        }
-
-                        return true;
-                    }
-                });
-            }
-
-            final TwoStatePreference colorAppShortcuts = (TwoStatePreference) findPreference("should_color_app_shortcuts");
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
-                colorAppShortcuts.setEnabled(false);
-                colorAppShortcuts.setSummary(R.string.pref_only_nougat_mr1);
-            } else {
-                colorAppShortcuts.setChecked(PreferenceUtil.getInstance(getActivity()).coloredAppShortcuts());
-                colorAppShortcuts.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-                    @Override
-                    public boolean onPreferenceChange(Preference preference, Object newValue) {
-                        //Save preference
-                        PreferenceUtil.getInstance(getActivity()).setColoredAppShortcuts((Boolean)newValue);
-
-                        //Update app shortcuts
-                        new DynamicShortcutManager(getActivity()).updateDynamicShortcuts();
-
-                        return true;
-                    }
-                });
-            }
-
-            final Preference equalizer = findPreference("equalizer");
             if (!hasEqualizer()) {
                 equalizer.setEnabled(false);
                 equalizer.setSummary(getResources().getString(R.string.no_equalizer));

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java

@@ -92,8 +92,6 @@ 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;
@@ -170,7 +168,6 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
         setUpBreadCrumbs();
         setUpRecyclerView();
         setUpAdapter();
-        ViewUtil.setStatusBarHeight(getActivity(), statusBar);
     }
 
     private void setUpAppbarColor() {

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java

@@ -39,7 +39,6 @@ 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;
@@ -58,8 +57,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     AppBarLayout appbar;
     @BindView(R.id.pager)
     ViewPager pager;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     private MusicLibraryPagerAdapter pagerAdapter;
     private MaterialCab cab;
@@ -93,8 +90,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
 
         setUpToolbar();
         setUpViewPager();
-        setUpStatusBar();
-        ViewUtil.setStatusBarHeight(getActivity(), statusBar);
     }
 
     private void setUpToolbar() {
@@ -127,12 +122,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         pager.addOnPageChangeListener(this);
     }
 
-    private void setUpStatusBar() {
-        ViewGroup.LayoutParams layoutParams = statusBar.getLayoutParams();
-        layoutParams.height = Util.getStatusBarHeight(getMainActivity());
-        statusBar.setLayoutParams(layoutParams);
-    }
-
     public Fragment getCurrentFragment() {
         return pagerAdapter.getFragment(pager.getCurrentItem());
     }

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java

@@ -119,12 +119,6 @@ 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);
@@ -204,7 +198,6 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
     private void updateQueue() {
         playingQueueAdapter.swapDataSet(MusicPlayerRemote.getPlayingQueue(), MusicPlayerRemote.getPosition());
-        playerQueueSubHeader.setText(getResources().getString(R.string.up_next) + "  •  " + MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())));
         if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
             resetToCurrentPosition();
         }
@@ -212,7 +205,6 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
     private void updateQueuePosition() {
         playingQueueAdapter.setCurrent(MusicPlayerRemote.getPosition());
-        playerQueueSubHeader.setText(getResources().getString(R.string.up_next) + "  •  " + MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())));
         if (slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
             resetToCurrentPosition();
         }
@@ -323,6 +315,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
                 try {
                     return AudioFileIO.read(new File(song.data)).getTagOrCreateDefault().getFirst(FieldKey.LYRICS);
                 } catch (Exception e) {
+                    e.printStackTrace();
                     cancel(false);
                     return null;
                 }

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java

@@ -114,9 +114,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
         impl.init();
 
         setUpPlayerToolbar();
-        setUpStatusBar();
         setUpSubFragments();
-        ViewUtil.setStatusBarHeight(getActivity(), playerStatusBar);
 
         setUpRecyclerView();
 
@@ -196,7 +194,6 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
     private void updateQueue() {
         playingQueueAdapter.swapDataSet(MusicPlayerRemote.getPlayingQueue(), MusicPlayerRemote.getPosition());
-        playerQueueSubHeader.setText(getResources().getString(R.string.up_next) + "  •  " + MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())));
         if (slidingUpPanelLayout == null || slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
             resetToCurrentPosition();
         }
@@ -204,7 +201,6 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
 
     private void updateQueuePosition() {
         playingQueueAdapter.setCurrent(MusicPlayerRemote.getPosition());
-        playerQueueSubHeader.setText(getResources().getString(R.string.up_next) + "  •  " + MusicUtil.getReadableDurationString(MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.getPosition())));
         if (slidingUpPanelLayout == null || slidingUpPanelLayout.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
             resetToCurrentPosition();
         }
@@ -234,12 +230,6 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
         toolbar.setOnMenuItemClickListener(this);
     }
 
-    private void setUpStatusBar() {
-        ViewGroup.LayoutParams layoutParams = playerStatusBar.getLayoutParams();
-        layoutParams.height = Util.getStatusBarHeight(getActivity());
-        playerStatusBar.setLayoutParams(layoutParams);
-    }
-
     @Override
     public boolean onMenuItemClick(MenuItem item) {
         switch (item.getItemId()) {
@@ -321,6 +311,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
                 try {
                     return AudioFileIO.read(new File(song.data)).getTagOrCreateDefault().getFirst(FieldKey.LYRICS);
                 } catch (Exception e) {
+                    e.printStackTrace();
                     cancel(false);
                     return null;
                 }

app/src/main/java/com/kabouzeid/gramophone/util/Util.java

@@ -135,12 +135,4 @@ public class Util {
         }
     }
 
-    public static int getStatusBarHeight(final Context context) {
-        int result = 0;
-        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
-        if (resourceId > 0) {
-            result = context.getResources().getDimensionPixelSize(resourceId);
-        }
-        return result;
-    }
 }

app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java

@@ -16,7 +16,6 @@ import android.support.annotation.ColorInt;
 import android.support.v4.view.ViewCompat;
 import android.util.DisplayMetrics;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.animation.PathInterpolator;
 import android.widget.TextView;
 
@@ -97,10 +96,4 @@ public class ViewUtil {
         DisplayMetrics metrics = resources.getDisplayMetrics();
         return px / metrics.density;
     }
-
-    public static void setStatusBarHeight(final Context context, View statusBar) {
-        ViewGroup.LayoutParams lp = statusBar.getLayoutParams();
-        lp.height = Util.getStatusBarHeight(context);
-        statusBar.requestLayout();
-    }
 }

app/src/main/res/layout/shadow_statusbar_toolbar.xml

@@ -11,7 +11,6 @@
         android:orientation="vertical">
 
         <View
-            android:id="@+id/status_bar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_padding" />