Browse Source

fix stack

Daniel Zlotin 8 years ago
parent
commit
3d0a7c386c

+ 0
- 2
android/app/src/main/java/com/reactnativenavigation/layouts/ScreenImpl.java View File

5
 import android.content.Context;
5
 import android.content.Context;
6
 import android.graphics.Color;
6
 import android.graphics.Color;
7
 import android.os.Build;
7
 import android.os.Build;
8
-import android.util.Log;
9
 import android.view.View;
8
 import android.view.View;
10
 import android.view.Window;
9
 import android.view.Window;
11
 import android.widget.RelativeLayout;
10
 import android.widget.RelativeLayout;
108
 
107
 
109
     @Override
108
     @Override
110
     public void onScrollChanged(ScrollDirectionListener.Direction direction) {
109
     public void onScrollChanged(ScrollDirectionListener.Direction direction) {
111
-        Log.d("TAG", "onScrollChanged: ");
112
         if (scrollAnimator == null) {
110
         if (scrollAnimator == null) {
113
             scrollAnimator = new OnScrollAnimator(topBar, OnScrollAnimator.HideDirection.Up, topBar.getHeight());
111
             scrollAnimator = new OnScrollAnimator(topBar, OnScrollAnimator.HideDirection.Up, topBar.getHeight());
114
         }
112
         }

+ 7
- 3
android/app/src/main/java/com/reactnativenavigation/layouts/ScreenStack.java View File

21
     }
21
     }
22
 
22
 
23
     public void push(ScreenParams screenParams) {
23
     public void push(ScreenParams screenParams) {
24
-        Screen previous = stack.peek();
25
-        addScreen(screenParams);
26
-        removePreviousWithoutUnmount(previous);
24
+        if (isEmpty()) {
25
+            addScreen(screenParams);
26
+        } else {
27
+            Screen previous = stack.peek();
28
+            addScreen(screenParams);
29
+            removePreviousWithoutUnmount(previous);
30
+        }
27
     }
31
     }
28
 
32
 
29
     private void addScreen(ScreenParams screenParams) {
33
     private void addScreen(ScreenParams screenParams) {