Skip to content

Support re-enabling top bar elevation #2229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guyca merged 2 commits into from
Dec 26, 2017
Merged

Support re-enabling top bar elevation #2229

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9463756
Support re-enabling top bar elevation
Robertof Nov 27, 2017
de29c0f
Merge branch 'master' into master
guyca Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions android/app/src/main/java/com/reactnativenavigation/views/TopBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.support.v7.app.ActionBar;
import android.view.Gravity;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
import android.widget.FrameLayout;

import com.facebook.react.bridge.Callback;
Expand All @@ -36,12 +37,16 @@ public class TopBar extends AppBarLayout {
private VisibilityAnimator visibilityAnimator;
@Nullable
private Pair<String, ContentView> reactView;
private ViewOutlineProvider outlineProvider;

public TopBar(Context context) {
super(context);
setId(ViewUtils.generateViewId());
createTopBarVisibilityAnimator();
createLayout();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
outlineProvider = getOutlineProvider();
}
}

private void createTopBarVisibilityAnimator() {
Expand Down Expand Up @@ -167,19 +172,17 @@ public void setStyle(StyleParams styleParams) {
titleBar.setStyle(styleParams);
setReactView(styleParams);
setTopTabsStyle(styleParams);
if (!styleParams.topBarElevationShadowEnabled) {
disableElevationShadow();
}
setElevationEnabled(styleParams.topBarElevationShadowEnabled);
}

private void setTransparent() {
setBackgroundColor(Color.TRANSPARENT);
disableElevationShadow();
setElevationEnabled(false);
}

private void disableElevationShadow() {
private void setElevationEnabled (boolean enabled) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
setOutlineProvider(null);
setOutlineProvider(enabled ? outlineProvider : null);
}
}

Expand Down