소스 검색

navigator setContentView

Daniel Zlotin 8 년 전
부모
커밋
850456601f

+ 0
- 7
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java 파일 보기

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

+ 10
- 1
lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java 파일 보기

6
 import com.reactnativenavigation.mocks.SimpleViewController;
6
 import com.reactnativenavigation.mocks.SimpleViewController;
7
 
7
 
8
 import org.junit.Test;
8
 import org.junit.Test;
9
+import org.robolectric.Shadows;
9
 
10
 
10
 import static org.assertj.core.api.Java6Assertions.assertThat;
11
 import static org.assertj.core.api.Java6Assertions.assertThat;
11
 import static org.mockito.Mockito.spy;
12
 import static org.mockito.Mockito.spy;
25
 
26
 
26
 
27
 
27
 	@Test
28
 	@Test
28
-	public void isActivityRusumed() throws Exception {
29
+	public void isActivityResumed() throws Exception {
29
 		assertThat(uut.isActivityResumed()).isFalse();
30
 		assertThat(uut.isActivityResumed()).isFalse();
30
 		uut.onActivityCreated();
31
 		uut.onActivityCreated();
31
 		assertThat(uut.isActivityResumed()).isFalse();
32
 		assertThat(uut.isActivityResumed()).isFalse();
34
 		uut.onActivityPaused();
35
 		uut.onActivityPaused();
35
 		assertThat(uut.isActivityResumed()).isFalse();
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
 }