Browse Source

get screenParams from activityParams

Guy Carmeli 8 years ago
parent
commit
7848c45615

+ 3
- 4
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java View File

@@ -14,7 +14,6 @@ import com.reactnativenavigation.params.ActivityParams;
14 14
 import com.reactnativenavigation.params.parsers.ActivityParamsParser;
15 15
 import com.reactnativenavigation.layouts.Layout;
16 16
 import com.reactnativenavigation.layouts.ScreenLayout;
17
-import com.reactnativenavigation.params.ScreenParams;
18 17
 import com.reactnativenavigation.react.JsDevReloadHandler;
19 18
 import com.reactnativenavigation.react.NavigationReactInstance;
20 19
 import com.reactnativenavigation.react.RedboxPermission;
@@ -51,12 +50,13 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
51 50
 
52 51
         }
53 52
     };
53
+    private ActivityParams activityParams;
54 54
 
55 55
     @Override
56 56
     protected void onCreate(Bundle savedInstanceState) {
57 57
         super.onCreate(savedInstanceState);
58 58
 
59
-        ActivityParams params = ActivityParamsParser.parse(getIntent().getBundleExtra(PARAMS_BUNDLE));
59
+        activityParams = ActivityParamsParser.parse(getIntent().getBundleExtra(PARAMS_BUNDLE));
60 60
 
61 61
         modalController = new ModalController();
62 62
         navigationReactInstance = new NavigationReactInstance(this);
@@ -66,8 +66,7 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
66 66
     }
67 67
 
68 68
     private void createLayout() {
69
-        ScreenParams screenParams = new ScreenParams();
70
-        ScreenLayout screenLayout = new ScreenLayout(this, navigationReactInstance.getReactInstanceManager(), screenParams);
69
+        ScreenLayout screenLayout = new ScreenLayout(this, navigationReactInstance.getReactInstanceManager(), activityParams.screenParams);
71 70
         setContentView(screenLayout);
72 71
     }
73 72