소스 검색

navigator setContentView

Daniel Zlotin 7 년 전
부모
커밋
0f21db4951

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

@@ -1,6 +1,7 @@
1 1
 package com.reactnativenavigation.viewcontrollers;
2 2
 
3 3
 import android.app.Activity;
4
+import android.support.annotation.NonNull;
4 5
 import android.view.View;
5 6
 import android.widget.FrameLayout;
6 7
 
@@ -11,6 +12,7 @@ public class Navigator extends ViewController {
11 12
 		super(activity);
12 13
 	}
13 14
 
15
+	@NonNull
14 16
 	@Override
15 17
 	protected View createView() {
16 18
 		FrameLayout view = new FrameLayout(getActivity());

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

@@ -1,6 +1,7 @@
1 1
 package com.reactnativenavigation.viewcontrollers;
2 2
 
3 3
 import android.app.Activity;
4
+import android.support.annotation.NonNull;
4 5
 import android.support.annotation.Nullable;
5 6
 import android.view.View;
6 7
 
@@ -13,6 +14,7 @@ public abstract class ViewController {
13 14
 		this.activity = activity;
14 15
 	}
15 16
 
17
+	@NonNull
16 18
 	protected abstract View createView();
17 19
 
18 20
 	public boolean handleBack() {
@@ -32,6 +34,7 @@ public abstract class ViewController {
32 34
 		this.stackController = stackController;
33 35
 	}
34 36
 
37
+	@NonNull
35 38
 	public View getView() {
36 39
 		if (view == null) {
37 40
 			view = createView();

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

@@ -40,7 +40,6 @@ public class NavigatorTest extends BaseTest {
40 40
 	public void setsItselfAsContentView() throws Exception {
41 41
 		assertThat(Shadows.shadowOf(activity).getContentView()).isNull();
42 42
 		uut.onActivityCreated();
43
-		assertThat(Shadows.shadowOf(activity).getContentView()).isEqualTo(uut.getView());
44
-
43
+		assertThat(Shadows.shadowOf(activity).getContentView()).isNotNull().isEqualTo(uut.getView());
45 44
 	}
46 45
 }