react-native-notify-kit 10.5.0 → 10.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +107 -1
- package/android/src/main/java/app/notifee/core/Notifee.java +9 -0
- package/android/src/main/java/app/notifee/core/ReceiverService.java +41 -4
- package/android/src/main/java/app/notifee/core/model/NotificationAndroidStyleModel.java +63 -34
- package/android/src/main/java/app/notifee/core/utility/FullScreenIntentUtils.java +53 -0
- package/android/src/main/java/app/notifee/core/utility/ResourceUtils.java +15 -1
- package/android/src/test/java/app/notifee/core/ReceiverServicePendingIntentIdentityTest.java +303 -0
- package/android/src/test/java/app/notifee/core/model/NotificationAndroidStyleModelPersonFailureTest.java +337 -0
- package/android/src/test/java/app/notifee/core/model/TimestampTriggerModelTest.java +27 -70
- package/android/src/test/java/app/notifee/core/utility/FullScreenIntentUtilsTest.java +83 -0
- package/android/src/test/java/app/notifee/core/utility/ResourceUtilsBitmapOwnershipTest.java +145 -0
- package/dist/NotifeeApiModule.js +4 -0
- package/dist/NotifeeApiModule.js.map +1 -1
- package/dist/types/Notification.d.ts +2 -1
- package/dist/types/Notification.js.map +1 -1
- package/dist/types/NotificationAndroid.d.ts +17 -5
- package/dist/types/NotificationAndroid.js.map +1 -1
- package/dist/validators/validateAndroidNotification.js +4 -0
- package/dist/validators/validateAndroidNotification.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/ios/NotifeeCore/NotifeeCoreExtensionHelper.m +285 -91
- package/ios/NotifeeCore/NotifeeCoreUtil.m +159 -13
- package/jest-mock.js +1 -0
- package/package.json +4 -1
- package/plugin/build/android/withNotifyKitAndroidNotificationIcons.js +498 -0
- package/plugin/build/index.js +13 -18
- package/plugin/build/options.js +84 -0
- package/server/dist/validation.d.ts.map +1 -1
- package/server/dist/validation.js +14 -0
- package/server/dist/validation.js.map +1 -1
- package/server/src/validation.ts +20 -0
- package/src/NotifeeApiModule.ts +4 -0
- package/src/types/Notification.ts +2 -1
- package/src/types/NotificationAndroid.ts +18 -5
- package/src/validators/validateAndroidNotification.ts +7 -0
- package/src/version.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"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"}
|
package/server/src/validation.ts
CHANGED
|
@@ -131,4 +131,24 @@ export function validateInput(input: NotifyKitPayloadInput): void {
|
|
|
131
131
|
throw err('Validation', "'options.collapseKey' must be a non-empty string");
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
|
+
|
|
135
|
+
const actions = notification.android?.actions;
|
|
136
|
+
if (Array.isArray(actions)) {
|
|
137
|
+
const pressActionIds = new Set<string>();
|
|
138
|
+
|
|
139
|
+
for (const action of actions) {
|
|
140
|
+
const pressActionId = action?.pressAction?.id;
|
|
141
|
+
if (typeof pressActionId !== 'string') {
|
|
142
|
+
continue;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
if (pressActionIds.has(pressActionId)) {
|
|
146
|
+
throw err(
|
|
147
|
+
'Android',
|
|
148
|
+
"'notification.android.actions' pressAction IDs must be unique within the notification",
|
|
149
|
+
);
|
|
150
|
+
}
|
|
151
|
+
pressActionIds.add(pressActionId);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
134
154
|
}
|
package/src/NotifeeApiModule.ts
CHANGED
|
@@ -602,6 +602,7 @@ export default class NotifeeApiModule extends NotifeeNativeModule implements Mod
|
|
|
602
602
|
ios,
|
|
603
603
|
android: {
|
|
604
604
|
alarm: AndroidNotificationSetting.ENABLED,
|
|
605
|
+
fullScreenIntent: AndroidNotificationSetting.ENABLED,
|
|
605
606
|
},
|
|
606
607
|
web: {},
|
|
607
608
|
};
|
|
@@ -614,6 +615,7 @@ export default class NotifeeApiModule extends NotifeeNativeModule implements Mod
|
|
|
614
615
|
authorizationStatus: AuthorizationStatus.NOT_DETERMINED,
|
|
615
616
|
android: {
|
|
616
617
|
alarm: AndroidNotificationSetting.ENABLED,
|
|
618
|
+
fullScreenIntent: AndroidNotificationSetting.ENABLED,
|
|
617
619
|
},
|
|
618
620
|
ios: {
|
|
619
621
|
alert: 1,
|
|
@@ -725,6 +727,7 @@ export default class NotifeeApiModule extends NotifeeNativeModule implements Mod
|
|
|
725
727
|
ios,
|
|
726
728
|
android: {
|
|
727
729
|
alarm: AndroidNotificationSetting.ENABLED,
|
|
730
|
+
fullScreenIntent: AndroidNotificationSetting.ENABLED,
|
|
728
731
|
},
|
|
729
732
|
web: {},
|
|
730
733
|
};
|
|
@@ -737,6 +740,7 @@ export default class NotifeeApiModule extends NotifeeNativeModule implements Mod
|
|
|
737
740
|
authorizationStatus: AuthorizationStatus.NOT_DETERMINED,
|
|
738
741
|
android: {
|
|
739
742
|
alarm: AndroidNotificationSetting.ENABLED,
|
|
743
|
+
fullScreenIntent: AndroidNotificationSetting.ENABLED,
|
|
740
744
|
},
|
|
741
745
|
ios: {
|
|
742
746
|
alert: 1,
|
|
@@ -277,7 +277,8 @@ export interface NotificationPressAction {
|
|
|
277
277
|
/**
|
|
278
278
|
* The interface used to describe a full-screen action for a notification.
|
|
279
279
|
*
|
|
280
|
-
*
|
|
280
|
+
* Setting a `fullScreenAction` configures the notification to request Full-Screen Intent presentation from Android.
|
|
281
|
+
* Actual full-screen presentation depends on the app's Full-Screen Intent access and Android platform conditions.
|
|
281
282
|
*
|
|
282
283
|
* On Android; when provided to a notification action, the action will only open you application if
|
|
283
284
|
* a `launchActivity` and/or a `mainComponent` is provided.
|
|
@@ -62,9 +62,9 @@ export interface NotificationAndroid {
|
|
|
62
62
|
autoCancel?: boolean;
|
|
63
63
|
|
|
64
64
|
/**
|
|
65
|
-
*
|
|
66
|
-
*
|
|
67
|
-
*
|
|
65
|
+
* Sets the number associated with this notification. Compatible Android launchers may use it for
|
|
66
|
+
* the app icon badge, but numeric display is launcher-dependent and it is not equivalent to the
|
|
67
|
+
* global iOS `notifee.setBadgeCount()` API.
|
|
68
68
|
*/
|
|
69
69
|
badgeCount?: number;
|
|
70
70
|
|
|
@@ -276,8 +276,10 @@ export interface NotificationAndroid {
|
|
|
276
276
|
pressAction?: NotificationPressAction | null;
|
|
277
277
|
|
|
278
278
|
/**
|
|
279
|
-
* The `fullScreenAction` property
|
|
280
|
-
*
|
|
279
|
+
* The `fullScreenAction` property requests Full-Screen Intent presentation from Android
|
|
280
|
+
* when the notification is displayed.
|
|
281
|
+
*
|
|
282
|
+
* Actual full-screen presentation depends on the app's Full-Screen Intent access and Android platform conditions.
|
|
281
283
|
*
|
|
282
284
|
* View the [FullScreenAction](/react-native/android/behaviour#full-screen) documentation to learn
|
|
283
285
|
* more.
|
|
@@ -501,6 +503,17 @@ export interface AndroidNotificationSettings {
|
|
|
501
503
|
* View the [Trigger](/react-native/android/triggers#android-12-limitations) documentation for more information.
|
|
502
504
|
*/
|
|
503
505
|
alarm: AndroidNotificationSetting;
|
|
506
|
+
|
|
507
|
+
/**
|
|
508
|
+
* Enum describing whether the app currently has the Android access required to use full-screen intents.
|
|
509
|
+
*
|
|
510
|
+
* API < 29 reports `ENABLED` because the later permission model does not apply. API 29–33 reflects
|
|
511
|
+
* `USE_FULL_SCREEN_INTENT`. API 34+ reflects Android's full-screen intent special app access,
|
|
512
|
+
* which may be restricted or revoked by the system, installer, or user.
|
|
513
|
+
*
|
|
514
|
+
* `ENABLED` does not guarantee that a particular notification will be presented full-screen.
|
|
515
|
+
*/
|
|
516
|
+
fullScreenIntent?: AndroidNotificationSetting;
|
|
504
517
|
}
|
|
505
518
|
|
|
506
519
|
/**
|
|
@@ -103,6 +103,13 @@ export default function validateAndroidNotification(
|
|
|
103
103
|
throw new Error(`'notification.android.actions' invalid AndroidAction. ${e.message}.`);
|
|
104
104
|
}
|
|
105
105
|
|
|
106
|
+
const pressActionIds = new Set<string>(actions.map(action => action.pressAction.id));
|
|
107
|
+
if (pressActionIds.size !== actions.length) {
|
|
108
|
+
throw new Error(
|
|
109
|
+
"'notification.android.actions' pressAction IDs must be unique within the notification.",
|
|
110
|
+
);
|
|
111
|
+
}
|
|
112
|
+
|
|
106
113
|
if (actions.length) {
|
|
107
114
|
out.actions = actions;
|
|
108
115
|
}
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// Generated by genversion.
|
|
2
|
-
export const version = '10.
|
|
2
|
+
export const version = '10.7.0';
|