diff --git a/CHANGELOG.android.txt b/CHANGELOG.android.txt index cd8528d..b2bc101 100755 --- a/CHANGELOG.android.txt +++ b/CHANGELOG.android.txt @@ -1 +1,2 @@ +- We have migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features. - We fixed an issue where TextInput-based fields like the TextBox and TextArea would not receive focus on Android devices via touch. \ No newline at end of file diff --git a/CHANGELOG.ios.txt b/CHANGELOG.ios.txt index e69de29..1c8510c 100644 --- a/CHANGELOG.ios.txt +++ b/CHANGELOG.ios.txt @@ -0,0 +1 @@ +- We have migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features. \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e88169a..eca5b60 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -23,6 +23,7 @@ + @@ -97,18 +98,6 @@ - - - - - - - - - - diff --git a/android/app/src/main/java/com/mendix/developerapp/firebase/FirebaseMessagingService.kt b/android/app/src/main/java/com/mendix/developerapp/firebase/FirebaseMessagingService.kt index 3ad9eaf..d27620b 100644 --- a/android/app/src/main/java/com/mendix/developerapp/firebase/FirebaseMessagingService.kt +++ b/android/app/src/main/java/com/mendix/developerapp/firebase/FirebaseMessagingService.kt @@ -9,7 +9,6 @@ import android.net.Uri import android.os.Build import android.util.Log import androidx.core.app.NotificationCompat -import com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService import com.google.firebase.messaging.RemoteMessage import com.mendix.developerapp.R @@ -39,7 +38,7 @@ class FirebaseMessagingService: com.google.firebase.messaging.FirebaseMessagingS } - val notificationManager = context.getSystemService(RNPushNotificationListenerService.NOTIFICATION_SERVICE) as NotificationManager + val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager // Since android Oreo notification channel is needed. if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val channel = NotificationChannel(MENDIX_AD_CAMPAIGN_CHANNEL, diff --git a/android/build.gradle b/android/build.gradle index be03cd9..76a4f4a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -66,6 +66,9 @@ allprojects { } google() maven { url 'https://jitpack.io' } + maven { + url "$rootDir/../node_modules/@notifee/react-native/android/libs" + } } // Build all modules with Android 16KB pages enabled diff --git a/ios/DeveloperApp/AppDelegate.swift b/ios/DeveloperApp/AppDelegate.swift index ac8b883..7890b48 100644 --- a/ios/DeveloperApp/AppDelegate.swift +++ b/ios/DeveloperApp/AppDelegate.swift @@ -123,9 +123,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void ) { - if (!handleMendixNotification(response: response)) { - RNCPushNotificationIOS.didReceive(response) - } completionHandler() } diff --git a/ios/DeveloperApp/DeveloperApp-Bridging-Header.h b/ios/DeveloperApp/DeveloperApp-Bridging-Header.h index 185bffe..d110abf 100644 --- a/ios/DeveloperApp/DeveloperApp-Bridging-Header.h +++ b/ios/DeveloperApp/DeveloperApp-Bridging-Header.h @@ -3,4 +3,3 @@ #import "MendixNative.h" #import "IQKeyboardManager/IQKeyboardManager.h" #import "RNSplashScreen.h" -#import "RNCPushNotificationIOS.h" diff --git a/ios/DeveloperApp/Info.plist b/ios/DeveloperApp/Info.plist index 92e71f1..17b685d 100644 --- a/ios/DeveloperApp/Info.plist +++ b/ios/DeveloperApp/Info.plist @@ -86,7 +86,7 @@ NSPhotoLibraryUsageDescription To use that feature the app needs access to your photo library. Native Binary Version - 14 + 15 NativeOTAEnabled ReferenceGuideUrl diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 74a3e88..6bab13d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,7 +1,7 @@ PODS: - boost (1.84.0) - - BVLinearGradient (2.5.6): - - React + - BVLinearGradient (2.8.3): + - React-Core - DoubleConversion (1.1.6) - fast_float (6.1.4) - FBLazyVector (0.77.3) @@ -195,11 +195,28 @@ PODS: - nanopb/encode (= 2.30910.0) - nanopb/decode (2.30910.0) - nanopb/encode (2.30910.0) - - op-sqlite (9.2.7): + - op-sqlite (15.0.7): + - DoubleConversion + - glog + - hermes-engine - OpenSSL-Universal - - React - - React-callinvoker + - RCT-Folly (= 2024.11.18.00) + - RCTRequired + - RCTTypeSafety - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - Yoga - OpenSSL-Universal (3.3.3001) - PromisesObjC (2.4.0) - PromisesSwift (2.4.0): @@ -1508,8 +1525,6 @@ PODS: - Yoga - react-native-safe-area-context (5.2.0): - React-Core - - react-native-splash-screen (3.2.0): - - React - react-native-video (6.10.0): - DoubleConversion - glog @@ -1888,15 +1903,11 @@ PODS: - React - RNCAsyncStorage (2.0.0): - React-Core - - RNCMaskedView (0.3.1): - - React-Core - RNCPicker (2.11.0): - React-Core - - RNCPushNotificationIOS (1.10.1): - - React-Core - RNDateTimePicker (8.2.0): - React-Core - - RNDeviceInfo (13.0.0): + - RNDeviceInfo (14.0.4): - React-Core - RNFastImage (8.6.3): - React-Core @@ -1922,8 +1933,6 @@ PODS: - RNFBML (20.1.0): - React-Core - RNFBApp - - RNFileViewer (2.1.5): - - React-Core - RNGestureHandler (2.23.1): - DoubleConversion - glog @@ -1949,9 +1958,14 @@ PODS: - React-Core - RNLocalize (3.2.1): - React-Core - - RNPermissions (4.1.5): + - RNNotifee (9.1.8): - React-Core - - RNReanimated (3.16.1): + - RNNotifee/NotifeeCore (= 9.1.8) + - RNNotifee/NotifeeCore (9.1.8): + - React-Core + - RNPermissions (5.4.2): + - React-Core + - RNReanimated (3.16.7): - DoubleConversion - glog - hermes-engine @@ -1971,10 +1985,10 @@ PODS: - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - RNReanimated/reanimated (= 3.16.1) - - RNReanimated/worklets (= 3.16.1) + - RNReanimated/reanimated (= 3.16.7) + - RNReanimated/worklets (= 3.16.7) - Yoga - - RNReanimated/reanimated (3.16.1): + - RNReanimated/reanimated (3.16.7): - DoubleConversion - glog - hermes-engine @@ -1994,9 +2008,9 @@ PODS: - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - RNReanimated/reanimated/apple (= 3.16.1) + - RNReanimated/reanimated/apple (= 3.16.7) - Yoga - - RNReanimated/reanimated/apple (3.16.1): + - RNReanimated/reanimated/apple (3.16.7): - DoubleConversion - glog - hermes-engine @@ -2017,7 +2031,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - RNReanimated/worklets (3.16.1): + - RNReanimated/worklets (3.16.7): - DoubleConversion - glog - hermes-engine @@ -2098,8 +2112,6 @@ PODS: - SDWebImage/Core (~> 5.10) - SocketRocket (0.7.1) - SSZipArchive (2.6.0) - - TouchID (4.4.1): - - React - VisionCamera (4.7.1): - VisionCamera/Core (= 4.7.1) - VisionCamera/React (= 4.7.1) @@ -2171,7 +2183,6 @@ DEPENDENCIES: - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)" - react-native-pager-view (from `../node_modules/react-native-pager-view`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - - react-native-splash-screen (from `../node_modules/react-native-splash-screen`) - react-native-video (from `../node_modules/react-native-video`) - react-native-view-shot (from `../node_modules/react-native-view-shot`) - react-native-webview (from `../node_modules/react-native-webview`) @@ -2206,9 +2217,7 @@ DEPENDENCIES: - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - RNCalendarEvents (from `../node_modules/react-native-calendar-events`) - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)" - "RNCPicker (from `../node_modules/@react-native-picker/picker`)" - - "RNCPushNotificationIOS (from `../node_modules/@react-native-community/push-notification-ios`)" - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)" - RNDeviceInfo (from `../node_modules/react-native-device-info`) - RNFastImage (from `../node_modules/react-native-fast-image`) @@ -2217,10 +2226,10 @@ DEPENDENCIES: - "RNFBCrashlytics (from `../node_modules/@react-native-firebase/crashlytics`)" - "RNFBMessaging (from `../node_modules/@react-native-firebase/messaging`)" - "RNFBML (from `../node_modules/@react-native-firebase/ml`)" - - RNFileViewer (from `../node_modules/react-native-file-viewer`) - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - RNInAppBrowser (from `../node_modules/react-native-inappbrowser-reborn`) - RNLocalize (from `../node_modules/react-native-localize`) + - "RNNotifee (from `../node_modules/@notifee/react-native`)" - RNPermissions (from `../node_modules/react-native-permissions`) - RNReanimated (from `../node_modules/react-native-reanimated`) - RNScreens (from `../node_modules/react-native-screens`) @@ -2229,7 +2238,6 @@ DEPENDENCIES: - "RNSwanBrowser (from `../node_modules/@swan-io/react-native-browser`)" - RNVectorIcons (from `../node_modules/react-native-vector-icons`) - SSZipArchive - - TouchID (from `../node_modules/react-native-touch-id`) - VisionCamera (from `../node_modules/react-native-vision-camera`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) @@ -2363,8 +2371,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-pager-view" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" - react-native-splash-screen: - :path: "../node_modules/react-native-splash-screen" react-native-video: :path: "../node_modules/react-native-video" react-native-view-shot: @@ -2433,12 +2439,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-calendar-events" RNCAsyncStorage: :path: "../node_modules/@react-native-async-storage/async-storage" - RNCMaskedView: - :path: "../node_modules/@react-native-masked-view/masked-view" RNCPicker: :path: "../node_modules/@react-native-picker/picker" - RNCPushNotificationIOS: - :path: "../node_modules/@react-native-community/push-notification-ios" RNDateTimePicker: :path: "../node_modules/@react-native-community/datetimepicker" RNDeviceInfo: @@ -2455,14 +2457,14 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-firebase/messaging" RNFBML: :path: "../node_modules/@react-native-firebase/ml" - RNFileViewer: - :path: "../node_modules/react-native-file-viewer" RNGestureHandler: :path: "../node_modules/react-native-gesture-handler" RNInAppBrowser: :path: "../node_modules/react-native-inappbrowser-reborn" RNLocalize: :path: "../node_modules/react-native-localize" + RNNotifee: + :path: "../node_modules/@notifee/react-native" RNPermissions: :path: "../node_modules/react-native-permissions" RNReanimated: @@ -2477,8 +2479,6 @@ EXTERNAL SOURCES: :path: "../node_modules/@swan-io/react-native-browser" RNVectorIcons: :path: "../node_modules/react-native-vector-icons" - TouchID: - :path: "../node_modules/react-native-touch-id" VisionCamera: :path: "../node_modules/react-native-vision-camera" Yoga: @@ -2486,7 +2486,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90 - BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 + BVLinearGradient: cb006ba232a1f3e4f341bb62c42d1098c284da70 DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6 FBLazyVector: 23d8c5470c648a635893dc0956c6dbaead54b656 @@ -2512,115 +2512,111 @@ SPEC CHECKSUMS: libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d nanopb: 438bc412db1928dac798aa6fd75726007be04262 - op-sqlite: 619906dc2ed9c1fcc33ff455eb52fa10bda5e70c + op-sqlite: b5eb118d8b0b494bf1da64c4b7b7b5f5897d1579 OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 QRCodeReader.swift: 373a389fe9a22d513c879a32a6f647c58f4ef572 - RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809 + RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82 RCTDeprecation: 6ee92578d332db1d4e03267d3ae98bcf8b780863 RCTRequired: 5b3da0e0f91fddda935574b81748c3e3d3649ee7 RCTTypeSafety: 870cb072be3d3f310ecec897c3d297a931f8f7e1 React: 535fa5014fb1743f6654a980acb16dae339e1944 React-callinvoker: dd1ecd51f8d3c76a551afdf6dab6d51c1ead5501 - React-Core: cd2530a1bcf14af3e34cd7561ee36916079a8e7f - React-CoreModules: d4fec6cceab80b9e22b5a45036ee431b5a69b102 - React-cxxreact: 3d3010b4ccd33458ab12bfbbc1b05402e17e4a98 + React-Core: a3e36c059a195bd213d005db36c9e68957b78632 + React-CoreModules: 46467a2b34b053eb7262104e07bf5d835a9afe77 + React-cxxreact: 500e7b011a14eeefdcf6c0eb982fe4db055c2670 React-debug: 41315631a01cf5cc3c9498482b97be21c49f8e8d - React-defaultsnativemodule: dcb237a582ed8d46e74e4c38c90f8e29895a0812 - React-domnativemodule: 4cc53a9f19dae2514b56357c8a148601b5376c13 - React-Fabric: 2203020455994c14a6b0eed5fe206ba11c51d28b - React-FabricComponents: d1e35a9d7660cb57ec31ae7730cf30fabb07039a - React-FabricImage: 34de81a326d87d9a3a0d54c285dc518a9e896ce1 + React-defaultsnativemodule: a06364257949e77dc39bcfd08e2d801c189bb58c + React-domnativemodule: dcda8a2b62bb34ed5db94470a3a72f32a76e1e31 + React-Fabric: dc1d3aa4b6a92e4a703c02ca6c4add312754eb84 + React-FabricComponents: 451f7b72aa80001520a20747b7b1e21350d6fba8 + React-FabricImage: 15c3bfe577a60c492134519219627316fb48af05 React-featureflags: 08f06c820a37b29ed3ef9dddc6763c086339bc28 - React-featureflagsnativemodule: e4c016c273fccd39e5c0425dbf552ae3ba6f557c - React-graphics: 34008ef25e81687b5b89d6fe1ebc167c3414fd8b - React-hermes: 997737a07bc954d032ba808a85d367c1e4eee2d9 - React-idlecallbacksnativemodule: ad58b5d392ca3257511ea81c496d068face8bcee - React-ImageManager: a9e52d60226e1994b432bf7cc9d58b36a935eeb6 - React-jserrorhandler: 1e06734dfb99a87b1d9db3954e2fb680e1483a77 - React-jsi: a7f1b8eb4319e2fc664e1761ce04ab0ad4a51e2a - React-jsiexecutor: 58d404bda9a46fa8822d556942c04b3020e214c7 - React-jsinspector: 75717c9002cb6b590692ebb237ad1fce5f600aba - React-jsitracing: 62b9f496758ea6aff6fb7021b4b8e05da7e460c5 - React-logger: 094beeb633228cb5d7a1b7235e21c77f901eb1a6 - React-Mapbuffer: ac43f5b92893ee6cba15a712b211191f9dfbf089 - React-microtasksnativemodule: c32cbd3d9c334a51311ab9d717e2c72c7032a256 - react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e - react-native-blob-util: 64a732c0b8bb7f4928905e16ea8dc5cde6fb4832 - react-native-cameraroll: fa835a59246b90ad2fa33c5e008fc25752ba7b80 - react-native-geocoder: 757427682892bb256f3b3745858cc90eba148a8e - react-native-geolocation: 8559551683956a104cd6953a51f53edcef7a998f - react-native-google-maps: 94df984b1647973baffe17c0b7b52828d6b69d94 - react-native-image-picker: f104798044ef2c9211c42a48025d0693b5f34981 - react-native-maps: cbf2f03bfeebfd7ec45966b066db13a075fd2af3 - react-native-netinfo: f0a9899081c185db1de5bb2fdc1c88c202a059ac - react-native-pager-view: c3b8efd9000368320e3710c01f38a83bd2170779 - react-native-safe-area-context: 849d7df29ecb2a7155c769c0b76849ba952c2aa3 - react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 - react-native-video: fcf88c7e93d7736a529f97f70ce92269684596ec - react-native-view-shot: 9aea6ab99c8d81590d6b630d62a418ced77d1ed7 - react-native-webview: 326a2163c7117fd5b21e48c857b2946f0a7af598 + React-featureflagsnativemodule: 3f6b19ac469a5d26e3a52e5198735c1799f1e324 + React-graphics: df8448a604e8fd03325e0f3d760b13e57416871c + React-hermes: 67f3ee00fdbe085e722fd89811073678ba28c10a + React-idlecallbacksnativemodule: 26de008466429c4a6feb772cde37d3eda5c1e045 + React-ImageManager: 52a8c48c4c7c5a8124e8c363693bd2908b01c5f6 + React-jserrorhandler: faa483d54dd358b11e81adcd5e6373da6030ed70 + React-jsi: d5332d79759159a0127348d9b20cc90527dd40e8 + React-jsiexecutor: 72c8df1af2c18736f6685cce4205c480f3783039 + React-jsinspector: e444c5725dbb31aa7ce556d972511f8997b38bc5 + React-jsitracing: 955646960c72c03e6e87df8706cab6bcdf960042 + React-logger: a23563f96a622637d7cce687bdf304929104effd + React-Mapbuffer: 1864935968d15b9b73d8e413d29c780f0ab50038 + React-microtasksnativemodule: 3b784cf40f7c3c9500b9a5f9e4eec5c9bbfbef8f + react-native-ble-plx: 2dd8780ee8d34c60399aaa897249ed1860ebef10 + react-native-blob-util: b653f7dae5c9fa3f903af51bc2edfb8ef659022b + react-native-cameraroll: 0d805139369f07b822f51841801429a4049e1234 + react-native-geocoder: bc977303c9c53cce36bcdb3c6f17e6832f86beb6 + react-native-geolocation: 697f7e4206386120bfdcf0c6a858e956360c734c + react-native-google-maps: 992905591a0a9315b8e74faecadd72f039e41dda + react-native-image-picker: 8c8f120521f283d7a069c51d519fbd654e8de8e3 + react-native-maps: deb2adbdf309b622f15055b72b8742054929c740 + react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187 + react-native-pager-view: 68e8a65a607a6f91a1e25865002192c3c4f53fcf + react-native-safe-area-context: 3e33e7c43c8b74dba436a5a32651cb8d7064c740 + react-native-video: 75279235027642749f1da92c456b10860c3aa13a + react-native-view-shot: 16b52ee447420cb06810b8dd05b711d3f978efb4 + react-native-webview: 2cf4fe62b06f9ac42f92d1e2bb1345a407a13a57 React-nativeconfig: f77b4627803bf7886a1f2e96b33b8af34e583cc4 - React-NativeModulesApple: 6bfb56c8a05c9181727a4375c6fce152171c038d - React-perflogger: 6820403fcb3daf843cb89772f2ba7b25cf7d5797 - React-performancetimeline: 7bcddde49ca791c27191250c4827ad1e94004b24 + React-NativeModulesApple: dfa86c79c621f2a9cdb39636570c2e1623b71367 + React-perflogger: 1f83401f01544142b32151ef6c66870455c64994 + React-performancetimeline: 514430bf73208debfb0b9981fdab0e3e67987447 React-RCTActionSheet: f8f5545f473a87a8ab124046fe58905b82c55322 - React-RCTAnimation: d00f43f3fb0be43b737eea902da35b60259ac581 - React-RCTAppDelegate: 950e65c2350e62fb5455d02e30e8656b90986963 - React-RCTBlob: 29fd1faf27ceb029229dea40214cac6f11f80160 - React-RCTFabric: b9202e58f1db84cf43091ed9fb753cf38441a0a5 - React-RCTFBReactNativeSpec: 623d837b7ba7f02c5ad5282b8de3b69ff5a3e96d - React-RCTImage: 29536152820fe9e8f6faeca4456593cbf8deef3f - React-RCTLinking: 95526e0b3561c5aa92f5cb6fb0260632aacae8b6 - React-RCTNetwork: b4d4f4e0df5ae22befbdc9803f2729586be15155 - React-RCTSettings: db763df8a5177dd99f0848abdefed604e423ee82 - React-RCTText: c9925bc59a549645fc34265631626701f208b31a - React-RCTVibration: 95fee529d0734f88d889fdb0926d8fdd2f14deb8 + React-RCTAnimation: bb5332589ee135a4b3e06f9475659ae73a36f669 + React-RCTAppDelegate: f1504dd62d2c16d85840698539a2a3163d629072 + React-RCTBlob: 9305f10874660b7d7bd02f6567e1b97c29b5cc43 + React-RCTFabric: 8ca1af21e65c1f1fe2fff1f3e931b1e74f7c552a + React-RCTFBReactNativeSpec: 288abdd04806d4a5e9a079717011bf5fa281eaf7 + React-RCTImage: f099c09decb34b6849518e85aa8cd6318381ed98 + React-RCTLinking: ab70f4b60e21b0abb8c2adc58ae0460cffecdd8f + React-RCTNetwork: ba84704fa893dcc090d5028b932ed049332b9e6f + React-RCTSettings: bad043f6652f2641fccf9654c3f789e970ca63c8 + React-RCTText: bed66ec05d4dedfc48d6db8d3cf60e714b2d010d + React-RCTVibration: 22179961d1aadd7996355785c490c134037de1d9 React-rendererconsistency: 9f5292176e629370402cbfe4e88c19b3c68e79a3 - React-rendererdebug: 16789da121f8bdc939d51cdc6462a34707e6af42 + React-rendererdebug: 1d63129046b7a8624f0a5d2cb4cc4a1dda41eeaf React-rncore: 8a77fbb638aab2ef0a3e4e122ddc5310a8299699 - React-RuntimeApple: 6e622ffd3f434847f97fb39215130962f84e184c - React-RuntimeCore: 30fa3ab46a71c71220605b67e22e3930be1e69b7 + React-RuntimeApple: cf68b82dc184c7f8855aa6bae298b4b24880d549 + React-RuntimeCore: 98ab2e46540d3560712334257b01d6305c0cb422 React-runtimeexecutor: 2dc71d251ce5630b11d384bc80d7fbb9d9d93623 - React-RuntimeHermes: bc562eeae932000894a072e9ab3ff5b24d04a87b - React-runtimescheduler: 1fc66730e3502512adb9ac24831938285a36f310 + React-RuntimeHermes: 7cc49896e48214abee8f2a9bf91e7a91606ff018 + React-runtimescheduler: a51c3e414e288f3ab876b8b6e50e89c805ffd704 React-timing: 7d80ad4297c57ec4cb49da4a5db1b82f93fedb2a - React-utils: 1dfda6bd64373a4bd19efa4d48ac0756a2bc8dff - ReactAppDependencyProvider: 9b3704075c2fe8fd7c739779655fb88700a1ca30 - ReactCodegen: c9645fb81bcaf5afebaebb25874bcd5224cd40f1 - ReactCommon: 271491c2343c91609d3dc18bb4b4ebe67160de03 - RNCalendarEvents: 3a79bc6e476b55920aa706c211a15a1d2c53ec17 - RNCAsyncStorage: d35c79ffba52c1013013e16b1fc295aec2feabb6 - RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906 - RNCPicker: 4f6d5e8d107064be32dfc8f1bcb5a3741135db0b - RNCPushNotificationIOS: 87b8d16d3ede4532745e05b03c42cff33a36cc45 - RNDateTimePicker: 40ffda97d071a98a10fdca4fa97e3977102ccd14 - RNDeviceInfo: 55264dd7cc939dad6e9c231a7621311f5277f1dc - RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8 - RNFBAnalytics: d5570f8c8259452915cca097d93239a1f631eff8 - RNFBApp: 1ae7462cddf74a49df206d3418bc0170f8fa53e5 - RNFBCrashlytics: f8e899ea95991b769802cf4cb7a0eb362b6ab0f7 - RNFBMessaging: 85f661b9f16e2b081e6809ef63d3daa4458b9042 - RNFBML: 617f875def61029d0c4632af07bde4be4c76bff0 - RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592 - RNGestureHandler: de78ee811b577ae76d679715e5e9298b23a8c278 - RNInAppBrowser: 3ff3a3b8f458aaf25aaee879d057352862edf357 - RNLocalize: 4f22418187ecd5ca693231093ff1d912d1b3c9bc - RNPermissions: 337dcb2adb1b49dd9ec27b652fc6b28fc52478f5 - RNReanimated: 280140e1989bc33d5586cbca10bd199fd1fbdbf1 - RNScreens: e9bb7c3063237983e75d01bb45ce591cc4e7afc2 - RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0 - RNSVG: 515a902fc18a375907eb4c3abec0b803fbfa37ef - RNSwanBrowser: af8718931e79c8077be3cf021d1bc270ae666503 - RNVectorIcons: 85ed086927e7548461d593e68b190c38a6606a05 + React-utils: 6b632afea2c4ec4b782497fb61af859a5b1b355f + ReactAppDependencyProvider: 31015410a4a53b9fd0a908ad4d6e3e2b9a25086a + ReactCodegen: eac5d74d85dff515b48a5c36f154bc4128f217e6 + ReactCommon: bf4612cba0fa356b529385029f470d5529dddde4 + RNCalendarEvents: 1a67c97e7427cf16fbf60adbb4c11c0d62082eaa + RNCAsyncStorage: 40367e8d25522dca9c3513c7b9815a184669bd97 + RNCPicker: 124b4fb5859ba1a3fd53a91e16d1e7a0fc016e59 + RNDateTimePicker: 818460dc31b0dc5ec58289003e27dd8d022fb79c + RNDeviceInfo: d863506092aef7e7af3a1c350c913d867d795047 + RNFastImage: 462a183c4b0b6b26fdfd639e1ed6ba37536c3b87 + RNFBAnalytics: 2d5a256a65b42748763b5420a7a0a7d03d8d4ddc + RNFBApp: a04e05e3ad4c3e6a2a84cf714f6845ec2cf5d73d + RNFBCrashlytics: c6fb94c74a60c96a2aab77a1ace11ae85848d65e + RNFBMessaging: 6d244fcbdf8489869facfefb4ddf17386e234f68 + RNFBML: 08783a26be74283e4f3279730afdbdec9ae40c8e + RNGestureHandler: 9bf6e8f72d2e72c8f7eb45986fe71a5005fb072d + RNInAppBrowser: 031138591f9cbf57e987d0fe97f4e73d5fc7524b + RNLocalize: e7378161f0b6a6365407eb2377aab46cc38047d8 + RNNotifee: 5e3b271e8ea7456a36eec994085543c9adca9168 + RNPermissions: a4f47362ad585ea7a9a84d03288f18d22c54595d + RNReanimated: 9821995bd24f989b2618eac9510dc86c14d0a5df + RNScreens: 86e5c168cdd055a8feead28eb756ca7103918b6a + RNSound: 436aa4de81ae87b90e1781b5dd9247df3aa4622a + RNSVG: 4903d466c3a877644d5219dbc1d97f9ef9e4a3cc + RNSwanBrowser: 53cc60ef6550708a1f2d8284af63dbc2d760cd8f + RNVectorIcons: f7a99433a71f4b38891c14c64b21fc521d064392 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea - TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4 - VisionCamera: 0ecfede218b2d989be3d504270b71f3d2384d95d - Yoga: 7d51419602153919f32aec72812e324d495ee49d + VisionCamera: 9a8f98ae344fe5d148f84bb45829f9e4caab9d2f + Yoga: 92f3bb322c40a86b7233b815854730442e01b8c4 PODFILE CHECKSUM: a8ba4f8aa949fc78ec2919cd1aa7c8a2626f3a37 diff --git a/package-lock.json b/package-lock.json index 724cf05..a92a62f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "dependencies": { "@gorhom/bottom-sheet": "^5.1.1", "@mendix/native": "9.1.0", + "@notifee/react-native": "9.1.8", "@op-engineering/op-sqlite": "9.2.7", "@react-native-async-storage/async-storage": "2.0.0", "@react-native-camera-roll/camera-roll": "7.4.0", @@ -21,7 +22,6 @@ "@react-native-community/datetimepicker": "8.2.0", "@react-native-community/geolocation": "3.4.0", "@react-native-community/netinfo": "11.4.1", - "@react-native-community/push-notification-ios": "1.10.1", "@react-native-firebase/analytics": "20.1.0", "@react-native-firebase/app": "20.1.0", "@react-native-firebase/crashlytics": "20.1.0", @@ -47,7 +47,6 @@ "react-native-maps": "1.14.0", "react-native-pager-view": "6.4.1", "react-native-permissions": "4.1.5", - "react-native-push-notification": "8.1.1", "react-native-reanimated": "3.16.1", "react-native-safe-area-context": "5.2.0", "react-native-schedule-exact-alarm-permission": "^0.1.5", @@ -2044,6 +2043,15 @@ "node": ">= 8" } }, + "node_modules/@notifee/react-native": { + "version": "9.1.8", + "resolved": "https://registry.npmjs.org/@notifee/react-native/-/react-native-9.1.8.tgz", + "integrity": "sha512-Az/dueoPerJsbbjRxu8a558wKY+gONUrfoy3Hs++5OqbeMsR0dYe6P+4oN6twrLFyzAhEA1tEoZRvQTFDRmvQg==", + "license": "Apache-2.0", + "peerDependencies": { + "react-native": "*" + } + }, "node_modules/@op-engineering/op-sqlite": { "version": "9.2.7", "resolved": "https://registry.npmjs.org/@op-engineering/op-sqlite/-/op-sqlite-9.2.7.tgz", @@ -2538,18 +2546,6 @@ "react-native": ">=0.59" } }, - "node_modules/@react-native-community/push-notification-ios": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@react-native-community/push-notification-ios/-/push-notification-ios-1.10.1.tgz", - "integrity": "sha512-k6bZWUKLif4GjenyTD3aQLwA2VT3bNmt22INO/34lexnpmqkPDZF7nreqbckTHG0Zso9wDTe4N/AZJUC/d8iRg==", - "dependencies": { - "invariant": "^2.2.4" - }, - "peerDependencies": { - "react": ">=16.6.3", - "react-native": ">=0.58.4" - } - }, "node_modules/@react-native-firebase/analytics": { "version": "20.1.0", "resolved": "https://registry.npmjs.org/@react-native-firebase/analytics/-/analytics-20.1.0.tgz", @@ -7840,15 +7836,6 @@ } } }, - "node_modules/react-native-push-notification": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/react-native-push-notification/-/react-native-push-notification-8.1.1.tgz", - "integrity": "sha512-XpBtG/w+a6WXTxu6l1dNYyTiHnbgnvjoc3KxPTxYkaIABRmvuJZkFxqruyGvfCw7ELAlZEAJO+dthdTabCe1XA==", - "peerDependencies": { - "@react-native-community/push-notification-ios": "^1.10.1", - "react-native": ">=0.33" - } - }, "node_modules/react-native-reanimated": { "version": "3.16.1", "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.16.1.tgz", @@ -10807,6 +10794,11 @@ "fastq": "^1.6.0" } }, + "@notifee/react-native": { + "version": "9.1.8", + "resolved": "https://registry.npmjs.org/@notifee/react-native/-/react-native-9.1.8.tgz", + "integrity": "sha512-Az/dueoPerJsbbjRxu8a558wKY+gONUrfoy3Hs++5OqbeMsR0dYe6P+4oN6twrLFyzAhEA1tEoZRvQTFDRmvQg==" + }, "@op-engineering/op-sqlite": { "version": "9.2.7", "resolved": "https://registry.npmjs.org/@op-engineering/op-sqlite/-/op-sqlite-9.2.7.tgz", @@ -11166,14 +11158,6 @@ "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-11.4.1.tgz", "integrity": "sha512-B0BYAkghz3Q2V09BF88RA601XursIEA111tnc2JOaN7axJWmNefmfjZqw/KdSxKZp7CZUuPpjBmz/WCR9uaHYg==" }, - "@react-native-community/push-notification-ios": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@react-native-community/push-notification-ios/-/push-notification-ios-1.10.1.tgz", - "integrity": "sha512-k6bZWUKLif4GjenyTD3aQLwA2VT3bNmt22INO/34lexnpmqkPDZF7nreqbckTHG0Zso9wDTe4N/AZJUC/d8iRg==", - "requires": { - "invariant": "^2.2.4" - } - }, "@react-native-firebase/analytics": { "version": "20.1.0", "resolved": "https://registry.npmjs.org/@react-native-firebase/analytics/-/analytics-20.1.0.tgz", @@ -14849,11 +14833,6 @@ "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-4.1.5.tgz", "integrity": "sha512-r6VMRacASmtRHS+GZ+5HQCp9p9kiE+UU9magHOZCXZLTJitdTuVHWZRrb4v4oqZGU+zAp3mZhTQftuMMv+WLUg==" }, - "react-native-push-notification": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/react-native-push-notification/-/react-native-push-notification-8.1.1.tgz", - "integrity": "sha512-XpBtG/w+a6WXTxu6l1dNYyTiHnbgnvjoc3KxPTxYkaIABRmvuJZkFxqruyGvfCw7ELAlZEAJO+dthdTabCe1XA==" - }, "react-native-reanimated": { "version": "3.16.1", "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.16.1.tgz", diff --git a/package.json b/package.json index 96f15e1..3f9fe51 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "dependencies": { "@gorhom/bottom-sheet": "^5.1.1", "@mendix/native": "9.1.0", + "@notifee/react-native": "9.1.8", "@op-engineering/op-sqlite": "9.2.7", "@react-native-async-storage/async-storage": "2.0.0", "@react-native-camera-roll/camera-roll": "7.4.0", @@ -29,7 +30,6 @@ "@react-native-community/datetimepicker": "8.2.0", "@react-native-community/geolocation": "3.4.0", "@react-native-community/netinfo": "11.4.1", - "@react-native-community/push-notification-ios": "1.10.1", "@react-native-firebase/analytics": "20.1.0", "@react-native-firebase/app": "20.1.0", "@react-native-firebase/crashlytics": "20.1.0", @@ -56,7 +56,6 @@ "react-native-maps": "1.14.0", "react-native-pager-view": "6.4.1", "react-native-permissions": "4.1.5", - "react-native-push-notification": "8.1.1", "react-native-reanimated": "3.16.1", "react-native-safe-area-context": "5.2.0", "react-native-schedule-exact-alarm-permission": "^0.1.5", diff --git a/patches/react-native-push-notification+8.1.1.patch b/patches/react-native-push-notification+8.1.1.patch deleted file mode 100644 index ac0a91b..0000000 --- a/patches/react-native-push-notification+8.1.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java b/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java -index 248ff08..4316500 100644 ---- a/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java -+++ b/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java -@@ -171,6 +171,13 @@ public class RNPushNotificationHelper { - return; - } - -+ -+ // Call canScheduleExactAlarms to confirm the user has allowed alarms to be set. otherwise, -+ // attempting to set an alarm below will crash the app! -+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !getAlarmManager().canScheduleExactAlarms()) { -+ return; -+ } -+ - Log.d(LOG_TAG, String.format("Setting a notification with id %s at time %s", - bundle.getString("id"), Long.toString(fireDate))); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {