Merge pull request #11 from tlenclos/update-react-native

Update react-native to 0.31.0

Example/android/app/src/main/java/com/example/MainApplication.java

@@ -23,7 +23,7 @@ protected boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
-          new ReactNativeAudioStreamingPackage(MainActivity.class)
+          new ReactNativeAudioStreamingPackage()
       );
     }
   };

Example/package.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "react": "15.2.1",
-    "react-native": "0.30.0",
+    "react-native": "0.31.0",
     "react-native-audio-streaming": "git+https://[email protected]/tlenclos/react-native-audio-streaming.git#master"
   }
 }

README.md

@@ -19,7 +19,7 @@
 
 `$ react-native link react-native-audio-streaming`
 
-Go to `node_modules` ➜ `react-native-audio-streaming` => `ios` and add `Pods.xcodeproj`
+Go to `node_modules` ➜ `react-native-audio-streaming` => `Pods` and drag/drop `Pods.xcodeproj` to the Libraries folder in your XCode project.
 
 In XCode, in the project navigator, select your project. Add `libReactNativeAudioStreaming.a` and `libStreamingKit.a` to your project's `Build Phases` ➜ `Link Binary With Libraries`
 
@@ -30,16 +30,16 @@ In XCode, in the project navigator, select your project. Add `libReactNativeAudi
 1. In XCode, in the project navigator, right click `Libraries` ➜ `Add Files to [your project's name]`
 2. Go to `node_modules` ➜ `react-native-audio-streaming` => `ios`
    - run `pod install` to download StreamingKit dependency
-   - add `ReactNativeAudioStreaming.xcodeproj`
-   - add `Pods/Pods.xcodeproj`
+   - add `ReactNativeAudioStreaming.xcodeproj` to the Libraries folder in your XCode project
+   - add `Pods/Pods.xcodeproj` to the Libraries folder in your XCode project
 3. In XCode, in the project navigator, select your project. Add `libReactNativeAudioStreaming.a` and `libStreamingKit.a` to your project's `Build Phases` ➜ `Link Binary With Libraries`
 4. Run your project (`Cmd+R`)
 
 #### Android
 
 1. Open up `android/app/src/main/java/[...]/MainActivity.java`
   - Add `import com.reactlibrary.ReactNativeAudioStreamingPackage;` to the imports at the top of the file
-  - Add `new ReactNativeAudioStreamingPackage(MainActivity.class)` to the list returned by the `getPackages()` method
+  - Add `new ReactNativeAudioStreamingPackage()` to the list returned by the `getPackages()` method
 2. Append the following lines to `android/settings.gradle`:
   	```
   	include ':react-native-audio-streaming'
@@ -91,3 +91,9 @@ class PlayerUI extends Component {
 
 - Android version based on the work of @EstebanFuentealba https://github.com/EstebanFuentealba/react-native-android-audio-streaming-aac
 - iOS version based on the work of @jhabdas https://github.com/jhabdas/lumpen-radio
+
+See also the list of [contributors](https://github.com/tlenclos/react-native-audio-streaming/graphs/contributors) who participated in this project.
+
+## License
+
+This project is licensed under the MIT License - see the LICENSE file for details

android/src/main/java/com/audioStreaming/ReactNativeAudioStreamingModule.java

@@ -29,9 +29,8 @@ public class ReactNativeAudioStreamingModule extends ReactContextBaseJavaModule
   private Intent bindIntent;
   private String streamingURL;
 
-  public ReactNativeAudioStreamingModule(ReactApplicationContext reactContext, Class<?> cls) {
+  public ReactNativeAudioStreamingModule(ReactApplicationContext reactContext) {
     super(reactContext);
-    this.clsActivity = cls;
     this.context = reactContext;
   }
 
@@ -40,6 +39,9 @@ public ReactApplicationContext getReactApplicationContextModule() {
   }
 
   public Class<?> getClassActivity() {
+    if (this.clsActivity == null) {
+      this.clsActivity = getCurrentActivity().getClass();
+    }
     return this.clsActivity;
   }
 
@@ -77,7 +79,7 @@ public void initialize() {
   @Override
   public void onServiceConnected(ComponentName className, IBinder service) {
     signal = ((Signal.RadioBinder) service).getService();
-    signal.setData(this.context, this.clsActivity, this);
+    signal.setData(this.context, this);
     WritableMap params = Arguments.createMap();
     sendEvent(this.getReactApplicationContextModule(), "streamingOpen", params);
   }

android/src/main/java/com/audioStreaming/ReactNativeAudioStreamingPackage.java

@@ -15,15 +15,10 @@
 public class ReactNativeAudioStreamingPackage implements ReactPackage {
     private Class<?> clsActivity;
 
-    public ReactNativeAudioStreamingPackage(Class<?> activity) {
-        super();
-        this.clsActivity = activity;
-    }
-
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
-        modules.add(new ReactNativeAudioStreamingModule(reactContext, this.clsActivity));
+        modules.add(new ReactNativeAudioStreamingModule(reactContext));
         return modules;
     }
 

android/src/main/java/com/audioStreaming/Signal.java

@@ -61,9 +61,9 @@ public class Signal extends Service implements OnErrorListener,
     private TelephonyManager phoneManager;
     private PhoneListener phoneStateListener;
 
-    public void setData(Context context, Class<?> clsActivity, ReactNativeAudioStreamingModule module) {
+    public void setData(Context context, ReactNativeAudioStreamingModule module) {
         this.context = context;
-        this.clsActivity = clsActivity;
+        this.clsActivity = module.getClassActivity();
         this.module = module;
 
         this.eventsReceiver = new EventsReceiver(this.module);

package.json

@@ -21,9 +21,9 @@
     "test": "echo \"Not test yet sadly :(\" && exit 0"
   },
   "peerDependencies": {
-    "react-native": "^0.30.0"
+    "react-native": "^0.31.0"
   },
   "devDependencies": {
-    "react-native": "^0.30.0"
+    "react-native": "^0.31.0"
   }
 }