Skip to content

[Android] Fix crash on device rotate #97

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

Closed
FeralAI wants to merge 8 commits into from
Closed

[Android] Fix crash on device rotate #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a4cb7e8
Fix android crash on device rotate
Jun 25, 2016
e77c8e2
Fix menu icon after config change
Jun 25, 2016
d999b0b
Make back explicit arg so state can be set on config change
Jun 26, 2016
c0061d9
Make toolbar check menu icon status
Jun 30, 2016
d4d4770
Remove unneeded super calls for derived activities
Jun 30, 2016
6214a7e
Remove unneeded call to setNavUpButton (handled in updateStyles)
Jun 30, 2016
ee7e21d
Revert reference changes
Jun 30, 2016
21bda76
Merge branch 'master' of https://github.com/wix/react-native-navigati…
Jun 30, 2016
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
9 changes: 6 additions & 3 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
package="com.reactnativenavigation">

<application>
<activity android:name="com.reactnativenavigation.activities.TabActivity" />
<activity android:name="com.reactnativenavigation.activities.TabActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
<activity android:name="com.reactnativenavigation.activities.BottomTabActivity"
android:label=""/>
android:label=""
android:configChanges="keyboardHidden|orientation|screenSize"/>
<activity android:name="com.reactnativenavigation.activities.SingleScreenActivity"
android:label=""/>
android:label=""
android:configChanges="keyboardHidden|orientation|screenSize"/>
</application>

</manifest>
9 changes: 5 additions & 4 deletions android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ protected void onDestroy() {
}
}

@CallSuper
public void push(Screen screen) {
StyleHelper.updateStyles(mToolbar, screen);
if (mToolbar != null) {
Expand All @@ -235,7 +234,6 @@ public void push(Screen screen) {
}
}

@CallSuper
public Screen pop(String navigatorId) {
if (mToolbar != null &&
getCurrentNavigatorId().equals(navigatorId) &&
Expand All @@ -246,7 +244,6 @@ public Screen pop(String navigatorId) {
return null;
}

@CallSuper
public Screen popToRoot(String navigatorId) {
if (mToolbar != null) {
mToolbar.setNavUpButton();
Expand All @@ -255,7 +252,6 @@ public Screen popToRoot(String navigatorId) {
return null;
}

@CallSuper
public Screen resetTo(Screen screen) {
StyleHelper.updateStyles(mToolbar, screen);
if (mToolbar != null) {
Expand Down Expand Up @@ -287,6 +283,11 @@ public void onConfigurationChanged(Configuration newConfig) {
if (mDrawerToggle != null) {
mDrawerToggle.onConfigurationChanged(newConfig);
}

Screen currentScreen = getCurrentScreen();
if (mToolbar != null && currentScreen != null) {
mToolbar.setNavUpButton(currentScreen);
}
}

@Override
Expand Down
12 changes: 1 addition & 11 deletions android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ public boolean onCreateOptionsMenu(Menu menu) {

@Override
public void push(Screen screen) {
super.push(screen);
for (ScreenStack stack : mScreenStacks) {
if (stack.peek().navigatorId.equals(screen.navigatorId)) {
stack.push(screen);
Expand All @@ -122,7 +121,6 @@ public void push(Screen screen) {

@Override
public Screen pop(String navigatorId) {
super.pop(navigatorId);
for (ScreenStack stack : mScreenStacks) {
if (stack.peek().navigatorId.equals(navigatorId)) {
Screen popped = stack.pop();
Expand All @@ -135,7 +133,6 @@ public Screen pop(String navigatorId) {

@Override
public Screen popToRoot(String navigatorId) {
super.popToRoot(navigatorId);
for (ScreenStack stack : mScreenStacks) {
if (stack.peek().navigatorId.equals(navigatorId)) {
Screen popped = stack.popToRoot();
Expand All @@ -156,8 +153,8 @@ public Screen getCurrentScreen() {
return mScreenStacks != null ? mScreenStacks.get(mCurrentStackPosition).peek() : null;
}

@Override
public Screen resetTo(Screen screen) {
super.resetTo(screen);
StyleHelper.updateStyles(mToolbar, screen);
return mScreenStacks.get(mCurrentStackPosition).resetTo(screen);
}
Expand Down Expand Up @@ -188,13 +185,6 @@ public void onTabSelected(int position, boolean wasSelected) {

mCurrentStackPosition = position;
StyleHelper.updateStyles(mToolbar, getCurrentScreen());

// Hide or show back button if needed
if (getScreenStackSize() > 1) {
mToolbar.setNavUpButton(getCurrentScreen());
} else {
mToolbar.setNavUpButton();
}
}

public void setTabBadge(ReadableMap params) {
Expand Down
8 changes: 2 additions & 6 deletions android/app/src/main/java/com/reactnativenavigation/activities/SingleScreenActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,30 +55,26 @@ protected void setupToolbar(Screen screen) {

@Override
public void push(Screen screen) {
super.push(screen);
mScreenStack.push(screen);
StyleHelper.updateStyles(mToolbar, screen);
}

@Override
public Screen pop(String navigatorId) {
super.pop(navigatorId);
Screen popped = mScreenStack.pop();
StyleHelper.updateStyles(mToolbar, getCurrentScreen());
return popped;
}

@Override
public Screen popToRoot(String navigatorId) {
super.popToRoot(navigatorId);
Screen screen = mScreenStack.popToRoot();
Screen popped = mScreenStack.popToRoot();
StyleHelper.updateStyles(mToolbar, getCurrentScreen());
return screen;
return popped;
}

@Override
public Screen resetTo(Screen screen) {
super.resetTo(screen);
Screen popped = mScreenStack.resetTo(screen);
StyleHelper.updateStyles(mToolbar, screen);
return popped;
Expand Down
2 changes: 0 additions & 2 deletions android/app/src/main/java/com/reactnativenavigation/activities/TabActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,12 @@ public boolean onCreateOptionsMenu(Menu menu) {

@Override
public void push(Screen screen) {
super.push(screen);
StyleHelper.updateStyles(mToolbar, screen);
mAdapter.push(screen);
}

@Override
public Screen pop(String navigatorId) {
super.pop(navigatorId);
Screen popped = mAdapter.pop(navigatorId);
setNavigationStyle(getCurrentScreen());
return popped;
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/java/com/reactnativenavigation/utils/StyleHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class StyleHelper {

public static void updateStyles(RnnToolBar toolBar, Screen screen) {
try {
toolBar.setNavUpButton(screen);
toolBar.updateAndSetButtons(screen);
setWindowStyle(screen);
toolBar.setupToolbarButtonsAsync(screen);
Expand Down
3 changes: 2 additions & 1 deletion android/app/src/main/java/com/reactnativenavigation/views/RnnToolBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@ public void setNavUpButton(Screen screen) {
return;
}

boolean isBack = screen != null;
BaseReactActivity activity = (BaseReactActivity) getContext();
boolean isBack = activity.getScreenStackSize() > 1;
boolean hasDrawer = mDrawerToggle != null;

Drawable navIcon = null;
Expand Down