Skip to content

Android style fixes #83

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
Jun 24, 2016
Merged

Android style fixes #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f69d1a
Style fixes
Jun 24, 2016
a37239d
Inherit from base navigation styles so nav bar updates properly on sc…
Jun 24, 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
1 change: 1 addition & 0 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 @@ -157,6 +157,7 @@ public Screen getCurrentScreen() {

public Screen resetTo(Screen screen) {
super.resetTo(screen);
StyleHelper.updateStyles(mToolbar, screen);
return mScreenStacks.get(mCurrentStackPosition).resetTo(screen);
}

Expand Down
1 change: 1 addition & 0 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 @@ -76,6 +76,7 @@ public Screen popToRoot(String navigatorId) {
public Screen resetTo(Screen screen) {
super.resetTo(screen);
Screen popped = mScreenStack.resetTo(screen);
StyleHelper.updateStyles(mToolbar, screen);
return popped;
}

Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -7,6 +7,7 @@
import com.reactnativenavigation.adapters.ViewPagerAdapter;
import com.reactnativenavigation.core.RctManager;
import com.reactnativenavigation.core.objects.Screen;
import com.reactnativenavigation.utils.StyleHelper;
import com.reactnativenavigation.views.RnnTabLayout;
import com.reactnativenavigation.views.RnnToolBar;

Expand Down Expand Up @@ -68,7 +69,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
@Override
public void push(Screen screen) {
super.push(screen);
setNavigationStyle(screen);
StyleHelper.updateStyles(mToolbar, screen);
mAdapter.push(screen);
}

Expand Down
4 changes: 2 additions & 2 deletions src/platformSpecific.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function navigatorPop(navigator, params) {
function navigatorPopToRoot(navigator, params) {
RctActivity.navigatorPopToRoot({
navigatorID: navigator.navigatorID,
animated: !(params.animated !== false)
animated: !(params.animated === false)
Copy link
Copy Markdown
Collaborator

@guyca guyca Jun 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this conditional be changed to params.animated === true?

});
}

Expand Down Expand Up @@ -157,7 +157,7 @@ function addNavigatorButtons(screen) {

function addNavigationStyleParams(screen) {
const Screen = Navigation.getRegisteredScreen(screen.screen);
screen.navigatorStyle = Screen.navigatorStyle;
screen.navigatorStyle = Object.assign({}, screen.navigatorStyle, Screen.navigatorStyle);
}

export default {
Expand Down