adjust android compatibility

Author: fadi-george

android/build.gradle

@@ -1,10 +1,12 @@
 apply plugin: 'com.android.library'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 android {
+    namespace "com.onesignal.rnonesignalandroid"
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
 
@@ -18,8 +20,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
     }
 }
 

android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.onesignal.rnonesignalandroid">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

examples/RNOneSignalTS/OSDemo.tsx

@@ -1,15 +1,19 @@
 import { useFocusEffect } from '@react-navigation/native';
 import React, { useCallback, useEffect, useState } from 'react';
 import {
-  Alert,
   ScrollView,
   StyleSheet,
   Text,
   TextInput,
   TouchableOpacity,
   View,
 } from 'react-native';
-import { LogLevel, OneSignal } from 'react-native-onesignal';
+import {
+  LogLevel,
+  NotificationClickEvent,
+  NotificationWillDisplayEvent,
+  OneSignal,
+} from 'react-native-onesignal';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import OSButtons from './OSButtons';
 import OSConsole from './OSConsole';
@@ -37,44 +41,51 @@ const OSDemo: React.FC = () => {
   }, []);
 
   const onForegroundWillDisplay = useCallback(
-    (event: unknown) => {
-      OSLog('OneSignal: notification will show in foreground:', event);
-      const notif = (
-        event as { getNotification: () => { title: string } }
-      ).getNotification();
+    (event: NotificationWillDisplayEvent) => {
+      const notif = event.getNotification();
+      OSLog('OneSignal: notification will show in foreground:', notif.title);
+      console.log('Will display notification event:', notif);
 
-      const cancelButton = {
-        text: 'Cancel',
-        onPress: () => {
-          (event as { preventDefault: () => void }).preventDefault();
-        },
-        style: 'cancel' as const,
-      };
+      event.preventDefault();
 
-      const completeButton = {
-        text: 'Display',
-        onPress: () => {
-          (event as { getNotification: () => { display: () => void } })
-            .getNotification()
-            .display();
-        },
-      };
+      setTimeout(() => {
+        notif.display();
+      }, 5000);
 
-      Alert.alert(
-        'Display notification?',
-        notif.title,
-        [cancelButton, completeButton],
-        {
-          cancelable: true,
-        },
-      );
+      // const cancelButton = {
+      //   text: 'Cancel',
+      //   onPress: () => {
+      //     (event as { preventDefault: () => void }).preventDefault();
+      //   },
+      //   style: 'cancel' as const,
+      // };
+
+      // const completeButton = {
+      //   text: 'Display',
+      //   onPress: () => {
+      //     (event as { getNotification: () => { display: () => void } })
+      //       .getNotification()
+      //       .display();
+      //   },
+      // };
+
+      // Alert.alert(
+      //   'Display notification?',
+      //   notif.title,
+      //   [cancelButton, completeButton],
+      //   {
+      //     cancelable: true,
+      //   },
+      // );
     },
     [OSLog],
   );
 
   const onNotificationClick = useCallback(
-    (event: unknown) => {
-      OSLog('OneSignal: notification clicked:', event);
+    (event: NotificationClickEvent) => {
+      const notif = event.notification;
+      OSLog('OneSignal: notification clicked:', notif.title);
+      console.log('Notification clicked event:', notif);
     },
     [OSLog],
   );

examples/RNOneSignalTS/setup.sh

@@ -9,6 +9,6 @@ bun pm pack
 mv react-native-onesignal-*.tgz react-native-onesignal.tgz
 
 # Use fresh install of the package
-cd $ORIGINAL_DIR
+cd "$ORIGINAL_DIR"
 bun pm cache rm
 bun i