Daniel Zlotin преди 8 години
родител
ревизия
3d0a7c386c

+ 0
- 2
android/app/src/main/java/com/reactnativenavigation/layouts/ScreenImpl.java Целия файл

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

+ 7
- 3
android/app/src/main/java/com/reactnativenavigation/layouts/ScreenStack.java Целия файл

@@ -21,9 +21,13 @@ public class ScreenStack extends FrameLayout {
21 21
     }
22 22
 
23 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 33
     private void addScreen(ScreenParams screenParams) {