Guy Carmeli преди 8 години
родител
ревизия
36d8fbeee5

+ 5
- 7
android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java Целия файл

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

+ 1
- 4
android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java Целия файл

2
 
2
 
3
 import android.app.Activity;
3
 import android.app.Activity;
4
 import android.content.Intent;
4
 import android.content.Intent;
5
-import android.graphics.Color;
6
 import android.os.Bundle;
5
 import android.os.Bundle;
7
 import android.support.v7.app.AppCompatActivity;
6
 import android.support.v7.app.AppCompatActivity;
8
 import android.view.KeyEvent;
7
 import android.view.KeyEvent;
16
 import com.reactnativenavigation.react.JsDevReloadHandler;
15
 import com.reactnativenavigation.react.JsDevReloadHandler;
17
 import com.reactnativenavigation.react.NavigationReactInstance;
16
 import com.reactnativenavigation.react.NavigationReactInstance;
18
 import com.reactnativenavigation.react.RedboxPermission;
17
 import com.reactnativenavigation.react.RedboxPermission;
19
-import com.reactnativenavigation.views.TitleBarButton;
20
 
18
 
21
 import java.util.Arrays;
19
 import java.util.Arrays;
22
 import java.util.List;
20
 import java.util.List;
61
     }
59
     }
62
 
60
 
63
     private void createLayout() {
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
         ScreenLayout screenLayout = new ScreenLayout(this, navigationReactInstance.getReactInstanceManager(), screenParams);
63
         ScreenLayout screenLayout = new ScreenLayout(this, navigationReactInstance.getReactInstanceManager(), screenParams);
67
         setContentView(screenLayout);
64
         setContentView(screenLayout);
68
     }
65
     }