Daniel Zlotin пре 8 година
родитељ
комит
850456601f

+ 0
- 7
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java Прегледај датотеку

@@ -6,7 +6,6 @@ import android.widget.FrameLayout;
6 6
 
7 7
 public class Navigator extends ViewController {
8 8
 	private boolean activityResumed = false;
9
-	private ViewController pendingViewControllerStart;
10 9
 
11 10
 	public Navigator(final Activity activity) {
12 11
 		super(activity);
@@ -26,8 +25,6 @@ public class Navigator extends ViewController {
26 25
 		getActivity().setContentView(viewController.getView());
27 26
 		if (activityResumed) {
28 27
 //			viewController.onStart();
29
-		} else {
30
-			pendingViewControllerStart = viewController;
31 28
 		}
32 29
 	}
33 30
 
@@ -37,10 +34,6 @@ public class Navigator extends ViewController {
37 34
 
38 35
 	public void onActivityResumed() {
39 36
 		activityResumed = true;
40
-		if (pendingViewControllerStart != null) {
41
-//			pendingViewControllerStart.onStart();
42
-			pendingViewControllerStart = null;
43
-		}
44 37
 	}
45 38
 
46 39
 	public void onActivityPaused() {

+ 10
- 1
lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java Прегледај датотеку

@@ -6,6 +6,7 @@ import com.reactnativenavigation.BaseTest;
6 6
 import com.reactnativenavigation.mocks.SimpleViewController;
7 7
 
8 8
 import org.junit.Test;
9
+import org.robolectric.Shadows;
9 10
 
10 11
 import static org.assertj.core.api.Java6Assertions.assertThat;
11 12
 import static org.mockito.Mockito.spy;
@@ -25,7 +26,7 @@ public class NavigatorTest extends BaseTest {
25 26
 
26 27
 
27 28
 	@Test
28
-	public void isActivityRusumed() throws Exception {
29
+	public void isActivityResumed() throws Exception {
29 30
 		assertThat(uut.isActivityResumed()).isFalse();
30 31
 		uut.onActivityCreated();
31 32
 		assertThat(uut.isActivityResumed()).isFalse();
@@ -34,4 +35,12 @@ public class NavigatorTest extends BaseTest {
34 35
 		uut.onActivityPaused();
35 36
 		assertThat(uut.isActivityResumed()).isFalse();
36 37
 	}
38
+
39
+	@Test
40
+	public void setsItselfAsContentView() throws Exception {
41
+		assertThat(Shadows.shadowOf(activity).getContentView()).isNull();
42
+		uut.onActivityCreated();
43
+		assertThat(Shadows.shadowOf(activity).getContentView()).isEqualTo(uut.getView());
44
+
45
+	}
37 46
 }