react-native-nitro-simple-toast 0.1.0 → 0.1.1-beta.1

package/android/build.gradle

@@ -17,6 +17,7 @@ buildscript {
   repositories {
     google()
     mavenCentral()
+    maven { url 'https://jitpack.io' }
   }
 
   dependencies {
@@ -112,7 +113,12 @@ android {
   }
 }
 
+repositories {
+  maven { url 'https://jitpack.io' }
+}
+
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation project(":react-native-nitro-modules")
+  implementation 'com.github.getActivity:EasyWindow:10.62'
 }

package/android/src/main/java/com/margelo/nitro/nitrosimpletoast/NitroSimpleToast.kt

@@ -1,44 +1,134 @@
 package com.margelo.nitro.nitrosimpletoast
 
+import android.app.Activity
+import android.content.res.Configuration
+import android.graphics.Color
 import android.os.Build
-import android.os.Handler
-import android.os.Looper
 import android.os.VibrationEffect
 import android.os.Vibrator
 import android.os.VibratorManager
-import android.widget.Toast
+import android.util.Log
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import com.facebook.proguard.annotations.DoNotStrip
+import com.hjq.window.EasyWindow
+import com.margelo.nitro.NitroModules
 
 @DoNotStrip
 class NitroSimpleToast : HybridNitroSimpleToastSpec() {
 
+    private var toastWindow: EasyWindow<*>? = null
+
     override fun show(options: ToastOptions): Unit {
-        val context = NitroSimpleToastPackage.appContext ?: return
+        val activity = NitroModules.applicationContext?.currentActivity
+        if (activity == null) {
+            Log.e(TAG, "currentActivity is null, cannot show toast")
+            return
+        }
 
-        Handler(Looper.getMainLooper()).post {
-            val text = if (options.message != null) {
-                "${options.title}\n${options.message}"
-            } else {
-                options.title
+        activity.runOnUiThread {
+            try {
+                showToast(activity, options)
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to show toast", e)
             }
+        }
+    }
+
+    private fun showToast(activity: Activity, options: ToastOptions) {
+        // Dismiss existing toast
+        toastWindow?.cancel()
+
+        // Inflate layout
+        val container = LayoutInflater.from(activity)
+            .inflate(R.layout.toast_layout, null) as LinearLayout
+
+        // Resolve theme
+        val isDark = resolveIsDark(activity, options.theme)
+
+        // Apply background
+        container.setBackgroundResource(
+            if (isDark) R.drawable.toast_bg_dark else R.drawable.toast_bg_light
+        )
+
+        // Text colors
+        val textColor = if (isDark) Color.parseColor("#F5F5F6") else Color.parseColor("#16171A")
+
+        // Title
+        val titleView = container.findViewById<TextView>(R.id.toast_title)
+        titleView.text = options.title
+        titleView.setTextColor(textColor)
+
+        // Message
+        val messageView = container.findViewById<TextView>(R.id.toast_message)
+        if (options.message != null) {
+            messageView.text = options.message
+            messageView.setTextColor(textColor)
+            messageView.visibility = View.VISIBLE
+        }
 
-            val toastDuration = if (options.duration != null && options.duration!! > 2.0) {
-                Toast.LENGTH_LONG
-            } else {
-                Toast.LENGTH_SHORT
+        // Icon based on preset
+        val iconView = container.findViewById<ImageView>(R.id.toast_icon)
+        when (options.preset ?: ToastPreset.DONE) {
+            ToastPreset.DONE -> {
+                iconView.setImageResource(R.drawable.ic_toast_done)
+                iconView.visibility = View.VISIBLE
             }
+            ToastPreset.ERROR -> {
+                iconView.setImageResource(R.drawable.ic_toast_error)
+                iconView.visibility = View.VISIBLE
+            }
+            ToastPreset.NONE -> {
+                iconView.visibility = View.GONE
+            }
+        }
+
+        // Position
+        val isBottom = options.from == ToastFrom.BOTTOM
+        val gravity = if (isBottom) Gravity.BOTTOM else Gravity.TOP
+        val animStyle = if (isBottom) R.style.ToastAnimBottom else R.style.ToastAnimTop
+
+        // Duration in milliseconds (default 3 seconds)
+        val durationMs = ((options.duration ?: 3.0) * 1000).toInt()
+
+        // Show with EasyWindow
+        toastWindow = EasyWindow<EasyWindow<*>>(activity).apply {
+            setDuration(durationMs)
+            setContentView(container)
+            setGravity(gravity)
+            setYOffset(48)
+            setAnimStyle(animStyle)
+            setOutsideTouchable(true)
+        }
+        toastWindow?.show()
+
+        Log.d(TAG, "Toast shown: ${options.title}")
 
-            Toast.makeText(context, text, toastDuration).show()
+        // Haptic
+        performHaptic(options.haptic ?: ToastHaptic.SUCCESS)
+    }
 
-            val haptic = options.haptic ?: ToastHaptic.SUCCESS
-            performHaptic(haptic)
+    private fun resolveIsDark(activity: Activity, theme: ToastTheme?): Boolean {
+        return when (theme ?: ToastTheme.SYSTEM) {
+            ToastTheme.DARK -> true
+            ToastTheme.LIGHT -> false
+            ToastTheme.SYSTEM -> {
+                val nightMode = activity.resources.configuration.uiMode and
+                    Configuration.UI_MODE_NIGHT_MASK
+                nightMode == Configuration.UI_MODE_NIGHT_YES
+            }
         }
     }
 
     private fun performHaptic(haptic: ToastHaptic) {
         if (haptic == ToastHaptic.NONE) return
 
-        val context = NitroSimpleToastPackage.appContext ?: return
+        val reactContext = NitroModules.applicationContext ?: return
+        val context = reactContext.applicationContext
 
         val vibrator = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             val vibratorManager = context.getSystemService(
@@ -63,4 +153,8 @@ class NitroSimpleToast : HybridNitroSimpleToastSpec() {
             vibrator.vibrate(50)
         }
     }
+
+    companion object {
+        private const val TAG = "NitroSimpleToast"
+    }
 }

package/android/src/main/java/com/margelo/nitro/nitrosimpletoast/NitroSimpleToastPackage.kt

@@ -7,7 +7,6 @@ import com.facebook.react.module.model.ReactModuleInfoProvider
 
 class NitroSimpleToastPackage : BaseReactPackage() {
     override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-        appContext = reactContext
         return null
     }
 
@@ -19,8 +18,5 @@ class NitroSimpleToastPackage : BaseReactPackage() {
         init {
             System.loadLibrary("nitrosimpletoast")
         }
-
-        @Volatile
-        var appContext: ReactApplicationContext? = null
     }
 }

package/android/src/main/res/anim/toast_bottom_in.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromYDelta="100%"
+        android:toYDelta="0"
+        android:duration="300"
+        android:interpolator="@android:anim/decelerate_interpolator" />
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:duration="200" />
+</set>

package/android/src/main/res/anim/toast_bottom_out.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromYDelta="0"
+        android:toYDelta="100%"
+        android:duration="300"
+        android:interpolator="@android:anim/accelerate_interpolator" />
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:duration="300" />
+</set>

package/android/src/main/res/anim/toast_top_in.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromYDelta="-100%"
+        android:toYDelta="0"
+        android:duration="300"
+        android:interpolator="@android:anim/decelerate_interpolator" />
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:duration="200" />
+</set>

package/android/src/main/res/anim/toast_top_out.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:fromYDelta="0"
+        android:toYDelta="-100%"
+        android:duration="300"
+        android:interpolator="@android:anim/accelerate_interpolator" />
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:duration="300" />
+</set>

package/android/src/main/res/drawable/ic_toast_done.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#34C759"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+</vector>

package/android/src/main/res/drawable/ic_toast_error.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF3B30"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>

package/android/src/main/res/drawable/toast_bg_dark.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#2B2D33" />
+    <corners android:radius="12dp" />
+</shape>

package/android/src/main/res/drawable/toast_bg_light.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#E2E3E6" />
+    <corners android:radius="12dp" />
+</shape>

package/android/src/main/res/layout/toast_layout.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toast_container"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="12dp"
+    android:minWidth="120dp"
+    android:elevation="4dp">
+
+    <ImageView
+        android:id="@+id/toast_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="10dp"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/toast_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            android:maxLines="1"
+            android:ellipsize="end" />
+
+        <TextView
+            android:id="@+id/toast_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="12sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:layout_marginTop="2dp"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+</LinearLayout>

package/android/src/main/res/values/styles.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ToastAnimTop">
+        <item name="android:windowEnterAnimation">@anim/toast_top_in</item>
+        <item name="android:windowExitAnimation">@anim/toast_top_out</item>
+    </style>
+
+    <style name="ToastAnimBottom">
+        <item name="android:windowEnterAnimation">@anim/toast_bottom_in</item>
+        <item name="android:windowExitAnimation">@anim/toast_bottom_out</item>
+    </style>
+</resources>

package/ios/NitroSimpleToast.swift

@@ -27,6 +27,15 @@ class NitroSimpleToast: HybridNitroSimpleToastSpec {
                 )
             }
 
+            switch options.theme ?? .system {
+            case .light:
+                indicatorView.overrideUserInterfaceStyle = .light
+            case .dark:
+                indicatorView.overrideUserInterfaceStyle = .dark
+            case .system:
+                break
+            }
+
             if let duration = options.duration {
                 indicatorView.duration = duration
             }

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","NitroSimpleToastHybridObject","createHybridObject","toast","options","show"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAGzD,MAAMC,4BAA4B,GAChCD,YAAY,CAACE,kBAAkB,CAAmB,kBAAkB,CAAC;AASvE,OAAO,SAASC,KAAKA,CAACC,OAAqB,EAAQ;EACjDH,4BAA4B,CAACI,IAAI,CAACD,OAAO,CAAC;AAC5C","ignoreList":[]}
+{"version":3,"names":["NitroModules","NitroSimpleToastHybridObject","createHybridObject","toast","options","show"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAGzD,MAAMC,4BAA4B,GAChCD,YAAY,CAACE,kBAAkB,CAAmB,kBAAkB,CAAC;AAUvE,OAAO,SAASC,KAAKA,CAACC,OAAqB,EAAQ;EACjDH,4BAA4B,CAACI,IAAI,CAACD,OAAO,CAAC;AAC5C","ignoreList":[]}

package/lib/typescript/src/NitroSimpleToast.nitro.d.ts

@@ -2,6 +2,7 @@ import type { HybridObject } from 'react-native-nitro-modules';
 export type ToastPreset = 'done' | 'error' | 'none';
 export type ToastHaptic = 'success' | 'warning' | 'error' | 'none';
 export type ToastFrom = 'top' | 'bottom';
+export type ToastTheme = 'light' | 'dark' | 'system';
 export interface ToastOptions {
     title: string;
     message?: string;
@@ -23,6 +24,10 @@ export interface ToastOptions {
      * @platform ios
      */
     from?: ToastFrom;
+    /**
+     * Defaults to `system`.
+     */
+    theme?: ToastTheme;
 }
 export interface NitroSimpleToast extends HybridObject<{
     ios: 'swift';

package/lib/typescript/src/NitroSimpleToast.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NitroSimpleToast.nitro.d.ts","sourceRoot":"","sources":["../../../src/NitroSimpleToast.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAEpD,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;AAEnE,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEzC,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,WAAW,gBACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACzD,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;CACnC"}
+{"version":3,"file":"NitroSimpleToast.nitro.d.ts","sourceRoot":"","sources":["../../../src/NitroSimpleToast.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAEpD,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;AAEnE,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEzC,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;AAErD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,gBACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACzD,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;CACnC"}

package/lib/typescript/src/index.d.ts

@@ -1,4 +1,4 @@
 import type { ToastOptions } from './NitroSimpleToast.nitro';
-export type { ToastOptions, ToastPreset, ToastHaptic, ToastFrom, } from './NitroSimpleToast.nitro';
+export type { ToastOptions, ToastPreset, ToastHaptic, ToastFrom, ToastTheme, } from './NitroSimpleToast.nitro';
 export declare function toast(options: ToastOptions): void;
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAK/E,YAAY,EACV,YAAY,EACZ,WAAW,EACX,WAAW,EACX,SAAS,GACV,MAAM,0BAA0B,CAAC;AAElC,wBAAgB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAEjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAK/E,YAAY,EACV,YAAY,EACZ,WAAW,EACX,WAAW,EACX,SAAS,EACT,UAAU,GACX,MAAM,0BAA0B,CAAC;AAElC,wBAAgB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAEjD"}

package/nitrogen/generated/android/c++/JHybridNitroSimpleToastSpec.cpp

@@ -15,6 +15,8 @@ namespace margelo::nitro::nitrosimpletoast { enum class ToastPreset; }
 namespace margelo::nitro::nitrosimpletoast { enum class ToastHaptic; }
 // Forward declaration of `ToastFrom` to properly resolve imports.
 namespace margelo::nitro::nitrosimpletoast { enum class ToastFrom; }
+// Forward declaration of `ToastTheme` to properly resolve imports.
+namespace margelo::nitro::nitrosimpletoast { enum class ToastTheme; }
 
 #include "ToastOptions.hpp"
 #include "JToastOptions.hpp"
@@ -26,6 +28,8 @@ namespace margelo::nitro::nitrosimpletoast { enum class ToastFrom; }
 #include "JToastHaptic.hpp"
 #include "ToastFrom.hpp"
 #include "JToastFrom.hpp"
+#include "ToastTheme.hpp"
+#include "JToastTheme.hpp"
 
 namespace margelo::nitro::nitrosimpletoast {
 

package/nitrogen/generated/android/c++/JToastOptions.hpp

@@ -13,9 +13,11 @@
 #include "JToastFrom.hpp"
 #include "JToastHaptic.hpp"
 #include "JToastPreset.hpp"
+#include "JToastTheme.hpp"
 #include "ToastFrom.hpp"
 #include "ToastHaptic.hpp"
 #include "ToastPreset.hpp"
+#include "ToastTheme.hpp"
 #include <optional>
 #include <string>
 
@@ -52,6 +54,8 @@ namespace margelo::nitro::nitrosimpletoast {
       jni::local_ref<jni::JBoolean> shouldDismissByDrag = this->getFieldValue(fieldShouldDismissByDrag);
       static const auto fieldFrom = clazz->getField<JToastFrom>("from");
       jni::local_ref<JToastFrom> from = this->getFieldValue(fieldFrom);
+      static const auto fieldTheme = clazz->getField<JToastTheme>("theme");
+      jni::local_ref<JToastTheme> theme = this->getFieldValue(fieldTheme);
       return ToastOptions(
         title->toStdString(),
         message != nullptr ? std::make_optional(message->toStdString()) : std::nullopt,
@@ -59,7 +63,8 @@ namespace margelo::nitro::nitrosimpletoast {
         duration != nullptr ? std::make_optional(duration->value()) : std::nullopt,
         haptic != nullptr ? std::make_optional(haptic->toCpp()) : std::nullopt,
         shouldDismissByDrag != nullptr ? std::make_optional(static_cast<bool>(shouldDismissByDrag->value())) : std::nullopt,
-        from != nullptr ? std::make_optional(from->toCpp()) : std::nullopt
+        from != nullptr ? std::make_optional(from->toCpp()) : std::nullopt,
+        theme != nullptr ? std::make_optional(theme->toCpp()) : std::nullopt
       );
     }
 
@@ -69,7 +74,7 @@ namespace margelo::nitro::nitrosimpletoast {
      */
     [[maybe_unused]]
     static jni::local_ref<JToastOptions::javaobject> fromCpp(const ToastOptions& value) {
-      using JSignature = JToastOptions(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JToastPreset>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JToastHaptic>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JToastFrom>);
+      using JSignature = JToastOptions(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JToastPreset>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JToastHaptic>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JToastFrom>, jni::alias_ref<JToastTheme>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -80,7 +85,8 @@ namespace margelo::nitro::nitrosimpletoast {
         value.duration.has_value() ? jni::JDouble::valueOf(value.duration.value()) : nullptr,
         value.haptic.has_value() ? JToastHaptic::fromCpp(value.haptic.value()) : nullptr,
         value.shouldDismissByDrag.has_value() ? jni::JBoolean::valueOf(value.shouldDismissByDrag.value()) : nullptr,
-        value.from.has_value() ? JToastFrom::fromCpp(value.from.value()) : nullptr
+        value.from.has_value() ? JToastFrom::fromCpp(value.from.value()) : nullptr,
+        value.theme.has_value() ? JToastTheme::fromCpp(value.theme.value()) : nullptr
       );
     }
   };

package/nitrogen/generated/android/c++/JToastTheme.hpp

@@ -0,0 +1,61 @@
+///
+/// JToastTheme.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include "ToastTheme.hpp"
+
+namespace margelo::nitro::nitrosimpletoast {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ enum "ToastTheme" and the the Kotlin enum "ToastTheme".
+   */
+  struct JToastTheme final: public jni::JavaClass<JToastTheme> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/nitrosimpletoast/ToastTheme;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based enum to the C++ enum ToastTheme.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    ToastTheme toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldOrdinal = clazz->getField<int>("value");
+      int ordinal = this->getFieldValue(fieldOrdinal);
+      return static_cast<ToastTheme>(ordinal);
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based enum with the given C++ enum's value.
+     */
+    [[maybe_unused]]
+    static jni::alias_ref<JToastTheme> fromCpp(ToastTheme value) {
+      static const auto clazz = javaClassStatic();
+      switch (value) {
+        case ToastTheme::LIGHT:
+          static const auto fieldLIGHT = clazz->getStaticField<JToastTheme>("LIGHT");
+          return clazz->getStaticFieldValue(fieldLIGHT);
+        case ToastTheme::DARK:
+          static const auto fieldDARK = clazz->getStaticField<JToastTheme>("DARK");
+          return clazz->getStaticFieldValue(fieldDARK);
+        case ToastTheme::SYSTEM:
+          static const auto fieldSYSTEM = clazz->getStaticField<JToastTheme>("SYSTEM");
+          return clazz->getStaticFieldValue(fieldSYSTEM);
+        default:
+          std::string stringValue = std::to_string(static_cast<int>(value));
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
+      }
+    }
+  };
+
+} // namespace margelo::nitro::nitrosimpletoast

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrosimpletoast/ToastOptions.kt

@@ -37,7 +37,10 @@ data class ToastOptions(
   val shouldDismissByDrag: Boolean?,
   @DoNotStrip
   @Keep
-  val from: ToastFrom?
+  val from: ToastFrom?,
+  @DoNotStrip
+  @Keep
+  val theme: ToastTheme?
 ) {
   /* primary constructor */
 
@@ -49,8 +52,8 @@ data class ToastOptions(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(title: String, message: String?, preset: ToastPreset?, duration: Double?, haptic: ToastHaptic?, shouldDismissByDrag: Boolean?, from: ToastFrom?): ToastOptions {
-      return ToastOptions(title, message, preset, duration, haptic, shouldDismissByDrag, from)
+    private fun fromCpp(title: String, message: String?, preset: ToastPreset?, duration: Double?, haptic: ToastHaptic?, shouldDismissByDrag: Boolean?, from: ToastFrom?, theme: ToastTheme?): ToastOptions {
+      return ToastOptions(title, message, preset, duration, haptic, shouldDismissByDrag, from, theme)
     }
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrosimpletoast/ToastTheme.kt

@@ -0,0 +1,24 @@
+///
+/// ToastTheme.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+package com.margelo.nitro.nitrosimpletoast
+
+import androidx.annotation.Keep
+import com.facebook.proguard.annotations.DoNotStrip
+
+/**
+ * Represents the JavaScript enum/union "ToastTheme".
+ */
+@DoNotStrip
+@Keep
+enum class ToastTheme(@DoNotStrip @Keep val value: Int) {
+  LIGHT(0),
+  DARK(1),
+  SYSTEM(2);
+
+  companion object
+}

package/nitrogen/generated/ios/NitroSimpleToast-Swift-Cxx-Bridge.hpp

@@ -16,6 +16,8 @@ namespace margelo::nitro::nitrosimpletoast { enum class ToastFrom; }
 namespace margelo::nitro::nitrosimpletoast { enum class ToastHaptic; }
 // Forward declaration of `ToastPreset` to properly resolve imports.
 namespace margelo::nitro::nitrosimpletoast { enum class ToastPreset; }
+// Forward declaration of `ToastTheme` to properly resolve imports.
+namespace margelo::nitro::nitrosimpletoast { enum class ToastTheme; }
 
 // Forward declarations of Swift defined types
 // Forward declaration of `HybridNitroSimpleToastSpec_cxx` to properly resolve imports.
@@ -26,6 +28,7 @@ namespace NitroSimpleToast { class HybridNitroSimpleToastSpec_cxx; }
 #include "ToastFrom.hpp"
 #include "ToastHaptic.hpp"
 #include "ToastPreset.hpp"
+#include "ToastTheme.hpp"
 #include <NitroModules/Result.hpp>
 #include <exception>
 #include <memory>
@@ -128,6 +131,21 @@ namespace margelo::nitro::nitrosimpletoast::bridge::swift {
     return optional.value();
   }
   
+  // pragma MARK: std::optional<ToastTheme>
+  /**
+   * Specialized version of `std::optional<ToastTheme>`.
+   */
+  using std__optional_ToastTheme_ = std::optional<ToastTheme>;
+  inline std::optional<ToastTheme> create_std__optional_ToastTheme_(const ToastTheme& value) noexcept {
+    return std::optional<ToastTheme>(value);
+  }
+  inline bool has_value_std__optional_ToastTheme_(const std::optional<ToastTheme>& optional) noexcept {
+    return optional.has_value();
+  }
+  inline ToastTheme get_std__optional_ToastTheme_(const std::optional<ToastTheme>& optional) noexcept {
+    return optional.value();
+  }
+  
   // pragma MARK: std::shared_ptr<HybridNitroSimpleToastSpec>
   /**
    * Specialized version of `std::shared_ptr<HybridNitroSimpleToastSpec>`.

package/nitrogen/generated/ios/NitroSimpleToast-Swift-Cxx-Umbrella.hpp

@@ -18,6 +18,8 @@ namespace margelo::nitro::nitrosimpletoast { enum class ToastHaptic; }
 namespace margelo::nitro::nitrosimpletoast { struct ToastOptions; }
 // Forward declaration of `ToastPreset` to properly resolve imports.
 namespace margelo::nitro::nitrosimpletoast { enum class ToastPreset; }
+// Forward declaration of `ToastTheme` to properly resolve imports.
+namespace margelo::nitro::nitrosimpletoast { enum class ToastTheme; }
 
 // Include C++ defined types
 #include "HybridNitroSimpleToastSpec.hpp"
@@ -25,6 +27,7 @@ namespace margelo::nitro::nitrosimpletoast { enum class ToastPreset; }
 #include "ToastHaptic.hpp"
 #include "ToastOptions.hpp"
 #include "ToastPreset.hpp"
+#include "ToastTheme.hpp"
 #include <NitroModules/Result.hpp>
 #include <exception>
 #include <memory>

package/nitrogen/generated/ios/c++/HybridNitroSimpleToastSpecSwift.hpp

@@ -20,6 +20,8 @@ namespace margelo::nitro::nitrosimpletoast { enum class ToastPreset; }
 namespace margelo::nitro::nitrosimpletoast { enum class ToastHaptic; }
 // Forward declaration of `ToastFrom` to properly resolve imports.
 namespace margelo::nitro::nitrosimpletoast { enum class ToastFrom; }
+// Forward declaration of `ToastTheme` to properly resolve imports.
+namespace margelo::nitro::nitrosimpletoast { enum class ToastTheme; }
 
 #include "ToastOptions.hpp"
 #include <string>
@@ -27,6 +29,7 @@ namespace margelo::nitro::nitrosimpletoast { enum class ToastFrom; }
 #include "ToastPreset.hpp"
 #include "ToastHaptic.hpp"
 #include "ToastFrom.hpp"
+#include "ToastTheme.hpp"
 
 #include "NitroSimpleToast-Swift-Cxx-Umbrella.hpp"
 

package/nitrogen/generated/ios/swift/ToastOptions.swift

@@ -18,7 +18,7 @@ public extension ToastOptions {
   /**
    * Create a new instance of `ToastOptions`.
    */
-  init(title: String, message: String?, preset: ToastPreset?, duration: Double?, haptic: ToastHaptic?, shouldDismissByDrag: Bool?, from: ToastFrom?) {
+  init(title: String, message: String?, preset: ToastPreset?, duration: Double?, haptic: ToastHaptic?, shouldDismissByDrag: Bool?, from: ToastFrom?, theme: ToastTheme?) {
     self.init(std.string(title), { () -> bridge.std__optional_std__string_ in
       if let __unwrappedValue = message {
         return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
@@ -55,6 +55,12 @@ public extension ToastOptions {
       } else {
         return .init()
       }
+    }(), { () -> bridge.std__optional_ToastTheme_ in
+      if let __unwrappedValue = theme {
+        return bridge.create_std__optional_ToastTheme_(__unwrappedValue)
+      } else {
+        return .init()
+      }
     }())
   }
 
@@ -113,4 +119,9 @@ public extension ToastOptions {
   var from: ToastFrom? {
     return self.__from.value
   }
+  
+  @inline(__always)
+  var theme: ToastTheme? {
+    return self.__theme.value
+  }
 }

package/nitrogen/generated/ios/swift/ToastTheme.swift

@@ -0,0 +1,44 @@
+///
+/// ToastTheme.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+/**
+ * Represents the JS union `ToastTheme`, backed by a C++ enum.
+ */
+public typealias ToastTheme = margelo.nitro.nitrosimpletoast.ToastTheme
+
+public extension ToastTheme {
+  /**
+   * Get a ToastTheme for the given String value, or
+   * return `nil` if the given value was invalid/unknown.
+   */
+  init?(fromString string: String) {
+    switch string {
+      case "light":
+        self = .light
+      case "dark":
+        self = .dark
+      case "system":
+        self = .system
+      default:
+        return nil
+    }
+  }
+
+  /**
+   * Get the String value this ToastTheme represents.
+   */
+  var stringValue: String {
+    switch self {
+      case .light:
+        return "light"
+      case .dark:
+        return "dark"
+      case .system:
+        return "system"
+    }
+  }
+}

package/nitrogen/generated/shared/c++/ToastOptions.hpp

@@ -34,12 +34,15 @@ namespace margelo::nitro::nitrosimpletoast { enum class ToastPreset; }
 namespace margelo::nitro::nitrosimpletoast { enum class ToastHaptic; }
 // Forward declaration of `ToastFrom` to properly resolve imports.
 namespace margelo::nitro::nitrosimpletoast { enum class ToastFrom; }
+// Forward declaration of `ToastTheme` to properly resolve imports.
+namespace margelo::nitro::nitrosimpletoast { enum class ToastTheme; }
 
 #include <string>
 #include <optional>
 #include "ToastPreset.hpp"
 #include "ToastHaptic.hpp"
 #include "ToastFrom.hpp"
+#include "ToastTheme.hpp"
 
 namespace margelo::nitro::nitrosimpletoast {
 
@@ -55,10 +58,11 @@ namespace margelo::nitro::nitrosimpletoast {
     std::optional<ToastHaptic> haptic     SWIFT_PRIVATE;
     std::optional<bool> shouldDismissByDrag     SWIFT_PRIVATE;
     std::optional<ToastFrom> from     SWIFT_PRIVATE;
+    std::optional<ToastTheme> theme     SWIFT_PRIVATE;
 
   public:
     ToastOptions() = default;
-    explicit ToastOptions(std::string title, std::optional<std::string> message, std::optional<ToastPreset> preset, std::optional<double> duration, std::optional<ToastHaptic> haptic, std::optional<bool> shouldDismissByDrag, std::optional<ToastFrom> from): title(title), message(message), preset(preset), duration(duration), haptic(haptic), shouldDismissByDrag(shouldDismissByDrag), from(from) {}
+    explicit ToastOptions(std::string title, std::optional<std::string> message, std::optional<ToastPreset> preset, std::optional<double> duration, std::optional<ToastHaptic> haptic, std::optional<bool> shouldDismissByDrag, std::optional<ToastFrom> from, std::optional<ToastTheme> theme): title(title), message(message), preset(preset), duration(duration), haptic(haptic), shouldDismissByDrag(shouldDismissByDrag), from(from), theme(theme) {}
 
   public:
     friend bool operator==(const ToastOptions& lhs, const ToastOptions& rhs) = default;
@@ -80,7 +84,8 @@ namespace margelo::nitro {
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "duration"))),
         JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastHaptic>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "haptic"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "shouldDismissByDrag"))),
-        JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastFrom>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "from")))
+        JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastFrom>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "from"))),
+        JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastTheme>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "theme")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::nitrosimpletoast::ToastOptions& arg) {
@@ -92,6 +97,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "haptic"), JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastHaptic>>::toJSI(runtime, arg.haptic));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "shouldDismissByDrag"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.shouldDismissByDrag));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "from"), JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastFrom>>::toJSI(runtime, arg.from));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "theme"), JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastTheme>>::toJSI(runtime, arg.theme));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -109,6 +115,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastHaptic>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "haptic")))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "shouldDismissByDrag")))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastFrom>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "from")))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::nitrosimpletoast::ToastTheme>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "theme")))) return false;
       return true;
     }
   };

package/nitrogen/generated/shared/c++/ToastTheme.hpp

@@ -0,0 +1,80 @@
+///
+/// ToastTheme.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/NitroHash.hpp>)
+#include <NitroModules/NitroHash.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+namespace margelo::nitro::nitrosimpletoast {
+
+  /**
+   * An enum which can be represented as a JavaScript union (ToastTheme).
+   */
+  enum class ToastTheme {
+    LIGHT      SWIFT_NAME(light) = 0,
+    DARK      SWIFT_NAME(dark) = 1,
+    SYSTEM      SWIFT_NAME(system) = 2,
+  } CLOSED_ENUM;
+
+} // namespace margelo::nitro::nitrosimpletoast
+
+namespace margelo::nitro {
+
+  // C++ ToastTheme <> JS ToastTheme (union)
+  template <>
+  struct JSIConverter<margelo::nitro::nitrosimpletoast::ToastTheme> final {
+    static inline margelo::nitro::nitrosimpletoast::ToastTheme fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
+      switch (hashString(unionValue.c_str(), unionValue.size())) {
+        case hashString("light"): return margelo::nitro::nitrosimpletoast::ToastTheme::LIGHT;
+        case hashString("dark"): return margelo::nitro::nitrosimpletoast::ToastTheme::DARK;
+        case hashString("system"): return margelo::nitro::nitrosimpletoast::ToastTheme::SYSTEM;
+        default: [[unlikely]]
+          throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum ToastTheme - invalid value!");
+      }
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::nitrosimpletoast::ToastTheme arg) {
+      switch (arg) {
+        case margelo::nitro::nitrosimpletoast::ToastTheme::LIGHT: return JSIConverter<std::string>::toJSI(runtime, "light");
+        case margelo::nitro::nitrosimpletoast::ToastTheme::DARK: return JSIConverter<std::string>::toJSI(runtime, "dark");
+        case margelo::nitro::nitrosimpletoast::ToastTheme::SYSTEM: return JSIConverter<std::string>::toJSI(runtime, "system");
+        default: [[unlikely]]
+          throw std::invalid_argument("Cannot convert ToastTheme to JS - invalid value: "
+                                    + std::to_string(static_cast<int>(arg)) + "!");
+      }
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isString()) {
+        return false;
+      }
+      std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, value);
+      switch (hashString(unionValue.c_str(), unionValue.size())) {
+        case hashString("light"):
+        case hashString("dark"):
+        case hashString("system"):
+          return true;
+        default:
+          return false;
+      }
+    }
+  };
+
+} // namespace margelo::nitro

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-simple-toast",
-  "version": "0.1.0",
+  "version": "0.1.1-beta.1",
   "description": "react native simple toast powered by nitro",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/NitroSimpleToast.nitro.ts

@@ -6,6 +6,8 @@ export type ToastHaptic = 'success' | 'warning' | 'error' | 'none';
 
 export type ToastFrom = 'top' | 'bottom';
 
+export type ToastTheme = 'light' | 'dark' | 'system';
+
 export interface ToastOptions {
   title: string;
   message?: string;
@@ -27,6 +29,10 @@ export interface ToastOptions {
    * @platform ios
    */
   from?: ToastFrom;
+  /**
+   * Defaults to `system`.
+   */
+  theme?: ToastTheme;
 }
 
 export interface NitroSimpleToast

package/src/index.tsx

@@ -9,6 +9,7 @@ export type {
   ToastPreset,
   ToastHaptic,
   ToastFrom,
+  ToastTheme,
 } from './NitroSimpleToast.nitro';
 
 export function toast(options: ToastOptions): void {