Daniel Zlotin 7 vuotta sitten
vanhempi
commit
7da6722e98

+ 0
- 6
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/BottomTabsController.java Näytä tiedosto

@@ -43,12 +43,6 @@ public class BottomTabsController extends ParentController implements BottomNavi
43 43
 		return root;
44 44
 	}
45 45
 
46
-	@NonNull
47
-	@Override
48
-	public RelativeLayout getView() {
49
-		return (RelativeLayout) super.getView();
50
-	}
51
-
52 46
 	@Override
53 47
 	public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
54 48
 		selectTabAtIndex(item.getItemId());

+ 13
- 0
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java Näytä tiedosto

@@ -1,6 +1,9 @@
1 1
 package com.reactnativenavigation.viewcontrollers;
2 2
 
3 3
 import android.app.Activity;
4
+import android.support.annotation.NonNull;
5
+import android.view.View;
6
+import android.view.ViewGroup;
4 7
 
5 8
 import java.util.Collection;
6 9
 
@@ -9,6 +12,16 @@ public abstract class ParentController extends ViewController {
9 12
 		super(activity, id);
10 13
 	}
11 14
 
15
+	@NonNull
16
+	@Override
17
+	public ViewGroup getView() {
18
+		return (ViewGroup) super.getView();
19
+	}
20
+
21
+	@NonNull
22
+	@Override
23
+	protected abstract View createView();
24
+
12 25
 	public abstract Collection<ViewController> getChildControllers();
13 26
 
14 27
 	public ViewController findControllerById(final String id) {

+ 0
- 6
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java Näytä tiedosto

@@ -72,12 +72,6 @@ public class StackController extends ParentController {
72 72
 		}
73 73
 	}
74 74
 
75
-	@NonNull
76
-	@Override
77
-	public ViewGroup getView() {
78
-		return (ViewGroup) super.getView();
79
-	}
80
-
81 75
 	@NonNull
82 76
 	@Override
83 77
 	protected ViewGroup createView() {

+ 18
- 0
lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ParentControllerTest.java Näytä tiedosto

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers;
3 3
 import android.app.Activity;
4 4
 import android.support.annotation.NonNull;
5 5
 import android.view.View;
6
+import android.view.ViewGroup;
6 7
 import android.widget.FrameLayout;
7 8
 
8 9
 import com.reactnativenavigation.BaseTest;
@@ -26,6 +27,23 @@ public class ParentControllerTest extends BaseTest {
26 27
 		activity = newActivity();
27 28
 	}
28 29
 
30
+	@Test
31
+	public void holdsViewGroup() throws Exception {
32
+		ParentController uut = new ParentController(activity, "uut") {
33
+			@Override
34
+			public Collection<ViewController> getChildControllers() {
35
+				return Collections.emptyList();
36
+			}
37
+
38
+			@NonNull
39
+			@Override
40
+			protected View createView() {
41
+				return new FrameLayout(activity);
42
+			}
43
+		};
44
+
45
+		assertThat(uut.getView()).isInstanceOf(ViewGroup.class);
46
+	}
29 47
 
30 48
 	@Test
31 49
 	public void findControllerById_ReturnsSelfIfSameId() throws Exception {