Merge pull request #912 from OneSignal/update-example-app

Updated React Native Example App

Author: mikechoch

examples/RNOneSignal/App.js

@@ -49,12 +49,14 @@ export default class App extends Component {
       kOSSettingsKeyAutoPrompt: true,
     });
 
+    OneSignal.setLogLevel(6, 0);
+    
     // Examples for using native IAM public methods
-    this.oneSignalInAppMessagingExamples();
+    // this.oneSignalInAppMessagingExamples();
+    
     // Examples for using native Outcome Event public methods
-    this.oneSignalOutcomeEventsExamples();
+    // this.oneSignalOutcomeEventsExamples();
 
-    OneSignal.setLogLevel(6, 0);
   }
 
   async componentDidMount() {
@@ -370,6 +372,36 @@ export default class App extends Component {
               color={this.state.buttonColor}
             />
           </View>
+          <View style={styles.buttonContainer}>
+            <Button
+              style={styles.button}
+              onPress={() => {
+                OneSignal.sendOutcome('sendOutcome-ro');
+              }}
+              title="Send Outcome"
+              color={this.state.buttonColor}
+            />
+          </View>
+          <View style={styles.buttonContainer}>
+            <Button
+              style={styles.button}
+              onPress={() => {
+                OneSignal.sendOutcome('sendUniqueOutcome-ro');
+              }}
+              title="Send Unique Outcome"
+              color={this.state.buttonColor}
+            />
+          </View>
+          <View style={styles.buttonContainer}>
+            <Button
+              style={styles.button}
+              onPress={() => {
+                OneSignal.sendOutcomeWithValue('sendOutcomeWithValue-ro', 18.76);
+              }}
+              title="Send Outcome With Value"
+              color={this.state.buttonColor}
+            />
+          </View>
         </View>
       </ScrollView>
     );

examples/RNOneSignal/android/app/build.gradle

@@ -188,6 +188,7 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-onesignal')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
 

examples/RNOneSignal/android/app/src/main/java/com/rnonesignal/MainApplication.java

@@ -8,6 +8,7 @@
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.ReactApplication;
 import com.geektime.rnonesignalandroid.ReactNativeOneSignalPackage;
+import com.geektime.rnonesignalandroid.ReactNativeOneSignalPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;

examples/RNOneSignal/android/settings.gradle

@@ -1,3 +1,5 @@
 rootProject.name = 'RNOneSignal'
+include ':react-native-onesignal'
+project(':react-native-onesignal').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-onesignal/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'

examples/RNOneSignal/ios/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>

examples/RNOneSignal/ios/Podfile

@@ -2,10 +2,15 @@ platform :ios, '9.0'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
 target 'RNOneSignal' do
-  # Pods for RNOneSignal
+  # Pods for rnPodspecProj
+  pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
+  pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
+  pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
+  pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
   pod 'React', :path => '../node_modules/react-native/'
-  pod 'React-Core', :path => '../node_modules/react-native/React'
-  pod 'React-DevSupport', :path => '../node_modules/react-native/React'
+  pod 'React-Core', :path => '../node_modules/react-native/'
+  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
+  pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
   pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
   pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
   pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
@@ -15,13 +20,15 @@ target 'RNOneSignal' do
   pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
   pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
   pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-  pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket'
+  pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
 
   pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
   pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
   pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
   pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-  pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+  pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
+  pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
+  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
 
   pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
@@ -30,11 +37,10 @@ target 'RNOneSignal' do
   use_native_modules!
   # Contains OneSignal wrapper SDK code + Native OneSignal-iOS-SDK
   pod 'react-native-onesignal', :path => '../node_modules/react-native-onesignal'
-
 end
 
-target 'OneSignalNotificationServiceExtension' do
-  # OneSignal-iOS-SDK for media, badge inc, other rich notification features
-  # No react native code / javascript in this iOS target
-  pod 'OneSignal', '>= 2.9.3', '< 3.0'
-end
+# target 'OneSignalNotificationServiceExtension' do
+#   # OneSignal-iOS-SDK for media, badge inc, other rich notification features
+#   # No react native code / javascript in this iOS target
+#   pod 'OneSignal', '>= 2.9.3', '< 3.0'
+# end