Merge pull request #2988 from StoDevX/push-notifications-settings-hawken

Add Push Notifications settings

Author: hawkrives

android/app/build.gradle

@@ -113,7 +113,6 @@ android {
         manifestPlaceholders = [
             manifestApplicationId: applicationId,
             BUGSNAG_KEY: System.getenv("BUGSNAG_KEY") ?: "",
-            onesignal_app_id: "a46c6f2f-a240-4908-a359-801911e9b9ea",
             onesignal_google_project_number: "REMOTE",
         ]
 

fastlane/platforms/ios.rb

@@ -146,6 +146,7 @@
       language: 'English',
       enable_services: {
         push_notification: 'on',
+        app_group: 'on',
       },
     )
 
@@ -156,6 +157,7 @@
       skip_itc: 'on',
       enable_services: {
         push_notification: 'off',
+        app_group: 'on',
       },
     )
   end

flow-typed/npm/react-native-onesignal_vx.x.x.js

@@ -0,0 +1,147 @@
+// flow-typed signature: 711d38edadc6dba0fec911b42c30753d
+// flow-typed version: <<STUB>>/react-native-onesignal_v3.1.4/flow_v0.67.1
+
+/**
+ * This is an autogenerated libdef stub for:
+ *
+ *   'react-native-onesignal'
+ *
+ * Fill this stub out by replacing all the `any` types.
+ *
+ * Once filled out, we encourage you to share your work with the
+ * community by sending a pull request to:
+ * https://github.com/flowtype/flow-typed
+ */
+
+declare module 'react-native-onesignal' {
+  declare export type OneSignalOpenResult = {
+    notification: {
+      payload: {
+        body: any,
+        additionalData: any,
+      },
+      isAppInFocus: boolean,
+    },
+  }
+
+  declare export type OneSignalNotification = {
+    shown: boolean,
+    payload: {
+      notificationID: '',
+      contentAvailable: boolean,
+      badge: 1,
+      sound: 'default',
+      title: 'Hello!',
+      body: 'World',
+      launchURL: '',
+    },
+    displayType: 1,
+    silentNotification: boolean,
+  }
+
+  declare export type OneSignalIdsResult = {
+    pushToken: ?string,
+    subscribed: boolean,
+    userId: ?string,
+    userSubscriptionSetting: boolean,
+  }
+
+  declare type EventTypeEnum = 'received' | 'opened' | 'ids' | 'emailSubscription';
+
+  declare type Permissions = {
+    alert: boolean,
+    badge: boolean,
+    sound: boolean,
+  }
+
+  declare export type SubscriptionState = {
+    hasPrompted: boolean,
+    notificationsEnabled: boolean,
+    subscriptionEnabled: boolean,
+    userSubscriptionEnabled: boolean,
+    pushToken: ?string,
+    userId: ?string,
+    emailUserId: ?string,
+    emailAddress: ?string,
+    emailSubscribed: boolean
+  };
+
+  declare export type TagsObject = {[key: string]: string}
+
+  declare type DisplayOption =
+    | 0 // None
+    | 1 // InAppAlert
+    | 2 // Notification
+
+  declare export type NotificationContent = {}
+  declare export type NotificationData = {}
+  declare export type NotificationParameters = {hidden?: boolean}
+
+  declare export type IosSettings = {
+    kOSSettingsKeyAutoPrompt?: boolean,
+    kOSSettingsKeyInAppLaunchURL?: boolean,
+    kOSSSettingsKeyPromptBeforeOpeningPushURL?: boolean,
+    kOSSettingsKeyInFocusDisplayOption?: DisplayOption,
+  };
+
+  declare export default class OneSignal {
+    static addEventListener(type: 'received', handler: (OneSignalNotification) => mixed): void;
+    static addEventListener(type: 'opened', handler: (OneSignalOpenResult) => mixed): void;
+    static addEventListener(type: 'ids', handler: (OneSignalIdsResult) => mixed): void;
+    static addEventListener(type: 'emailSubscription', handler: (...any[]) => mixed): void;
+    static removeEventListener(type: EventTypeEnum, handler: Function): void;
+    static clearListeners(): void;
+
+    static registerForPushNotifications(): void;
+
+    static promptForPushNotificationsWithUserResponse(callback: (bool) => mixed): void;
+
+    static requestPermissions(permissions: Permissions): void;
+
+    static configure(): void;
+
+    static init(appId: string, iosSettings: IosSettings): void;
+
+    static checkPermissions(callback: (Permissions) => mixed): void;
+
+    static promptForPushNotificationPermissions(callback: (bool) => mixed): void;
+
+    static getPermissionSubscriptionState(callback: (SubscriptionState) => mixed): void;
+
+    static sendTag(key: string, value: string): void;
+    static sendTags(TagsObject): void;
+    static getTags((null | TagsObject | Error) => mixed): void;
+    static deleteTag(key: string): void;
+
+    static enableVibrate(enable: boolean): void;
+    static enableSound(enable: boolean): void;
+
+    static setEmail(email: string): void;
+    static setEmail(email: string, emailAuthCode: string): void;
+    static setEmail(email: string, callback: (?Error) => mixed): void;
+    static setEmail(email: string, emailAuthCode: string, callback: (?Error) => mixed): void;
+
+    static logoutEmail(callback: (?Error) => mixed): void;
+
+    static setLocationShared(enable: boolean): void;
+    static setSubscription(enable: boolean): void;
+
+    static promptLocation(): void;
+
+    static inFocusDisplaying(DisplayOption): void;
+
+    static postNotification(contents: NotificationContent, data: NotificationData, player_id: string | Array<string>): void;
+    static postNotification(contents: NotificationContent, data: NotificationData, player_id: string | Array<string>, otherParameters?: NotificationParameters): void;
+
+    static clearOneSignalNotifications(): void;
+    static cancelNotification(id: number): void;
+
+    static syncHashedEmail(email: string): void;
+
+    static setLogLevel(level: string): void;
+
+    static setRequiresUserPrivacyConsent(required: boolean): void;
+    static provideUserConsent(granted: boolean): void;
+    static userProvidedPrivacyConsent(): Promise<boolean>;
+  }
+}

ios/AllAboutOlaf.xcodeproj/project.pbxproj

@@ -42,8 +42,8 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
 		23787DFEFF9747949AE97A42 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E6FBE71A05CC43E2B4885180 /* Ionicons.ttf */; };
-		2D2C03E9364242759337907D /* libRCTOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 768B9C2ACFD14FD7BDAD0025 /* libRCTOneSignal.a */; };
 		3A0CEA921DEA203F0036E739 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A0CEA781DEA20340036E739 /* libRCTAnimation.a */; };
+		3AD99DE32141CA1600D8CAAA /* libRCTOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D18853A920995CEB000A1DC5 /* libRCTOneSignal.a */; };
 		3AE408501E1E280800F0FD83 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3AE4084F1E1E280800F0FD83 /* LaunchScreen.storyboard */; };
 		679C3A672050B38F00B4D498 /* libRCTMGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679C3A662050B37200B4D498 /* libRCTMGL.a */; };
 		679C3A6E2050B4F100B4D498 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679C3A6D2050B4F100B4D498 /* Mapbox.framework */; };
@@ -530,11 +530,11 @@
 		43E420DADB24468C9E296F25 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
 		4E4DA38580594A71BEE6DAB5 /* RNSearchBar.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSearchBar.xcodeproj; path = "../node_modules/react-native-search-bar/ios/RNSearchBar.xcodeproj"; sourceTree = "<group>"; };
 		59C781128E0B476A8826CD12 /* BugsnagReactNative.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BugsnagReactNative.xcodeproj; path = "../node_modules/bugsnag-react-native/cocoa/BugsnagReactNative.xcodeproj"; sourceTree = "<group>"; };
+		6787664D213C7E7E00E33DFF /* OneSignalNotificationServiceExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OneSignalNotificationServiceExtension.entitlements; sourceTree = "<group>"; };
 		679C3A6D2050B4F100B4D498 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mapbox.framework; path = "../node_modules/@mapbox/react-native-mapbox-gl/ios/Mapbox.framework"; sourceTree = "<group>"; };
 		67A1EEA72072C1340059399D /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/ios/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; };
 		71D5CCADA66D45008D9A38F2 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
 		742B362B86E443C09A7F9FD9 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
-		768B9C2ACFD14FD7BDAD0025 /* libRCTOneSignal.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTOneSignal.a; sourceTree = "<group>"; };
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
 		7CEE763ECB05435E8CD79870 /* RNNetworkInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNNetworkInfo.xcodeproj; path = "../node_modules/react-native-network-info/ios/RNNetworkInfo.xcodeproj"; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
@@ -598,7 +598,7 @@
 				00958A8F2008726000073F2F /* libRNSearchBar.a in Frameworks */,
 				679C3A672050B38F00B4D498 /* libRCTMGL.a in Frameworks */,
 				67A1EEB02072C1860059399D /* libRNDeviceInfo.a in Frameworks */,
-				2D2C03E9364242759337907D /* libRCTOneSignal.a in Frameworks */,
+				3AD99DE32141CA1600D8CAAA /* libRCTOneSignal.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -971,7 +971,6 @@
 				83CBBA001A601CBA00E9B192 /* Products */,
 				5A41494DACBB4D2795B46DE0 /* Resources */,
 				3C5BFA21338636E7EB4E5E0D /* Frameworks */,
-				D188536D20995CEA000A1DC5 /* Recovered References */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -987,14 +986,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		D188536D20995CEA000A1DC5 /* Recovered References */ = {
-			isa = PBXGroup;
-			children = (
-				768B9C2ACFD14FD7BDAD0025 /* libRCTOneSignal.a */,
-			);
-			name = "Recovered References";
-			sourceTree = "<group>";
-		};
 		D18853A520995CEB000A1DC5 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -1006,6 +997,7 @@
 		D1FC244D209B6EDF002CD083 /* OneSignalNotificationServiceExtension */ = {
 			isa = PBXGroup;
 			children = (
+				6787664D213C7E7E00E33DFF /* OneSignalNotificationServiceExtension.entitlements */,
 				D1FC244E209B6EDF002CD083 /* NotificationService.h */,
 				D1FC244F209B6EDF002CD083 /* NotificationService.m */,
 				D1FC2451209B6EDF002CD083 /* Info.plist */,
@@ -1095,7 +1087,7 @@
 						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.ApplicationGroups.iOS = {
-								enabled = 0;
+								enabled = 1;
 							};
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -1109,6 +1101,11 @@
 						CreatedOnToolsVersion = 9.3;
 						DevelopmentTeam = TMK6S7TPX2;
 						ProvisioningStyle = Manual;
+						SystemCapabilities = {
+							com.apple.ApplicationGroups.iOS = {
+								enabled = 1;
+							};
+						};
 					};
 				};
 			};
@@ -2041,14 +2038,14 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = TMK6S7TPX2;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "NFMTHAZVS9.com.drewvolz.stolaf.onesignal-notification-service-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2070,6 +2067,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
@@ -2078,7 +2076,6 @@
 				DEVELOPMENT_TEAM = TMK6S7TPX2;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "NFMTHAZVS9.com.drewvolz.stolaf.onesignal-notification-service-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";

ios/AllAboutOlaf/AllAboutOlaf.entitlements

@@ -4,5 +4,9 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.NFMTHAZVS9.com.drewvolz.stolaf.onesignal</string>
+	</array>
 </dict>
 </plist>

ios/AllAboutOlaf/AppDelegate.m

@@ -54,8 +54,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   // ignore vibrate/silent switch when playing audio
   [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryPlayback error: nil];
 
-  self.oneSignal = [[RCTOneSignal alloc] initWithLaunchOptions:launchOptions
-                                                         appId:@"a46c6f2f-a240-4908-a359-801911e9b9ea"];
   return YES;
 }
 

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.application-groups</key>
+	<array>
+		<string>group.NFMTHAZVS9.com.drewvolz.stolaf.onesignal</string>
+	</array>
+</dict>
+</plist>

modules/analytics/google-analytics.js

@@ -81,3 +81,21 @@ export const trackLoginFailure = (reason: string) =>
 	tracker.trackEvent('account', 'login-failure', {label: reason, value: 1})
 
 export const trackLogOut = () => tracker.trackEvent('account', 'log-out')
+
+export const trackChannelSubscribe = (channelName: string) =>
+	tracker.trackEvent('notification-channel', 'subscribe', {
+		label: channelName,
+		value: 1,
+	})
+
+export const trackChannelUnsubscribe = (streamName: string) =>
+	tracker.trackEvent('notification-channel', 'unsubscribe', {
+		label: streamName,
+		value: 1,
+	})
+
+export const trackNotificationsDisable = () =>
+	tracker.trackEvent('notification-channel', 'disabled')
+
+export const trackNotificationsEnable = () =>
+	tracker.trackEvent('notifications', 'enabled')

modules/tableview/cells/toggle.js

@@ -10,19 +10,31 @@ type PropsType = {
 	value: boolean,
 	onChange: (val: boolean) => any,
 	theme: AppTheme,
+	detail?: string,
+	disabled?: boolean,
 }
 
-function CellToggle({value, onChange, label, theme}: PropsType) {
+function CellToggle(props: PropsType) {
+	let {value, onChange, label, detail, theme, disabled} = props
+
 	let toggle = (
 		<Switch
+			disabled={disabled}
 			onTintColor={theme.switchTintOn}
 			onValueChange={onChange}
 			tintColor={theme.switchTintOff}
 			value={value}
 		/>
 	)
 
-	return <Cell cellAccessoryView={toggle} title={label} />
+	return (
+		<Cell
+			cellAccessoryView={toggle}
+			cellStyle={detail ? 'Subtitle' : 'Basic'}
+			detail={detail}
+			title={label}
+		/>
+	)
 }
 
 export const RawCellToggle = CellToggle

package.json

@@ -128,7 +128,7 @@
     "react-native-keychain": "3.0.0",
     "react-native-linear-gradient": "2.4.2",
     "react-native-network-info": "4.0.0",
-    "react-native-onesignal": "3.1.4",
+    "react-native-onesignal": "3.2.6",
     "react-native-popover-view": "1.0.8",
     "react-native-restart": "0.0.7",
     "react-native-safari-view": "2.1.0",