framepayments-react-native 2.1.3 → 2.2.1

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-7
+8
 0

package/android/src/main/java/com/framepayments/reactnativeframe/FrameCheckoutActivity.kt

@@ -67,6 +67,7 @@ class FrameCheckoutActivity : AppCompatActivity() {
 
   private fun addCheckoutView(container: FrameLayout, accountId: String, amount: Int) {
     val checkoutView = FrameCheckoutView(this)
+    FrameRNTheme.current?.let { checkoutView.setTheme(it) }
     checkoutView.configure(accountId, amount) { transferId ->
       setResult(RESULT_OK, Intent().putExtra(EXTRA_TRANSFER_ID, transferId))
       finish()

package/android/src/main/java/com/framepayments/reactnativeframe/FrameFlowActivity.kt

@@ -63,6 +63,7 @@ class FrameFlowActivity : AppCompatActivity() {
   private fun showCart(accountId: String, items: List<FrameCartItem>, shippingCents: Int) {
     container.removeAllViews()
     cartView = FrameCartView(this).apply {
+      FrameRNTheme.current?.let { setTheme(it) }
       configure(accountId, items, shippingCents, { totalCents ->
         showCheckout(accountId, totalCents)
       }, null)
@@ -73,6 +74,7 @@ class FrameFlowActivity : AppCompatActivity() {
   private fun showCheckout(accountId: String, amount: Int) {
     container.removeAllViews()
     checkoutView = FrameCheckoutView(this).apply {
+      FrameRNTheme.current?.let { setTheme(it) }
       configure(accountId, amount) { transferId ->
         setResult(RESULT_OK, Intent().putExtra(EXTRA_TRANSFER_ID, transferId))
         finish()

package/android/src/main/java/com/framepayments/reactnativeframe/FrameOnboardingActivity.kt

@@ -8,6 +8,7 @@ import com.framepayments.frameonboarding.classes.Capabilities
 import com.framepayments.frameonboarding.classes.OnboardingConfig
 import com.framepayments.frameonboarding.classes.OnboardingResult
 import com.framepayments.frameonboarding.views.OnboardingContainerView
+import com.framepayments.framesdk_ui.theme.FrameTheme
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 
@@ -26,23 +27,27 @@ class FrameOnboardingActivity : ComponentActivity() {
       googlePayMerchantId = googlePayMerchantId
     )
 
+    val themeOverride = FrameRNTheme.current
     setContent {
-      OnboardingContainerView(config = config) { result ->
-        when (result) {
-          is OnboardingResult.Completed -> {
-            val data = Intent().apply {
-              putExtra(EXTRA_PAYMENT_METHOD_ID, result.paymentMethodId)
+      val theme = themeOverride ?: FrameTheme.default(this)
+      FrameTheme(theme = theme) {
+        OnboardingContainerView(config = config) { result ->
+          when (result) {
+            is OnboardingResult.Completed -> {
+              val data = Intent().apply {
+                putExtra(EXTRA_PAYMENT_METHOD_ID, result.paymentMethodId)
+              }
+              setResult(RESULT_OK, data)
+              finish()
+            }
+            is OnboardingResult.Cancelled -> {
+              setResult(RESULT_CANCELED)
+              finish()
+            }
+            is OnboardingResult.Error -> {
+              setResult(RESULT_CANCELED)
+              finish()
             }
-            setResult(RESULT_OK, data)
-            finish()
-          }
-          is OnboardingResult.Cancelled -> {
-            setResult(RESULT_CANCELED)
-            finish()
-          }
-          is OnboardingResult.Error -> {
-            setResult(RESULT_CANCELED)
-            finish()
           }
         }
       }

package/android/src/main/java/com/framepayments/reactnativeframe/FrameRNTheme.kt

@@ -0,0 +1,138 @@
+package com.framepayments.reactnativeframe
+
+import android.content.Context
+import android.graphics.Typeface
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.facebook.react.bridge.ReadableMap
+import com.framepayments.framesdk_ui.theme.FrameTheme
+
+object FrameRNTheme {
+
+  @Volatile
+  var current: FrameTheme? = null
+
+  fun parse(context: Context, dict: ReadableMap): FrameTheme {
+    val defaults = FrameTheme.Companion.default(context)
+    val colors = parseColors(dict.getMapOrNull("colors"), defaults)
+    val fonts = parseFonts(context, dict.getMapOrNull("fonts"), defaults)
+    val radii = parseRadii(dict.getMapOrNull("radii"), defaults)
+    return FrameTheme(colors = colors, fonts = fonts, radii = radii)
+  }
+
+  private fun parseColors(dict: ReadableMap?, defaults: FrameTheme) = defaults.colors.let { c ->
+    if (dict == null) return@let c
+    c.copy(
+      primaryButton = dict.color("primaryButton") ?: c.primaryButton,
+      primaryButtonText = dict.color("primaryButtonText") ?: c.primaryButtonText,
+      secondaryButton = dict.color("secondaryButton") ?: c.secondaryButton,
+      secondaryButtonText = dict.color("secondaryButtonText") ?: c.secondaryButtonText,
+      disabledButton = dict.color("disabledButton") ?: c.disabledButton,
+      disabledButtonStroke = dict.color("disabledButtonStroke") ?: c.disabledButtonStroke,
+      disabledButtonText = dict.color("disabledButtonText") ?: c.disabledButtonText,
+      surface = dict.color("surface") ?: c.surface,
+      surfaceStroke = dict.color("surfaceStroke") ?: c.surfaceStroke,
+      textPrimary = dict.color("textPrimary") ?: c.textPrimary,
+      textSecondary = dict.color("textSecondary") ?: c.textSecondary,
+      error = dict.color("error") ?: c.error,
+      onboardingHeaderBackground = dict.color("onboardingHeaderBackground") ?: c.onboardingHeaderBackground,
+      onboardingProgressFilledOnBrand = dict.color("onboardingProgressFilledOnBrand") ?: c.onboardingProgressFilledOnBrand,
+      onboardingProgressEmptyOnBrand = dict.color("onboardingProgressEmptyOnBrand") ?: c.onboardingProgressEmptyOnBrand
+    )
+  }
+
+  private fun parseFonts(context: Context, dict: ReadableMap?, defaults: FrameTheme) = defaults.fonts.let { f ->
+    if (dict == null) return@let f
+    f.copy(
+      title = dict.textStyle(context, "title", f.title),
+      heading = dict.textStyle(context, "heading", f.heading),
+      headline = dict.textStyle(context, "headline", f.headline),
+      body = dict.textStyle(context, "body", f.body),
+      bodySmall = dict.textStyle(context, "bodySmall", f.bodySmall),
+      label = dict.textStyle(context, "label", f.label),
+      caption = dict.textStyle(context, "caption", f.caption),
+      button = dict.textStyle(context, "button", f.button)
+    )
+  }
+
+  private fun parseRadii(dict: ReadableMap?, defaults: FrameTheme) = defaults.radii.let { r ->
+    if (dict == null) return@let r
+    r.copy(
+      small = dict.dp("small") ?: r.small,
+      medium = dict.dp("medium") ?: r.medium,
+      large = dict.dp("large") ?: r.large
+    )
+  }
+
+  private fun ReadableMap.getMapOrNull(key: String): ReadableMap? =
+    if (hasKey(key) && !isNull(key)) getMap(key) else null
+
+  private fun ReadableMap.color(key: String): Color? {
+    if (!hasKey(key) || isNull(key)) return null
+    val hex = getString(key) ?: return null
+    return parseHexColor(hex)
+  }
+
+  private fun ReadableMap.dp(key: String) =
+    if (hasKey(key) && !isNull(key)) getDouble(key).dp else null
+
+  private fun ReadableMap.textStyle(context: Context, key: String, default: TextStyle): TextStyle {
+    if (!hasKey(key) || isNull(key)) return default
+    val entry = getMap(key) ?: return default
+    val sizePt = if (entry.hasKey("size") && !entry.isNull("size")) entry.getDouble("size") else return default
+    val name = if (entry.hasKey("name") && !entry.isNull("name")) entry.getString("name") else null
+    val family = resolveFontFamily(context, name)
+    return default.copy(fontSize = sizePt.sp, fontFamily = family)
+  }
+
+  private val fontFamilyCache = mutableMapOf<String, FontFamily>()
+
+  private fun resolveFontFamily(context: Context, name: String?): FontFamily {
+    if (name.isNullOrBlank() || name.equals("system", ignoreCase = true)) return FontFamily.Default
+    fontFamilyCache[name]?.let { return it }
+    val typeface = loadAssetTypeface(context, name) ?: return FontFamily.Default
+    val family = FontFamily(typeface)
+    fontFamilyCache[name] = family
+    return family
+  }
+
+  private fun loadAssetTypeface(context: Context, name: String): Typeface? {
+    val assets = context.assets
+    val candidates = buildList {
+      add("fonts/$name")
+      add("fonts/$name.ttf")
+      add("fonts/$name.otf")
+    }
+    for (path in candidates) {
+      try {
+        return Typeface.createFromAsset(assets, path)
+      } catch (_: Exception) {
+      }
+    }
+    return null
+  }
+
+  private fun parseHexColor(input: String): Color? {
+    var s = input.trim()
+    if (s.startsWith("#")) s = s.substring(1)
+    if (s.length == 3) s = s.map { "$it$it" }.joinToString("")
+    if (s.length != 6 && s.length != 8) return null
+    val v = s.toLongOrNull(16) ?: return null
+    val r: Int; val g: Int; val b: Int; val a: Int
+    if (s.length == 6) {
+      r = ((v shr 16) and 0xff).toInt()
+      g = ((v shr 8) and 0xff).toInt()
+      b = (v and 0xff).toInt()
+      a = 255
+    } else {
+      r = ((v shr 24) and 0xff).toInt()
+      g = ((v shr 16) and 0xff).toInt()
+      b = ((v shr 8) and 0xff).toInt()
+      a = (v and 0xff).toInt()
+    }
+    return Color(red = r, green = g, blue = b, alpha = a)
+  }
+}

package/android/src/main/java/com/framepayments/reactnativeframe/FrameSDKModule.kt

@@ -35,14 +35,15 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     secretKey: String,
     publishableKey: String,
     debugMode: Boolean,
-    @Suppress("UNUSED_PARAMETER") theme: com.facebook.react.bridge.ReadableMap?,
+    theme: com.facebook.react.bridge.ReadableMap?,
     promise: Promise
   ) {
-    // theme is accepted for cross-platform parity with iOS but is currently a
-    // no-op on Android — frame-android does not yet have a matching theme API.
     try {
       val ctx = reactApplicationContext.applicationContext
       FrameNetworking.initializeWithAPIKey(ctx, secretKey, publishableKey, debugMode)
+      FrameRNTheme.current = theme?.takeIf { it.keySetIterator().hasNextKey() }?.let {
+        FrameRNTheme.parse(ctx, it)
+      }
       promise.resolve(null)
     } catch (e: Exception) {
       promise.reject("INIT_FAILED", e.message, e)

package/ios/FrameSDKBridge.swift

@@ -110,8 +110,7 @@ public class FrameSDKBridge: NSObject {
     hosting = CheckoutHostingController(rootView: FrameCheckoutView(
       accountId: accountId,
       paymentAmount: amount,
-      checkoutCallback: { [weak hosting] success, transferId in
-        hosting?.didComplete = true
+      checkoutCallback: { success, transferId in
         top.dismiss(animated: true)
         DispatchQueue.main.async {
           if success, let transferId {
@@ -122,11 +121,6 @@ public class FrameSDKBridge: NSObject {
         }
       }
     ))
-    hosting.onCancel = {
-      DispatchQueue.main.async {
-        reject("USER_CANCELED", "User dismissed checkout without completing payment", nil)
-      }
-    }
     hosting.modalPresentationStyle = UIModalPresentationStyle.pageSheet
     if let sheet = hosting.sheetPresentationController {
       sheet.detents = [UISheetPresentationController.Detent.large()]
@@ -249,11 +243,6 @@ private final class CheckoutHostingController: UIHostingController<FrameCheckout
     cancelled = true
     onCancel?()
   }
-
-  func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
-    guard presentationController.presentedViewController === self else { return }
-    cancel()
-  }
 }
 
 // MARK: - OnboardingHostingController

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framepayments-react-native",
-  "version": "2.1.3",
+  "version": "2.2.1",
   "description": "React Native SDK for Frame Payments - modal checkout and cart, with API usage via frame-node.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",