Browse Source

getting it to run

Daniel Zlotin 8 years ago
parent
commit
3053adcbc9

+ 3
- 1
android/app/src/main/java/com/reactnativenavigation/controllers/SplashActivity.java View File

5
 import android.support.v7.app.AppCompatActivity;
5
 import android.support.v7.app.AppCompatActivity;
6
 import android.widget.Toast;
6
 import android.widget.Toast;
7
 
7
 
8
+import com.reactnativenavigation.NavigationApplication;
9
+
8
 public abstract class SplashActivity extends AppCompatActivity {
10
 public abstract class SplashActivity extends AppCompatActivity {
9
 
11
 
10
     @Override
12
     @Override
11
     protected void onCreate(@Nullable Bundle savedInstanceState) {
13
     protected void onCreate(@Nullable Bundle savedInstanceState) {
12
         super.onCreate(savedInstanceState);
14
         super.onCreate(savedInstanceState);
13
         //TODO show fancy splash
15
         //TODO show fancy splash
14
-        Toast.makeText(this, "Loading navigation...", Toast.LENGTH_SHORT).show();
16
+        Toast.makeText(this, "Loading navigation...", Toast.LENGTH_LONG).show();
15
     }
17
     }
16
 }
18
 }

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/params/parsers/ActivityParamsParser.java View File

7
 public class ActivityParamsParser {
7
 public class ActivityParamsParser {
8
     public static ActivityParams parse(Bundle params) {
8
     public static ActivityParams parse(Bundle params) {
9
         ActivityParams result = new ActivityParams();
9
         ActivityParams result = new ActivityParams();
10
-        result.screenParams = ScreenParamsParser.parse(params);
10
+        result.screenParams = ScreenParamsParser.parse(params.getBundle("screen"));
11
         return result;
11
         return result;
12
     }
12
     }
13
 }
13
 }

+ 12
- 0
example-redux/android/app/src/main/java/com/exampleredux/App.java View File

1
 package com.exampleredux;
1
 package com.exampleredux;
2
 
2
 
3
+import android.support.annotation.NonNull;
4
+
5
+import com.facebook.react.ReactPackage;
3
 import com.reactnativenavigation.NavigationApplication;
6
 import com.reactnativenavigation.NavigationApplication;
4
 
7
 
8
+import java.util.Collections;
9
+import java.util.List;
10
+
5
 public class App extends NavigationApplication {
11
 public class App extends NavigationApplication {
6
     @Override
12
     @Override
7
     public boolean isDebug() {
13
     public boolean isDebug() {
8
         return BuildConfig.DEBUG;
14
         return BuildConfig.DEBUG;
9
     }
15
     }
16
+
17
+    @NonNull
18
+    @Override
19
+    public List<ReactPackage> createAdditionalReactPackages() {
20
+        return Collections.emptyList();
21
+    }
10
 }
22
 }

+ 2
- 3
example-redux/android/app/src/main/java/com/exampleredux/MainActivity.java View File

1
 package com.exampleredux;
1
 package com.exampleredux;
2
 
2
 
3
-import com.reactnativenavigation.controllers.NavigationActivity;
4
-
5
-public class MainActivity extends NavigationActivity {
3
+import com.reactnativenavigation.controllers.SplashActivity;
6
 
4
 
5
+public class MainActivity extends SplashActivity {
7
 }
6
 }

+ 1
- 0
src/platformSpecific.ios.js View File

1
+module.exports = {};

+ 2
- 1
src/platformSpecificDeprecated.android.js View File

1
 import React, {Component} from 'react';
1
 import React, {Component} from 'react';
2
 import {AppRegistry, NativeModules} from 'react-native';
2
 import {AppRegistry, NativeModules} from 'react-native';
3
 import _ from 'lodash';
3
 import _ from 'lodash';
4
+import utils from './utils';
4
 
5
 
5
 import Navigation from './Navigation';
6
 import Navigation from './Navigation';
6
 
7
 
20
   screen.passProps = params.passProps;
21
   screen.passProps = params.passProps;
21
   //const drawer = setupDrawer(params.drawer);
22
   //const drawer = setupDrawer(params.drawer);
22
 
23
 
23
-  params.screenId = screen.screen;
24
+  screen.screenId = screen.screen;
24
   newPlatformSpecific.startApp(params);
25
   newPlatformSpecific.startApp(params);
25
 }
26
 }
26
 
27