|
|
@@ -1,7 +1,6 @@
|
|
1
|
1
|
package com.reactnativenavigation.viewcontrollers;
|
|
2
|
2
|
|
|
3
|
3
|
import android.app.Activity;
|
|
4
|
|
-import android.content.Context;
|
|
5
|
4
|
import android.graphics.Color;
|
|
6
|
5
|
import android.graphics.drawable.ColorDrawable;
|
|
7
|
6
|
import android.view.View;
|
|
|
@@ -24,9 +23,6 @@ import com.reactnativenavigation.utils.CommandListenerAdapter;
|
|
24
|
23
|
import com.reactnativenavigation.utils.ViewUtils;
|
|
25
|
24
|
import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
|
|
26
|
25
|
import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
|
|
27
|
|
-import com.reactnativenavigation.views.StackLayout;
|
|
28
|
|
-import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
|
|
29
|
|
-import com.reactnativenavigation.views.topbar.TopBar;
|
|
30
|
26
|
import com.reactnativenavigation.views.topbar.TopBarBackgroundView;
|
|
31
|
27
|
|
|
32
|
28
|
import org.json.JSONObject;
|
|
|
@@ -57,14 +53,7 @@ public class OptionsApplyingTest extends BaseTest {
|
|
57
|
53
|
(activity1, componentId, componentName) -> view,
|
|
58
|
54
|
initialNavigationOptions
|
|
59
|
55
|
);
|
|
60
|
|
- TopBarController topBarController = new TopBarController() {
|
|
61
|
|
- @Override
|
|
62
|
|
- protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout) {
|
|
63
|
|
- TopBar topBar = super.createTopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout);
|
|
64
|
|
- return topBar;
|
|
65
|
|
- }
|
|
66
|
|
- };
|
|
67
|
|
- stackController = new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), topBarController, "stack", new Options());
|
|
|
56
|
+ stackController = new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()), new TopBarController(), "stack", new Options());
|
|
68
|
57
|
stackController.ensureViewIsCreated();
|
|
69
|
58
|
stackController.getView().layout(0, 0, 1000, 1000);
|
|
70
|
59
|
stackController.getTopBar().layout(0, 0, 1000, 100);
|
Guy Carmeli
6 years ago