Stack id (#2917)

* WIP

* Apply default options when screen options are null

* modal animations

* fix tests

* refactor

* refactor

* refactor

* refactor

* test fix

* topBar anim

* child disappear bug

* Update app.js

* Update WelcomeScreen.js

* fix tests

* bottom tabs

* stack id

* fix test

* refactoring

* merge fix

* Update app.js

* merge

* comment to fix test

lib/android/app/src/main/java/com/reactnativenavigation/anim/TopBarAnimator.java

@@ -13,6 +13,8 @@ import android.view.animation.DecelerateInterpolator;
 import com.reactnativenavigation.parse.AnimationOptions;
 import com.reactnativenavigation.views.topbar.TopBar;
 
+import javax.annotation.Nullable;
+
 public class TopBarAnimator {
 
     private static final int DEFAULT_COLLAPSE_DURATION = 100;
@@ -21,6 +23,7 @@ public class TopBarAnimator {
     private final AccelerateInterpolator accelerateInterpolator = new AccelerateInterpolator();
 
     private TopBar topBar;
+    private String stackId;
     private AnimatorSet hideAnimator;
     private AnimatorSet showAnimator;
 
@@ -28,8 +31,13 @@ public class TopBarAnimator {
         this.topBar = topBar;
     }
 
+    public TopBarAnimator(TopBar topBar, @Nullable String stackId) {
+        this.topBar = topBar;
+        this.stackId = stackId;
+    }
+
     public void show(AnimationOptions options) {
-        if (options.hasValue()) {
+        if (options.hasValue() && (!options.id.hasValue() || options.id.get().equals(stackId))) {
             showAnimator = options.getAnimation(topBar);
         } else {
             showAnimator = getDefaultShowAnimator(-1 * topBar.getMeasuredHeight(), decelerateInterpolator, DURATION_TOPBAR);
@@ -62,7 +70,7 @@ public class TopBarAnimator {
     }
 
     public void hide(AnimationOptions options, AnimationListener listener) {
-        if (options.hasValue()) {
+        if (options.hasValue() && (!options.id.hasValue() || options.id.get().equals(stackId))) {
             hideAnimator = options.getAnimation(topBar);
         } else {
             hideAnimator = getDefaultHideAnimator(0, accelerateInterpolator, DURATION_TOPBAR);

lib/android/app/src/main/java/com/reactnativenavigation/anim/TopBarCollapseBehavior.java

@@ -22,9 +22,11 @@ public class TopBarCollapseBehavior implements ScrollEventListener.OnScrollListe
     }
 
     public void disableCollapse() {
-        scrollEventListener.unregister();
-        topBar.setVisibility(View.VISIBLE);
-        topBar.setTranslationY(0);
+        if (scrollEventListener != null) {
+            scrollEventListener.unregister();
+            topBar.setVisibility(View.VISIBLE);
+            topBar.setTranslationY(0);
+        }
     }
 
     @Override

lib/android/app/src/main/java/com/reactnativenavigation/parse/AnimationOptions.java

@@ -7,6 +7,10 @@ import android.util.Log;
 import android.util.Property;
 import android.view.View;
 
+import com.reactnativenavigation.parse.params.NullText;
+import com.reactnativenavigation.parse.params.Text;
+import com.reactnativenavigation.parse.parsers.TextParser;
+
 import org.json.JSONObject;
 
 import java.util.ArrayList;
@@ -23,7 +27,11 @@ public class AnimationOptions {
         options.hasValue = true;
         for (Iterator<String> it = json.keys(); it.hasNext(); ) {
             String key = it.next();
-            options.valueOptions.add(ValueAnimationOptions.parse(json.optJSONObject(key), getAnimProp(key)));
+            if ("id".equals(key)) {
+                options.id = TextParser.parse(json, key);
+            } else {
+                options.valueOptions.add(ValueAnimationOptions.parse(json.optJSONObject(key), getAnimProp(key)));
+            }
         }
 
         return options;
@@ -31,11 +39,13 @@ public class AnimationOptions {
 
     private boolean hasValue = false;
 
+    public Text id = new NullText();
     private HashSet<ValueAnimationOptions> valueOptions = new HashSet<>();
 
     void mergeWith(AnimationOptions other) {
         if (other.hasValue()) {
             hasValue = true;
+            id = other.id;
             valueOptions = other.valueOptions;
         }
     }
@@ -43,6 +53,7 @@ public class AnimationOptions {
     void mergeWithDefault(AnimationOptions defaultOptions) {
         if (defaultOptions.hasValue()) {
             hasValue = true;
+            id = defaultOptions.id;
             valueOptions = defaultOptions.valueOptions;
         }
     }
@@ -54,7 +65,7 @@ public class AnimationOptions {
     public AnimatorSet getAnimation(View view) {
         AnimatorSet animationSet = new AnimatorSet();
         List<Animator> animators = new ArrayList<>();
-        for (ValueAnimationOptions options: valueOptions) {
+        for (ValueAnimationOptions options : valueOptions) {
             animators.add(options.getAnimation(view));
         }
         animationSet.playTogether(animators);

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java

@@ -69,7 +69,7 @@ public class OptionsPresenter {
             if (component instanceof IReactView) {
                 topBar.enableCollapse(((IReactView) component).getScrollEventListener());
             }
-        } else if (options.hideOnScroll.isTrue()) {
+        } else if (options.hideOnScroll.isFalseOrUndefined()) {
             topBar.disableCollapse();
         }
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java

@@ -229,7 +229,7 @@ public class StackController extends ParentController<StackLayout> {
     @NonNull
     @Override
     protected StackLayout createView() {
-        return new StackLayout(getActivity(), topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewCreator, this::sendOnNavigationButtonPressed);
+        return new StackLayout(getActivity(), topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewCreator, this::sendOnNavigationButtonPressed, getId());
     }
 
     @NonNull

lib/android/app/src/main/java/com/reactnativenavigation/views/StackLayout.java

@@ -22,10 +22,12 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 @SuppressLint("ViewConstructor")
 public class StackLayout extends RelativeLayout {
     private TopBar topBar;
+    private String stackId;
     private final OptionsPresenter optionsPresenter;
 
-    public StackLayout(Context context, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewCreator topBarBackgroundViewCreator, TopBarButtonController.OnClickListener topBarButtonClickListener) {
+    public StackLayout(Context context, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewCreator topBarBackgroundViewCreator, TopBarButtonController.OnClickListener topBarButtonClickListener, String stackId) {
         super(context);
+        this.stackId = stackId;
         createLayout(topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewCreator, topBarButtonClickListener);
         optionsPresenter = new OptionsPresenter(topBar);
         setContentDescription("StackLayout");
@@ -46,7 +48,7 @@ public class StackLayout extends RelativeLayout {
     }
 
     public void onChildWillDisappear(Options disappearing, Options appearing, ChildDisappearListener childDisappearListener) {
-        new OptionsPresenter(topBar).onChildWillDisappear(disappearing, appearing, childDisappearListener);
+        optionsPresenter.onChildWillDisappear(disappearing, appearing, childDisappearListener);
     }
 
     public void clearOptions() {
@@ -69,4 +71,8 @@ public class StackLayout extends RelativeLayout {
     public void mergeChildOptions(Options options, Component child) {
         optionsPresenter.mergeChildOptions(options, child);
     }
+
+    public String getStackId() {
+        return stackId;
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/views/topbar/TopBar.java

@@ -53,7 +53,8 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         collapsingBehavior = new TopBarCollapseBehavior(this);
         this.topBarBackgroundViewCreator = topBarBackgroundViewCreator;
         this.parentView = parentView;
-        animator = new TopBarAnimator(this);
+        topTabs = new TopTabs(getContext());
+        animator = new TopBarAnimator(this, parentView.getStackId());
         createLayout(buttonCreator, titleBarReactViewCreator, onClickListener);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarBackgroundComponentTest.java

@@ -42,7 +42,7 @@ public class TopBarBackgroundComponentTest extends BaseTest {
                 return backgroundView;
             }
         };
-        StackLayout parent = new StackLayout(newActivity(), new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), backgroundViewCreator, onClickListener);
+        StackLayout parent = new StackLayout(newActivity(), new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), backgroundViewCreator, onClickListener, null);
         uut = new TopBar(newActivity(), new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), backgroundViewCreator, onClickListener, parent);
         parent.addView(uut);
     }

lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarTest.java

@@ -41,7 +41,7 @@ public class TopBarTest extends BaseTest {
                 Log.i("TopBarTest", "onPress: " + buttonId);
             }
         });
-        StackLayout parent = new StackLayout(newActivity(), new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), this.onClickListener);
+        StackLayout parent = new StackLayout(newActivity(), new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), this.onClickListener, null);
         uut = new TopBar(newActivity(), new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), this.onClickListener, parent);
         animator = spy(new TopBarAnimator(uut));
         uut.setAnimator(animator);

playground/src/app.js

@@ -27,17 +27,26 @@ function start() {
       _animations: {
         push: {
           topBar: {
+            id: 'TEST',
+            alpha: {
+              from: 0,
+              to: 1,
+              duration: 500,
+              interpolation: 'accelerate'
+            }
+          },
+          bottomTabs: {
             y: {
               from: 1000,
               to: 0,
               duration: 500,
-              interpolation: 'accelerate',
+              interpolation: 'decelerate',
             },
             alpha: {
               from: 0,
               to: 1,
               duration: 500,
-              interpolation: 'accelerate'
+              interpolation: 'decelerate'
             }
           },
           bottomTabs: {
@@ -71,6 +80,15 @@ function start() {
         },
         pop: {
           topBar: {
+            id: 'TEST',
+            alpha: {
+              from: 1,
+              to: 0,
+              duration: 500,
+              interpolation: 'accelerate'
+            }
+          },
+          bottomTabs: {
             y: {
               from: 0,
               to: 100,
@@ -118,6 +136,7 @@ function start() {
 
     Navigation.setRoot({
       stack: {
+        id: 'TEST',
         children: [
           {
             component: {

playground/src/screens/CustomTopBar.js

@@ -17,19 +17,19 @@ class CustomTopBar extends Component {
   }
 
   componentDidAppear() {
-    console.log('guyca', 'componentDidAppear');
+    // console.log('guyca', 'componentDidAppear');
   }
 
   componentDidDisappear() {
-    console.log('guyca', `componentDidDisappear`);
+    // console.log('guyca', `componentDidDisappear`);
   }
 
   componentDidMount() {
-    console.log('guyca', `componentDidMount`);
+    // console.log('guyca', `componentDidMount`);
   }
 
   componentWillUnmount() {
-    console.log('guyca', `componentWillUnmount`);
+    // console.log('guyca', `componentWillUnmount`);
   }
 
   render() {