Daniel Zlotin 8 лет назад
Родитель
Сommit
0f21db4951

+ 2
- 0
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java Просмотреть файл

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

+ 3
- 0
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java Просмотреть файл

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

+ 1
- 2
lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java Просмотреть файл

40
 	public void setsItselfAsContentView() throws Exception {
40
 	public void setsItselfAsContentView() throws Exception {
41
 		assertThat(Shadows.shadowOf(activity).getContentView()).isNull();
41
 		assertThat(Shadows.shadowOf(activity).getContentView()).isNull();
42
 		uut.onActivityCreated();
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
 }