kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-13 22:30:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Render Android back button for root screens of nested stack navi… (#306)

Browse Source 
This change allows for root screens of nested stack navigators on Android to display back button in the navigation bar. Navigating back is still possible using hw back because of the way hw back is handled by nested fragment containers. However, despite hw back functioning properly, before this change we would not allow for the soft back button to be rendered in the header. This change adds this possibility to keep software back consistent with the hw back button functionality. This behavior can still be disabled/adjusted using hideBackButton property of the header config component.
This commit is contained in:
Krzysztof Magiera
2020-02-04 22:20:41 +01:00
committed by GitHub
parent f78c264419
commit 22d4400b93
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.java
View File

@@ -41,7 +41,16 @@ public class ScreenStackHeaderConfig extends ViewGroup {
private OnClickListener mBackClickListener = new OnClickListener() {
@Override
public void onClick(View view) {
getScreenStack().dismiss(getScreenFragment());
ScreenStack stack = getScreenStack();
ScreenStackFragment fragment = getScreenFragment();
if (stack.getRootScreen() == fragment.getScreen()) {
Fragment parentFragment = fragment.getParentFragment();
if (parentFragment instanceof ScreenStackFragment) {
((ScreenStackFragment) parentFragment).dismiss();
}
} else {
fragment.dismiss();
}
}
};
@@ -117,7 +126,6 @@ public class ScreenStackHeaderConfig extends ViewGroup {
public void onUpdate() {
Screen parent = (Screen) getParent();
final ScreenStack stack = getScreenStack();
boolean isRoot = stack == null ? true : stack.getRootScreen() == parent;
boolean isTop = stack == null ? true : stack.getTopScreen() == parent;
if (!mIsAttachedToWindow || !isTop || mDestroyed) {
@@ -131,6 +139,9 @@ public class ScreenStackHeaderConfig extends ViewGroup {
return;
}
boolean isRoot = stack == null ? true : stack.getRootScreen() == parent;
boolean isNested = (parent.getFragment().getParentFragment() instanceof ScreenStackFragment);
if (mToolbar.getParent() == null) {
getScreenFragment().setToolbar(mToolbar);
}
@@ -140,7 +151,7 @@ public class ScreenStackHeaderConfig extends ViewGroup {
ActionBar actionBar = activity.getSupportActionBar();
// hide back button
actionBar.setDisplayHomeAsUpEnabled(isRoot ? false : !mIsBackButtonHidden);
actionBar.setDisplayHomeAsUpEnabled((isRoot && !isNested) ? false : !mIsBackButtonHidden);
// when setSupportActionBar is called a toolbar wrapper gets initialized that overwrites
// navigation click listener. The default behavior set in the wrapper is to call into