Skip to content

Commit f3840da

Browse files
fadi-georgefadi-george
committed
add track event demo
update min version of ios fix android & ios example
1 parent b6f10b1 commit f3840da

File tree

6 files changed

+29
-28
lines changed

6 files changed

+29
-28
lines changed

‎android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ of this software and associated documentation files (the "Software"), to deal
3838
import java.util.HashMap;
3939
import java.util.Map;
4040

41-
import javax.naming.Context;
41+
import android.content.Context;
4242

4343
import org.jetbrains.annotations.Nullable;
4444
import org.json.JSONException;

‎examples/RNOneSignalTS/OSButtons.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { StyleSheet, Text, View } from 'react-native';
2+
import { Platform, StyleSheet, Text, View } from 'react-native';
33
import { OneSignal } from 'react-native-onesignal';
44
import { renderButtonView } from './Helpers';
55
// Remove: import {Text, Divider} from '@react-native-material/core';
@@ -431,11 +431,20 @@ class OSButtons extends React.Component<Props> {
431431
},
432432
);
433433

434+
const trackEventButton = renderButtonView('Track Event', () => {
435+
loggingFunction('Tracking event: ', 'ReactNative');
436+
const platform = Platform.OS; // This will be 'ios' or 'android'
437+
OneSignal.User.trackEvent(`ReactNative-${platform}`, {
438+
ABC: '123',
439+
});
440+
});
441+
434442
return [
435443
loginButton,
436444
logoutButton,
437445
addEmailButton,
438446
removeEmailButton,
447+
trackEventButton,
439448
sendTagWithKeyButton,
440449
deleteTagWithKeyButton,
441450
addTagsButton,

‎examples/RNOneSignalTS/ios/Podfile.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,48 @@ PODS:
88
- hermes-engine (0.81.4):
99
- hermes-engine/Pre-built (= 0.81.4)
1010
- hermes-engine/Pre-built (0.81.4)
11-
- OneSignalXCFramework (5.2.14):
12-
- OneSignalXCFramework/OneSignalComplete (= 5.2.14)
13-
- OneSignalXCFramework/OneSignal (5.2.14):
11+
- OneSignalXCFramework (5.4.0-alpha-01):
12+
- OneSignalXCFramework/OneSignalComplete (= 5.4.0-alpha-01)
13+
- OneSignalXCFramework/OneSignal (5.4.0-alpha-01):
1414
- OneSignalXCFramework/OneSignalCore
1515
- OneSignalXCFramework/OneSignalExtension
1616
- OneSignalXCFramework/OneSignalLiveActivities
1717
- OneSignalXCFramework/OneSignalNotifications
1818
- OneSignalXCFramework/OneSignalOSCore
1919
- OneSignalXCFramework/OneSignalOutcomes
2020
- OneSignalXCFramework/OneSignalUser
21-
- OneSignalXCFramework/OneSignalComplete (5.2.14):
21+
- OneSignalXCFramework/OneSignalComplete (5.4.0-alpha-01):
2222
- OneSignalXCFramework/OneSignal
2323
- OneSignalXCFramework/OneSignalInAppMessages
2424
- OneSignalXCFramework/OneSignalLocation
25-
- OneSignalXCFramework/OneSignalCore (5.2.14)
26-
- OneSignalXCFramework/OneSignalExtension (5.2.14):
25+
- OneSignalXCFramework/OneSignalCore (5.4.0-alpha-01)
26+
- OneSignalXCFramework/OneSignalExtension (5.4.0-alpha-01):
2727
- OneSignalXCFramework/OneSignalCore
2828
- OneSignalXCFramework/OneSignalOutcomes
29-
- OneSignalXCFramework/OneSignalInAppMessages (5.2.14):
29+
- OneSignalXCFramework/OneSignalInAppMessages (5.4.0-alpha-01):
3030
- OneSignalXCFramework/OneSignalCore
3131
- OneSignalXCFramework/OneSignalNotifications
3232
- OneSignalXCFramework/OneSignalOSCore
3333
- OneSignalXCFramework/OneSignalOutcomes
3434
- OneSignalXCFramework/OneSignalUser
35-
- OneSignalXCFramework/OneSignalLiveActivities (5.2.14):
35+
- OneSignalXCFramework/OneSignalLiveActivities (5.4.0-alpha-01):
3636
- OneSignalXCFramework/OneSignalCore
3737
- OneSignalXCFramework/OneSignalOSCore
3838
- OneSignalXCFramework/OneSignalUser
39-
- OneSignalXCFramework/OneSignalLocation (5.2.14):
39+
- OneSignalXCFramework/OneSignalLocation (5.4.0-alpha-01):
4040
- OneSignalXCFramework/OneSignalCore
4141
- OneSignalXCFramework/OneSignalNotifications
4242
- OneSignalXCFramework/OneSignalOSCore
4343
- OneSignalXCFramework/OneSignalUser
44-
- OneSignalXCFramework/OneSignalNotifications (5.2.14):
44+
- OneSignalXCFramework/OneSignalNotifications (5.4.0-alpha-01):
4545
- OneSignalXCFramework/OneSignalCore
4646
- OneSignalXCFramework/OneSignalExtension
4747
- OneSignalXCFramework/OneSignalOutcomes
48-
- OneSignalXCFramework/OneSignalOSCore (5.2.14):
48+
- OneSignalXCFramework/OneSignalOSCore (5.4.0-alpha-01):
4949
- OneSignalXCFramework/OneSignalCore
50-
- OneSignalXCFramework/OneSignalOutcomes (5.2.14):
50+
- OneSignalXCFramework/OneSignalOutcomes (5.4.0-alpha-01):
5151
- OneSignalXCFramework/OneSignalCore
52-
- OneSignalXCFramework/OneSignalUser (5.2.14):
52+
- OneSignalXCFramework/OneSignalUser (5.4.0-alpha-01):
5353
- OneSignalXCFramework/OneSignalCore
5454
- OneSignalXCFramework/OneSignalNotifications
5555
- OneSignalXCFramework/OneSignalOSCore
@@ -1795,7 +1795,7 @@ PODS:
17951795
- ReactCommon/turbomodule/core
17961796
- SocketRocket
17971797
- react-native-onesignal (5.2.13):
1798-
- OneSignalXCFramework (= 5.2.14)
1798+
- OneSignalXCFramework (= 5.4.0-alpha-01)
17991799
- React (< 1.0.0, >= 0.13.0)
18001800
- react-native-safe-area-context (5.6.1):
18011801
- boost
@@ -2631,7 +2631,7 @@ SPEC CHECKSUMS:
26312631
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
26322632
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
26332633
hermes-engine: 35c763d57c9832d0eef764316ca1c4d043581394
2634-
OneSignalXCFramework: 7112f3e89563e41ebc23fe807788f11985ac541c
2634+
OneSignalXCFramework: 689af4166ff7fb10349f0bbf93df75872fef1f8d
26352635
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
26362636
RCTDeprecation: c0ed3249a97243002615517dff789bf4666cf585
26372637
RCTRequired: 58719f5124f9267b5f9649c08bf23d9aea845b23
@@ -2665,7 +2665,7 @@ SPEC CHECKSUMS:
26652665
React-logger: a3cb5b29c32b8e447b5a96919340e89334062b48
26662666
React-Mapbuffer: 9d2434a42701d6144ca18f0ca1c4507808ca7696
26672667
React-microtasksnativemodule: 75b6604b667d297292345302cc5bfb6b6aeccc1b
2668-
react-native-onesignal: 0829ce2a504db26dd80eaf14d4e0211ea626fe62
2668+
react-native-onesignal: 372119089f89c208e3a68586e9f3c24f16d599da
26692669
react-native-safe-area-context: c6e2edd1c1da07bdce287fa9d9e60c5f7b514616
26702670
React-NativeModulesApple: 879fbdc5dcff7136abceb7880fe8a2022a1bd7c3
26712671
React-oscompat: 93b5535ea7f7dff46aaee4f78309a70979bdde9d

‎examples/RNOneSignalTS/ios/RNOneSignalTS.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,10 @@
193193
inputFileListPaths = (
194194
"${PODS_ROOT}/Target Support Files/Pods-RNOneSignalTS/Pods-RNOneSignalTS-frameworks-${CONFIGURATION}-input-files.xcfilelist",
195195
);
196-
inputPaths = (
197-
);
198196
name = "[CP] Embed Pods Frameworks";
199197
outputFileListPaths = (
200198
"${PODS_ROOT}/Target Support Files/Pods-RNOneSignalTS/Pods-RNOneSignalTS-frameworks-${CONFIGURATION}-output-files.xcfilelist",
201199
);
202-
outputPaths = (
203-
);
204200
runOnlyForDeploymentPostprocessing = 0;
205201
shellPath = /bin/sh;
206202
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNOneSignalTS/Pods-RNOneSignalTS-frameworks.sh\"\n";
@@ -236,14 +232,10 @@
236232
inputFileListPaths = (
237233
"${PODS_ROOT}/Target Support Files/Pods-RNOneSignalTS/Pods-RNOneSignalTS-resources-${CONFIGURATION}-input-files.xcfilelist",
238234
);
239-
inputPaths = (
240-
);
241235
name = "[CP] Copy Pods Resources";
242236
outputFileListPaths = (
243237
"${PODS_ROOT}/Target Support Files/Pods-RNOneSignalTS/Pods-RNOneSignalTS-resources-${CONFIGURATION}-output-files.xcfilelist",
244238
);
245-
outputPaths = (
246-
);
247239
runOnlyForDeploymentPostprocessing = 0;
248240
shellPath = /bin/sh;
249241
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNOneSignalTS/Pods-RNOneSignalTS-resources.sh\"\n";

‎ios/RCTOneSignal/RCTOneSignalEventEmitter.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
529529
}
530530

531531
RCT_EXPORT_METHOD(trackEvent:(NSString *)name withProperties:(NSDictionary * _Nullable)properties) {
532-
[OneSignal.User trackEvent:name withProperties:properties];
532+
[OneSignal.User trackEventWithName:name properties:properties];
533533
}
534534

535535
@end

‎react-native-onesignal.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ Pod::Spec.new do |s|
2222
# pod 'React', :path => '../node_modules/react-native/'
2323

2424
# The Native OneSignal-iOS-SDK XCFramework from cocoapods.
25-
s.dependency 'OneSignalXCFramework', '5.2.14'
25+
s.dependency 'OneSignalXCFramework', '5.4.0-alpha-01'
2626
end

0 commit comments

Comments
 (0)