-iOS Toast Enhancement

KhubaibKhan4 · Sep 25, 2024 · 0e92a71 · 0e92a71
1 parent a455bf2
commit 0e92a71
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/alert-kmp/build.gradle.kts b/alert-kmp/build.gradle.kts
@@ -75,7 +75,7 @@ mavenPublishing {
     coordinates(
         groupId = "io.github.khubaibkhan4",
         artifactId = "alert-kmp",
-        version = "1.0.4"
+        version = "1.0.5"
     )
 
     // Configure POM metadata for the published artifact

diff --git a/alert-kmp/src/iosMain/kotlin/NativeNotify.ios.kt b/alert-kmp/src/iosMain/kotlin/NativeNotify.ios.kt
@@ -15,28 +15,38 @@ import platform.UserNotifications.UNNotificationRequest
 import platform.UserNotifications.UNNotificationSound
 import platform.UserNotifications.UNTimeIntervalNotificationTrigger
 import platform.UserNotifications.UNUserNotificationCenter
+import platform.darwin.dispatch_async
+import platform.darwin.dispatch_get_main_queue
 
 actual fun Notify(message: String, duration: NotificationDuration) {
-    val viewController = UIApplication.sharedApplication.keyWindow?.rootViewController?.modalViewController
-    val alertController = UIAlertController.alertControllerWithTitle(
-        title = UIDevice.currentDevice.systemName,
-        message = message,
-        preferredStyle = UIAlertControllerStyle.MAX_VALUE
-    )
-    alertController.addAction(
-        UIAlertAction.actionWithTitle(
-            "OK",
-            style = UIAlertControllerStyle.MAX_VALUE,
-            handler = null
+    val viewController = UIApplication.sharedApplication.keyWindow?.rootViewController
+    if (viewController != null) {
+        val alertController = UIAlertController.alertControllerWithTitle(
+            title = UIDevice.currentDevice.systemName,
+            message = message,
+            preferredStyle = UIAlertControllerStyleAlert
         )
-    )
-    viewController?.presentViewController(alertController, animated = true, completion = {
-        val delay = if (duration == NotificationDuration.LONG) 3.0 else 1.5
-        NSTimer.scheduledTimerWithTimeInterval(delay, repeats = false) {
-            alertController.dismissViewControllerAnimated(true, completion = null)
+        alertController.addAction(
+            UIAlertAction.actionWithTitle(
+                "OK",
+                style = UIAlertActionStyleDefault,
+                handler = null
+            )
+        )
+
+        dispatch_async(dispatch_get_main_queue()) {
+            viewController.presentViewController(alertController, animated = true, completion = {
+                val delay = if (duration == NotificationDuration.LONG) 3.0 else 1.5
+                NSTimer.scheduledTimerWithTimeInterval(delay, repeats = false) {
+                    alertController.dismissViewControllerAnimated(true, completion = null)
+                }
+            })
         }
-    })
+    } else {
+        NSLog("Error: rootViewController is null")
+    }
 }
+
 actual fun createNotification(type: NotificationType): Notification = when (type) {
     NotificationType.ALERT -> object : Notification() {
         override fun show(message: String) {