tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed the option for translucent nav bar completely, and cleaned up the code in ThemeBaseActivity

Browse source
This commit is contained in:
Karim Abou Zeid 2015-04-18 13:05:27 +02:00
commit b02391161e
11 changed files with 25 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,7 +100,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
@TargetApi(Build.VERSION_CODES.LOLLIPOP) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setUpTranslucence(true, false); setStatusBarTranslucent(true);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_album_detail); setContentView(R.layout.activity_album_detail);
@ -128,11 +128,6 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
setUpViews(); setUpViews();
} }
@Override
protected boolean translucentStatusBarOnLollipop() {
return true;
}
@Override @Override
protected boolean shouldColorStatusBar() { protected boolean shouldColorStatusBar() {
return false; return false;

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

@ -114,7 +114,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
@TargetApi(Build.VERSION_CODES.LOLLIPOP) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setUpTranslucence(true, false); setStatusBarTranslucent(true);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_artist_detail); setContentView(R.layout.activity_artist_detail);
@ -139,11 +139,6 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
} }
} }
@Override
protected boolean translucentStatusBarOnLollipop() {
return true;
}
@Override @Override
protected boolean shouldColorStatusBar() { protected boolean shouldColorStatusBar() {
return false; return false;

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
View file

@ -77,7 +77,7 @@ public class MainActivity extends AbsFabActivity
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setUpTranslucence(true, true); setStatusBarTranslucent(!Util.hasLollipopSDK());
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);

7
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
View file

@ -74,7 +74,7 @@ public class MusicControllerActivity extends AbsFabActivity {
@TargetApi(Build.VERSION_CODES.LOLLIPOP) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setUpTranslucence(true, false); setStatusBarTranslucent(true);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_music_controller); setContentView(R.layout.activity_music_controller);
@ -94,11 +94,6 @@ public class MusicControllerActivity extends AbsFabActivity {
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
} }
@Override
protected boolean translucentStatusBarOnLollipop() {
return true;
}
@Override @Override
protected boolean shouldColorStatusBar() { protected boolean shouldColorStatusBar() {
return false; // let other code handle this below return false; // let other code handle this below

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

@ -33,7 +33,7 @@ public class PlaylistDetailActivity extends AbsFabActivity {
@TargetApi(Build.VERSION_CODES.LOLLIPOP) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setUpTranslucence(false, false); setStatusBarTranslucent(false);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_playlist_detail); setContentView(R.layout.activity_playlist_detail);

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

@ -44,7 +44,7 @@ public class SearchActivity extends AbsBaseActivity {
@SuppressLint("NewApi") @SuppressLint("NewApi")
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setUpTranslucence(false, false); setStatusBarTranslucent(false);
setTitle(null); setTitle(null);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_search); setContentView(R.layout.activity_search);

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

@ -29,6 +29,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setStatusBarTranslucent(false);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_preferences); setContentView(R.layout.activity_preferences);
mToolbar = (Toolbar) findViewById(R.id.toolbar); mToolbar = (Toolbar) findViewById(R.id.toolbar);

13
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java
View file

@ -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 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (translucentStatusBarOnLollipop() || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
Util.setStatusBarTranslucent(getWindow(), statusBarTranslucent); 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 shouldColorStatusBar();
protected abstract boolean shouldColorNavBar(); protected abstract boolean shouldColorNavBar();

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
View file

@ -89,7 +89,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setUpTranslucence(false, false); setStatusBarTranslucent(false);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(getContentViewResId()); setContentView(getContentViewResId());

7
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityFragment.java
View file

@ -1,12 +1,10 @@
package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments; package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble;
import com.kabouzeid.gramophone.ui.activities.MainActivity;
import com.kabouzeid.gramophone.util.Util; import com.kabouzeid.gramophone.util.Util;
/** /**
@ -28,11 +26,6 @@ public abstract class AbsMainActivityFragment extends Fragment implements KabVie
} }
protected int getBottomPadding() { 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; return 0;
} }

32
app/src/main/java/com/kabouzeid/gramophone/util/Util.java
View file

@ -76,22 +76,22 @@ public class Util {
return result; return result;
} }
@TargetApi(19) // @TargetApi(19)
public static void setNavBarTranslucent(Window window, boolean translucent) { // public static void setNavBarTranslucent(Window window, boolean translucent) {
if (translucent) { // if (translucent) {
window.setFlags( // window.setFlags(
WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, // WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION,
WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); // WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
return; // return;
} // }
//
final WindowManager.LayoutParams attrs = window // final WindowManager.LayoutParams attrs = window
.getAttributes(); // .getAttributes();
attrs.flags &= (~WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); // attrs.flags &= (~WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
window.setAttributes(attrs); // window.setAttributes(attrs);
window.clearFlags( // window.clearFlags(
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS); // WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
} // }
@TargetApi(19) @TargetApi(19)
public static void setStatusBarTranslucent(Window window, boolean translucent) { public static void setStatusBarTranslucent(Window window, boolean translucent) {