Guy Carmeli 8 years ago
parent
commit
36d8fbeee5

+ 5
- 7
android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java View File

@@ -2,14 +2,13 @@ package com.reactnativenavigation.bridge;
2 2
 
3 3
 import android.content.Intent;
4 4
 import android.os.Bundle;
5
-import android.util.Log;
6 5
 
7 6
 import com.facebook.react.bridge.ReactApplicationContext;
8 7
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
9 8
 import com.facebook.react.bridge.ReactMethod;
10 9
 import com.facebook.react.bridge.ReadableMap;
11 10
 import com.reactnativenavigation.NavigationApplication;
12
-import com.reactnativenavigation.activities.SingleScreenActivity;
11
+import com.reactnativenavigation.controllers.NavigationActivity;
13 12
 
14 13
 /**
15 14
  * The basic abstract components we will expose:
@@ -35,15 +34,14 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
35 34
 
36 35
     @ReactMethod
37 36
     public void startApp(final ReadableMap params) {
38
-        Log.d("GUY", "startApp: " + params);
39
-
40
-        Intent intent = new Intent(NavigationApplication.instance, SingleScreenActivity.class);
37
+        NavigationApplication context = NavigationApplication.instance;
38
+        Intent intent = new Intent(context, NavigationActivity.class);
41 39
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
42 40
 
43 41
         Bundle extras = new Bundle();
44 42
 
45
-
46
-
43
+        intent.putExtras(extras);
44
+        context.startActivity(intent);
47 45
     }
48 46
 
49 47
     @ReactMethod

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

@@ -2,7 +2,6 @@ package com.reactnativenavigation.controllers;
2 2
 
3 3
 import android.app.Activity;
4 4
 import android.content.Intent;
5
-import android.graphics.Color;
6 5
 import android.os.Bundle;
7 6
 import android.support.v7.app.AppCompatActivity;
8 7
 import android.view.KeyEvent;
@@ -16,7 +15,6 @@ import com.reactnativenavigation.layouts.ScreenLayout;
16 15
 import com.reactnativenavigation.react.JsDevReloadHandler;
17 16
 import com.reactnativenavigation.react.NavigationReactInstance;
18 17
 import com.reactnativenavigation.react.RedboxPermission;
19
-import com.reactnativenavigation.views.TitleBarButton;
20 18
 
21 19
 import java.util.Arrays;
22 20
 import java.util.List;
@@ -61,8 +59,7 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
61 59
     }
62 60
 
63 61
     private void createLayout() {
64
-        List<TitleBarButton.Params> btns = Arrays.asList(new TitleBarButton.Params("btn1", getResources().getDrawable(android.R.drawable.ic_media_play), Color.RED, TitleBarButton.Params.ShowAsAction.Always));
65
-        ScreenLayout.Params screenParams = new ScreenLayout.Params("v2.0", new Bundle(), btns);
62
+        ScreenParams screenParams = new ScreenParams();
66 63
         ScreenLayout screenLayout = new ScreenLayout(this, navigationReactInstance.getReactInstanceManager(), screenParams);
67 64
         setContentView(screenLayout);
68 65
     }