Merge branch 'master' of github.com:walmartreact/react-native-orienta…

…tion-listener

Conflicts:
	index.js

android/src/main/java/com/walmartreact/ReactOrientationListener/ReactOrientationListenerModule.java

@@ -42,9 +42,11 @@ public void onOrientationChanged(int orientation) {
         }
         params.putString("orientation", orientationValue);
         params.putString("device", getDeviceName());
-        thisContext
-          .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-          .emit("orientationDidChange", params);
+        if (thisContext.hasActiveCatalystInstance()) {
+          thisContext
+            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+            .emit("orientationDidChange", params);
+        }
       }
     };
 
@@ -105,4 +107,4 @@ public void getOrientation(Callback success) {
     success.invoke(data);
   }
 
-}
+}

index.js

@@ -1,10 +1,9 @@
 'use strict';
 
 var React = require('react-native');
+<<<<<<< HEAD
 
-var { DeviceEventEmitter } = React;
-
-var {NativeModules} = React;
+var { DeviceEventEmitter, NativeModules } = React;
 
 module.exports = {
   getOrientation: function(callback) {

react-native-orientation-listener.podspec

@@ -0,0 +1,14 @@
+Pod::Spec.new do |s|
+  s.name             = "react-native-orientation-listener"
+  s.version          = "0.0.2"
+  s.summary          = " react-native library for obtaining current device orientation"
+  s.requires_arc = true
+  s.author       = { 'Ken Wheeler' => 'ken@outlook.com' }
+  s.license      = 'MIT'
+  s.homepage     = 'https://github.com/walmartreact/react-native-orientation-listener'
+  s.source       = { :git => "https://github.com/walmartreact/react-native-orientation-listener.git" }
+  s.platform     = :ios, "7.0"
+  s.dependency 'React'
+  s.source_files     = "*.{h,m}"
+  s.preserve_paths   = "*.js"
+end