|
@@ -8,7 +8,6 @@ import android.view.KeyEvent;
|
8
|
8
|
|
9
|
9
|
import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
|
10
|
10
|
import com.reactnativenavigation.NavigationApplication;
|
11
|
|
-import com.reactnativenavigation.layouts.Layout;
|
12
|
11
|
import com.reactnativenavigation.layouts.ScreenLayout;
|
13
|
12
|
import com.reactnativenavigation.params.ActivityParams;
|
14
|
13
|
import com.reactnativenavigation.params.parsers.ActivityParamsParser;
|
|
@@ -28,22 +27,6 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
|
28
|
27
|
private static Activity currentActivity;
|
29
|
28
|
private ActivityParams activityParams;
|
30
|
29
|
private ModalController modalController;
|
31
|
|
- private Layout layout = new Layout() {
|
32
|
|
- @Override
|
33
|
|
- public boolean onBackPressed() {
|
34
|
|
- return false;
|
35
|
|
- }
|
36
|
|
-
|
37
|
|
- @Override
|
38
|
|
- public void onDestroy() {
|
39
|
|
-
|
40
|
|
- }
|
41
|
|
-
|
42
|
|
- @Override
|
43
|
|
- public void removeAllReactViews() {
|
44
|
|
-
|
45
|
|
- }
|
46
|
|
- };
|
47
|
30
|
|
48
|
31
|
@Override
|
49
|
32
|
protected void onCreate(Bundle savedInstanceState) {
|
|
@@ -79,7 +62,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
|
79
|
62
|
@Override
|
80
|
63
|
protected void onDestroy() {
|
81
|
64
|
modalController.onDestroy();
|
82
|
|
- layout.onDestroy();
|
|
65
|
+// layout.onDestroy();
|
83
|
66
|
super.onDestroy();
|
84
|
67
|
if (currentActivity == null || currentActivity.isFinishing()) {
|
85
|
68
|
getNavigationReactInstance().onHostDestroy();
|
|
@@ -88,7 +71,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
|
88
|
71
|
|
89
|
72
|
@Override
|
90
|
73
|
public void onJsDevReload() {
|
91
|
|
- layout.removeAllReactViews();
|
|
74
|
+// layout.removeAllReactViews();
|
92
|
75
|
}
|
93
|
76
|
|
94
|
77
|
@Override
|
|
@@ -101,9 +84,9 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
|
101
|
84
|
if (modalController.onBackPressed()) {
|
102
|
85
|
return;
|
103
|
86
|
}
|
104
|
|
- if (layout.onBackPressed()) {
|
105
|
|
- return;
|
106
|
|
- }
|
|
87
|
+// if (layout.onBackPressed()) {
|
|
88
|
+// return;
|
|
89
|
+// }
|
107
|
90
|
getNavigationReactInstance().onBackPressed();
|
108
|
91
|
}
|
109
|
92
|
|