Daniel Zlotin vor 8 Jahren
Ursprung
Commit
4917d990ed

+ 1
- 1
lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java Datei anzeigen

59
 		handle(new Runnable() {
59
 		handle(new Runnable() {
60
 			@Override
60
 			@Override
61
 			public void run() {
61
 			public void run() {
62
-//				store.getViewController(onContainerId).getStackController().pop(store.getViewController(onContainerId));
62
+				navigator().pop(onContainerId);
63
 			}
63
 			}
64
 		});
64
 		});
65
 	}
65
 	}

+ 2
- 1
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/BottomTabsController.java Datei anzeigen

7
 import android.view.Menu;
7
 import android.view.Menu;
8
 import android.view.MenuItem;
8
 import android.view.MenuItem;
9
 import android.view.View;
9
 import android.view.View;
10
+import android.view.ViewGroup;
10
 import android.widget.RelativeLayout;
11
 import android.widget.RelativeLayout;
11
 
12
 
12
 import com.reactnativenavigation.utils.CompatUtils;
13
 import com.reactnativenavigation.utils.CompatUtils;
31
 
32
 
32
 	@NonNull
33
 	@NonNull
33
 	@Override
34
 	@Override
34
-	protected RelativeLayout createView() {
35
+	protected ViewGroup createView() {
35
 		RelativeLayout root = new RelativeLayout(getActivity());
36
 		RelativeLayout root = new RelativeLayout(getActivity());
36
 		bottomNavigationView = new BottomNavigationView(getActivity());
37
 		bottomNavigationView = new BottomNavigationView(getActivity());
37
 		bottomNavigationView.setId(CompatUtils.generateViewId());
38
 		bottomNavigationView.setId(CompatUtils.generateViewId());

+ 2
- 2
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java Datei anzeigen

2
 
2
 
3
 import android.app.Activity;
3
 import android.app.Activity;
4
 import android.support.annotation.NonNull;
4
 import android.support.annotation.NonNull;
5
-import android.view.View;
5
+import android.view.ViewGroup;
6
 import android.widget.FrameLayout;
6
 import android.widget.FrameLayout;
7
 
7
 
8
 import com.reactnativenavigation.utils.CompatUtils;
8
 import com.reactnativenavigation.utils.CompatUtils;
21
 
21
 
22
 	@NonNull
22
 	@NonNull
23
 	@Override
23
 	@Override
24
-	protected View createView() {
24
+	protected ViewGroup createView() {
25
 		return new FrameLayout(getActivity());
25
 		return new FrameLayout(getActivity());
26
 	}
26
 	}
27
 
27
 

+ 1
- 2
lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java Datei anzeigen

3
 import android.app.Activity;
3
 import android.app.Activity;
4
 import android.support.annotation.NonNull;
4
 import android.support.annotation.NonNull;
5
 import android.support.annotation.Nullable;
5
 import android.support.annotation.Nullable;
6
-import android.view.View;
7
 import android.view.ViewGroup;
6
 import android.view.ViewGroup;
8
 
7
 
9
 import java.util.Collection;
8
 import java.util.Collection;
21
 
20
 
22
 	@NonNull
21
 	@NonNull
23
 	@Override
22
 	@Override
24
-	protected abstract View createView();
23
+	protected abstract ViewGroup createView();
25
 
24
 
26
 	public abstract Collection<ViewController> getChildControllers();
25
 	public abstract Collection<ViewController> getChildControllers();
27
 
26
 

+ 4
- 5
lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ParentControllerTest.java Datei anzeigen

2
 
2
 
3
 import android.app.Activity;
3
 import android.app.Activity;
4
 import android.support.annotation.NonNull;
4
 import android.support.annotation.NonNull;
5
-import android.view.View;
6
 import android.view.ViewGroup;
5
 import android.view.ViewGroup;
7
 import android.widget.FrameLayout;
6
 import android.widget.FrameLayout;
8
 
7
 
37
 
36
 
38
 			@NonNull
37
 			@NonNull
39
 			@Override
38
 			@Override
40
-			protected View createView() {
39
+			protected ViewGroup createView() {
41
 				return new FrameLayout(activity);
40
 				return new FrameLayout(activity);
42
 			}
41
 			}
43
 		};
42
 		};
55
 
54
 
56
 			@NonNull
55
 			@NonNull
57
 			@Override
56
 			@Override
58
-			protected View createView() {
57
+			protected ViewGroup createView() {
59
 				return new FrameLayout(activity);
58
 				return new FrameLayout(activity);
60
 			}
59
 			}
61
 		};
60
 		};
81
 
80
 
82
 			@NonNull
81
 			@NonNull
83
 			@Override
82
 			@Override
84
-			protected View createView() {
83
+			protected ViewGroup createView() {
85
 				return new FrameLayout(activity);
84
 				return new FrameLayout(activity);
86
 			}
85
 			}
87
 		};
86
 		};
108
 
107
 
109
 			@NonNull
108
 			@NonNull
110
 			@Override
109
 			@Override
111
-			protected View createView() {
110
+			protected ViewGroup createView() {
112
 				return new FrameLayout(activity);
111
 				return new FrameLayout(activity);
113
 			}
112
 			}
114
 		};
113
 		};