Skip to content

Topbar #2382

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 11 commits into from
Dec 20, 2017
Merged

Topbar #2382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ad2dce8
readme
Cool04ek Dec 5, 2017
929f7d9
merge
Cool04ek Dec 19, 2017
47df89b
doc
Cool04ek Dec 20, 2017
b55c450
topbar fix
Cool04ek Dec 20, 2017
2e815f0
rm doc
Cool04ek Dec 20, 2017
dc739e5
Merge branch 'v2' into topbar
guyca Dec 20, 2017
51489d0
Merge branch 'v2' into topbar
guyca Dec 20, 2017
ac0e9df
options presenter fix
Cool04ek Dec 20, 2017
e3f3316
Merge branch 'topbar' of github.com:wix/react-native-navigation into …
Cool04ek Dec 20, 2017
e4f534a
rm userless stuff
Cool04ek Dec 20, 2017
f366990
Merge branch 'v2' into topbar
guyca Dec 20, 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
5 changes: 3 additions & 2 deletions lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.view.WindowManager;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.widget.LinearLayout;

import com.reactnativenavigation.views.TopBar;

Expand Down Expand Up @@ -118,7 +119,7 @@ public void animateShowTopBar(final TopBar topBar, final View container) {
containerHeightAnim.setDuration(DURATION_TOPBAR);
containerHeightAnim.addUpdateListener(valueAnimator -> {
int val = (Integer) valueAnimator.getAnimatedValue();
ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
layoutParams.height = val;
container.setLayoutParams(layoutParams);
});
Expand Down Expand Up @@ -164,7 +165,7 @@ public void animateHideTopBar(final TopBar topBar, final View container) {
containerHeightAnim.setDuration(DURATION_TOPBAR);
containerHeightAnim.addUpdateListener(valueAnimator -> {
int val = (Integer) valueAnimator.getAnimatedValue();
ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
layoutParams.height = val;
container.setLayoutParams(layoutParams);
});
Expand Down
12 changes: 4 additions & 8 deletions lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ public ReactView(final Context context, ReactInstanceManager reactInstanceManage
}

private void start() {
setEventListener(new ReactRootView.ReactRootViewEventListener() {

@Override
public void onAttachedToReactInstance(final ReactRootView reactRootView) {
reactRootView.setEventListener(null);
isAttachedToReactInstance = true;
}
});
setEventListener(reactRootView -> {
reactRootView.setEventListener(null);
isAttachedToReactInstance = true;
});
final Bundle opts = new Bundle();
opts.putString("containerId", containerId);
startReactApplication(reactInstanceManager, containerName, opts);
Expand Down
2 changes: 1 addition & 1 deletion .../app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected View createView() {
@Override
public void mergeNavigationOptions(NavigationOptions options) {
navigationOptions.mergeWith(options);
container.applyOptions(options);
container.applyOptions(navigationOptions);
}

NavigationOptions getNavigationOptions() {
Expand Down
4 changes: 2 additions & 2 deletions lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ContainerLayout(Context context, IReactView reactView) {
super(context);
this.topBar = new TopBar(context);
this.reactView = reactView;
optionsPresenter = new OptionsPresenter(topBar, this);
optionsPresenter = new OptionsPresenter(topBar, reactView.asView());
initViews();
}

Expand Down Expand Up @@ -61,7 +61,7 @@ public void applyOptions(NavigationOptions options) {
optionsPresenter.applyOptions(options);
}

@Override
@Override
@RestrictTo(RestrictTo.Scope.TESTS)
public TopBar getTopBar() {
return topBar;
Expand Down
2 changes: 1 addition & 1 deletion lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public TopTabsLayout(Context context, List<TopTabController> tabs) {
topBar = new TopBar(context);
this.tabs = tabs;
viewPager = new TopTabsViewPager(context, tabs);
optionsPresenter = new OptionsPresenter(topBar, this);
optionsPresenter = new OptionsPresenter(topBar, viewPager);
initViews();
}

Expand Down
2 changes: 1 addition & 1 deletion lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class TestContainerLayout extends View implements ReactContainer {
public TestContainerLayout(final Context context) {
super(context);
topBar = new TopBar(context);
optionsPresenter = new OptionsPresenter(topBar, this);
optionsPresenter = new OptionsPresenter(topBar, new View(context));
}

public TopBar getTopBar() {
Expand Down