From ad2dce8707f4df49ca9d226c8160259e2e4ee7d5 Mon Sep 17 00:00:00 2001 From: Roman Kozlov Date: Tue, 5 Dec 2017 11:52:44 +0200 Subject: [PATCH 1/6] readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a7e83871a10..89d1287acfb 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ v2 is written in Test Driven Development. We have a test for every feature inclu | dismissOverlay | [Contribute](/docs/docs/CONTRIBUTING.md) | [Contribute](/docs/docs/CONTRIBUTING.md) | | customTransition | ✅ | [Contribute](/docs/docs/CONTRIBUTING.md) | | Screen Visibility | ✅ |✅| -| async commands (await push) | [Contribute](/docs/docs/CONTRIBUTING.md) |[Contribute](/docs/docs/CONTRIBUTING.md) | +| async commands (await push) | [Contribute](/docs/docs/CONTRIBUTING.md) |✅ | ### Navigation Options @@ -96,10 +96,10 @@ v2 is written in Test Driven Development. We have a test for every feature inclu | tabBar | iOS | Android | contributors| |--------------------|-----|----|-----| | drawUnder | WIP @gran33 | [Contribute](/docs/docs/CONTRIBUTING.md) | | -| hidden | ✅ | [Contribute](/docs/docs/CONTRIBUTING.md) | @gtchance| +| hidden | ✅ | ✅ | @gtchance | | tabBadge | ✅ | [Contribute](/docs/docs/CONTRIBUTING.md)| Wix| -| currentTab by Index | [Contribute](/docs/docs/CONTRIBUTING.md) | [Contribute](/docs/docs/CONTRIBUTING.md)| | -| currentTab by cointainerId | [Contribute](/docs/docs/CONTRIBUTING.md) | [Contribute](/docs/docs/CONTRIBUTING.md)| | +| currentTab by Index | [Contribute](/docs/docs/CONTRIBUTING.md) | ✅|Wix | +| currentTab by cointainerId | [Contribute](/docs/docs/CONTRIBUTING.md) | ✅|Wix | | buttons | iOS | Android | contributors| |--------------------|-----|----|-----| From 47df89b7fc42e3ce0ee9ca53b380bf9fb4be2841 Mon Sep 17 00:00:00 2001 From: Roman Kozlov Date: Wed, 20 Dec 2017 13:11:18 +0200 Subject: [PATCH 2/6] doc --- docs/docs/Roadmap.md | 17 +++++++++++++++++ .../reactnativenavigation/react/ReactView.java | 12 ++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 docs/docs/Roadmap.md diff --git a/docs/docs/Roadmap.md b/docs/docs/Roadmap.md new file mode 100644 index 00000000000..7546a54ddb6 --- /dev/null +++ b/docs/docs/Roadmap.md @@ -0,0 +1,17 @@ +# Roadmap + +## TopBar (AppBar) + +1) `{topBar: {collapsing: true}}` Hides while scrolling. Content should be drawn under TopBAr for smooth experience +2) `{topBar: {hidden: true, animateHide: true/false}}` Hides, when options are set. Currently container is animated during hide. + +## TitleBar (Toolbar) + +1) `{titleBar: {collapsing: true}}` Collapses while scrolling. SHould be responsive to dragging Content should be drawn under TitleBar for smooth experience +2) `{itleBar: {hidden: true, animateHide: true/false}}` Hides, when options are set. Currently container is animated during hide. + +## FAB + +1) `{fab: {collapsing: true}}` Collapses while scrolling. +2) `{fab: {hidden: true, animateHide: true/false}}` Hides, when options are set. +THis action do not affect other content diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java b/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java index 317b4ce3ab1..632adfa4dbf 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java @@ -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); From b55c450c7c6302e970ddaa3c96c3d17b14d8c17f Mon Sep 17 00:00:00 2001 From: Roman Kozlov Date: Wed, 20 Dec 2017 14:31:39 +0200 Subject: [PATCH 3/6] topbar fix --- .../viewcontrollers/ContainerViewController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java index 3c78e44d342..481bbf65a29 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java @@ -89,7 +89,7 @@ protected View createView() { @Override public void mergeNavigationOptions(NavigationOptions options) { navigationOptions.mergeWith(options); - container.applyOptions(options); + container.applyOptions(navigationOptions); } NavigationOptions getNavigationOptions() { From 2e815f0b456814d03a43bee14a67a54f7831401c Mon Sep 17 00:00:00 2001 From: Roman Kozlov Date: Wed, 20 Dec 2017 14:38:19 +0200 Subject: [PATCH 4/6] rm doc --- docs/docs/Roadmap.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 docs/docs/Roadmap.md diff --git a/docs/docs/Roadmap.md b/docs/docs/Roadmap.md deleted file mode 100644 index 7546a54ddb6..00000000000 --- a/docs/docs/Roadmap.md +++ /dev/null @@ -1,17 +0,0 @@ -# Roadmap - -## TopBar (AppBar) - -1) `{topBar: {collapsing: true}}` Hides while scrolling. Content should be drawn under TopBAr for smooth experience -2) `{topBar: {hidden: true, animateHide: true/false}}` Hides, when options are set. Currently container is animated during hide. - -## TitleBar (Toolbar) - -1) `{titleBar: {collapsing: true}}` Collapses while scrolling. SHould be responsive to dragging Content should be drawn under TitleBar for smooth experience -2) `{itleBar: {hidden: true, animateHide: true/false}}` Hides, when options are set. Currently container is animated during hide. - -## FAB - -1) `{fab: {collapsing: true}}` Collapses while scrolling. -2) `{fab: {hidden: true, animateHide: true/false}}` Hides, when options are set. -THis action do not affect other content From ac0e9df8fa12e21deeb01826625c017d7cc07922 Mon Sep 17 00:00:00 2001 From: Roman Kozlov Date: Wed, 20 Dec 2017 15:55:07 +0200 Subject: [PATCH 5/6] options presenter fix --- .../java/com/reactnativenavigation/anim/StackAnimator.java | 5 +++-- .../com/reactnativenavigation/views/ContainerLayout.java | 4 ++-- .../java/com/reactnativenavigation/views/TopTabsLayout.java | 2 +- .../com/reactnativenavigation/mocks/TestContainerLayout.java | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java b/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java index 2b13b11eecf..f80013d8291 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java @@ -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; @@ -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(); + LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) container.getLayoutParams(); layoutParams.height = val; container.setLayoutParams(layoutParams); }); @@ -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(); + LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) container.getLayoutParams(); layoutParams.height = val; container.setLayoutParams(layoutParams); }); diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java b/lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java index 9111859db7a..bdef47524f2 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java @@ -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(); } @@ -61,7 +61,7 @@ public void applyOptions(NavigationOptions options) { optionsPresenter.applyOptions(options); } - @Override + @Override @RestrictTo(RestrictTo.Scope.TESTS) public TopBar getTopBar() { return topBar; diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java b/lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java index 55ee7d60c4c..9de4547ca82 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java @@ -27,7 +27,7 @@ public TopTabsLayout(Context context, List tabs) { topBar = new TopBar(context); this.tabs = tabs; viewPager = new TopTabsViewPager(context, tabs); - optionsPresenter = new OptionsPresenter(topBar, this); + optionsPresenter = new OptionsPresenter(topBar, viewPager); initViews(); } diff --git a/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java b/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java index 4d78a037c86..c37669e0fb3 100644 --- a/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java +++ b/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java @@ -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() { From e4f534a4cf7ab1024b00bc40d1f2aa04a874d662 Mon Sep 17 00:00:00 2001 From: Roman Kozlov Date: Wed, 20 Dec 2017 16:03:09 +0200 Subject: [PATCH 6/6] rm userless stuff --- .../java/com/reactnativenavigation/anim/StackAnimator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java b/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java index f80013d8291..6083fb12d3b 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java @@ -119,7 +119,7 @@ public void animateShowTopBar(final TopBar topBar, final View container) { containerHeightAnim.setDuration(DURATION_TOPBAR); containerHeightAnim.addUpdateListener(valueAnimator -> { int val = (Integer) valueAnimator.getAnimatedValue(); - LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) container.getLayoutParams(); + ViewGroup.LayoutParams layoutParams = container.getLayoutParams(); layoutParams.height = val; container.setLayoutParams(layoutParams); }); @@ -165,7 +165,7 @@ public void animateHideTopBar(final TopBar topBar, final View container) { containerHeightAnim.setDuration(DURATION_TOPBAR); containerHeightAnim.addUpdateListener(valueAnimator -> { int val = (Integer) valueAnimator.getAnimatedValue(); - LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) container.getLayoutParams(); + ViewGroup.LayoutParams layoutParams = container.getLayoutParams(); layoutParams.height = val; container.setLayoutParams(layoutParams); });