From b02391161e02aab9f20b204df30682c787c378a8 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 18 Apr 2015 13:05:27 +0200 Subject: [PATCH] Removed the option for translucent nav bar completely, and cleaned up the code in ThemeBaseActivity --- .../ui/activities/AlbumDetailActivity.java | 7 +--- .../ui/activities/ArtistDetailActivity.java | 7 +--- .../ui/activities/MainActivity.java | 2 +- .../activities/MusicControllerActivity.java | 7 +--- .../ui/activities/PlaylistDetailActivity.java | 2 +- .../ui/activities/SearchActivity.java | 2 +- .../ui/activities/SettingsActivity.java | 1 + .../ui/activities/base/ThemeBaseActivity.java | 13 +------- .../tageditor/AbsTagEditorActivity.java | 2 +- .../AbsMainActivityFragment.java | 7 ---- .../com/kabouzeid/gramophone/util/Util.java | 32 +++++++++---------- 11 files changed, 25 insertions(+), 57 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index 30b77327..22b89c00 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -100,7 +100,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH @TargetApi(Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { - setUpTranslucence(true, false); + setStatusBarTranslucent(true); super.onCreate(savedInstanceState); setContentView(R.layout.activity_album_detail); @@ -128,11 +128,6 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH setUpViews(); } - @Override - protected boolean translucentStatusBarOnLollipop() { - return true; - } - @Override protected boolean shouldColorStatusBar() { return false; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index a535a5ea..53ccd2f4 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -114,7 +114,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor @TargetApi(Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { - setUpTranslucence(true, false); + setStatusBarTranslucent(true); super.onCreate(savedInstanceState); setContentView(R.layout.activity_artist_detail); @@ -139,11 +139,6 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor } } - @Override - protected boolean translucentStatusBarOnLollipop() { - return true; - } - @Override protected boolean shouldColorStatusBar() { return false; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index c8ad38b1..13b61e75 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -77,7 +77,7 @@ public class MainActivity extends AbsFabActivity @Override protected void onCreate(Bundle savedInstanceState) { - setUpTranslucence(true, true); + setStatusBarTranslucent(!Util.hasLollipopSDK()); super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java index 5938db51..a65b7a3e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java @@ -74,7 +74,7 @@ public class MusicControllerActivity extends AbsFabActivity { @TargetApi(Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { - setUpTranslucence(true, false); + setStatusBarTranslucent(true); super.onCreate(savedInstanceState); setContentView(R.layout.activity_music_controller); @@ -94,11 +94,6 @@ public class MusicControllerActivity extends AbsFabActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); } - @Override - protected boolean translucentStatusBarOnLollipop() { - return true; - } - @Override protected boolean shouldColorStatusBar() { return false; // let other code handle this below diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java index ba25b1e8..0e3ac7ba 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java @@ -33,7 +33,7 @@ public class PlaylistDetailActivity extends AbsFabActivity { @TargetApi(Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { - setUpTranslucence(false, false); + setStatusBarTranslucent(false); super.onCreate(savedInstanceState); setContentView(R.layout.activity_playlist_detail); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java index 31f044c3..234e78b6 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java @@ -44,7 +44,7 @@ public class SearchActivity extends AbsBaseActivity { @SuppressLint("NewApi") @Override protected void onCreate(Bundle savedInstanceState) { - setUpTranslucence(false, false); + setStatusBarTranslucent(false); setTitle(null); super.onCreate(savedInstanceState); setContentView(R.layout.activity_search); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java index 3599ab9b..c78f4004 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java @@ -29,6 +29,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia @Override protected void onCreate(Bundle savedInstanceState) { + setStatusBarTranslucent(false); super.onCreate(savedInstanceState); setContentView(R.layout.activity_preferences); mToolbar = (Toolbar) findViewById(R.id.toolbar); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java index 4d2360d1..2a526308 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java @@ -75,23 +75,12 @@ public abstract class ThemeBaseActivity extends ActionBarActivity implements Kab // } // } - protected void setUpTranslucence(boolean statusBarTranslucent, boolean navigationBarTranslucent) { + protected void setStatusBarTranslucent(boolean statusBarTranslucent) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (translucentStatusBarOnLollipop() || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { Util.setStatusBarTranslucent(getWindow(), statusBarTranslucent); - } - if (Util.isInPortraitMode(this) || Util.isTablet(this)) { - Util.setNavBarTranslucent(getWindow(), navigationBarTranslucent); - } else { - Util.setNavBarTranslucent(getWindow(), false); - } } } - protected boolean translucentStatusBarOnLollipop() { - return false; - } - protected abstract boolean shouldColorStatusBar(); protected abstract boolean shouldColorNavBar(); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java index e2630488..f0eb4b77 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java @@ -89,7 +89,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { - setUpTranslucence(false, false); + setStatusBarTranslucent(false); super.onCreate(savedInstanceState); setContentView(getContentViewResId()); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java index a05c4811..c03a62a9 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java @@ -1,12 +1,10 @@ package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments; -import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; -import com.kabouzeid.gramophone.ui.activities.MainActivity; import com.kabouzeid.gramophone.util.Util; /** @@ -28,11 +26,6 @@ public abstract class AbsMainActivityFragment extends Fragment implements KabVie } protected int getBottomPadding() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (Util.isInPortraitMode(getActivity()) || Util.isTablet(getActivity())) { - return Util.getNavigationBarHeight(getActivity()); - } - } return 0; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/Util.java b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java index efe57777..80570891 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/Util.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java @@ -76,22 +76,22 @@ public class Util { return result; } - @TargetApi(19) - public static void setNavBarTranslucent(Window window, boolean translucent) { - if (translucent) { - window.setFlags( - WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, - WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); - return; - } - - final WindowManager.LayoutParams attrs = window - .getAttributes(); - attrs.flags &= (~WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); - window.setAttributes(attrs); - window.clearFlags( - WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS); - } +// @TargetApi(19) +// public static void setNavBarTranslucent(Window window, boolean translucent) { +// if (translucent) { +// window.setFlags( +// WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, +// WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); +// return; +// } +// +// final WindowManager.LayoutParams attrs = window +// .getAttributes(); +// attrs.flags &= (~WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); +// window.setAttributes(attrs); +// window.clearFlags( +// WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS); +// } @TargetApi(19) public static void setStatusBarTranslucent(Window window, boolean translucent) {