@primer-io/react-native 2.23.0 → 2.24.0

package/android/build.gradle

@@ -31,6 +31,7 @@ def getExtOrIntegerDefault(name) {
 }
 
 android {
+  group 'io.primer'
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
   defaultConfig {
@@ -147,7 +148,7 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
-  implementation 'io.primer:android:2.27.2'
+  implementation 'io.primer:android:2.27.3'
 
   testImplementation 'io.mockk:mockk:1.13.10'
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'

package/android/src/main/java/com/primerioreactnative/components/manager/klarna/PrimerRNHeadlessUniversalCheckoutKlarnaComponent.kt

@@ -259,12 +259,12 @@ class PrimerRNHeadlessUniversalCheckoutKlarnaComponent(
         val returnIntentUrl = readableMap.getString("returnIntentUrl")
         val paymentCategory = readableMap.getMap("paymentCategory") as ReadableMap
         val json = Json { ignoreUnknownKeys = true }
-        val KlarnaPaymentCategoryRN =
+        val klarnaPaymentCategoryRN =
             json.decodeFromString<KlarnaPaymentCategoryRN>(
                 Json.encodeToString(paymentCategory.toHashMap() as Map<String, String>)
             )
 
-        val activity = getCurrentActivity()
+        val activity = currentActivity
 
         if (activity == null) {
             val exception = ErrorTypeRN.NativeBridgeFailed errorTo MISSING_ACTIVITY_ERROR
@@ -277,7 +277,7 @@ class PrimerRNHeadlessUniversalCheckoutKlarnaComponent(
                 KlarnaPaymentCollectableData.PaymentOptions(
                     context = activity,
                     returnIntentUrl = requireNotNull(returnIntentUrl),
-                    paymentCategory = KlarnaPaymentCategoryRN.toKlarnaPaymentCategory()
+                    paymentCategory = klarnaPaymentCategoryRN.toKlarnaPaymentCategory()
                 )
             )
             promise.resolve(null)
@@ -327,8 +327,6 @@ class PrimerRNHeadlessUniversalCheckoutKlarnaComponent(
             Could not retrieve running activity from context.
             """
 
-        val TAG = PrimerRNHeadlessUniversalCheckoutKlarnaComponent::class.simpleName
-
         val json by lazy { Json { encodeDefaults = true } }
     }
 }

package/android/src/main/java/com/primerioreactnative/datamodels/PrimerSettingsRN.kt

@@ -7,6 +7,7 @@ import com.primerioreactnative.extensions.toPrimerUIOptions
 import io.primer.android.data.settings.GooglePayButtonStyle
 import io.primer.android.data.settings.PrimerPaymentHandling
 import io.primer.android.data.settings.PrimerSettings
+import io.primer.android.ui.settings.PrimerTheme
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -44,8 +45,69 @@ data class PrimerUIOptionsRN(
   var isInitScreenEnabled: Boolean = true,
   var isSuccessScreenEnabled: Boolean = true,
   var isErrorScreenEnabled: Boolean = true,
+  var theme: PrimerThemeRN = PrimerThemeRN()
 )
 
+@Serializable
+data class PrimerThemeRN(
+  val colors: ColorThemeRN? = null,
+  val darkModeColors: ColorThemeRN? = null
+) {
+  fun toPrimerTheme(): PrimerTheme {
+    val isDarkMode = false
+
+    return PrimerTheme.buildWithDynamicValues(
+      isDarkMode = isDarkMode,
+      mainColor = when {
+        isDarkMode -> darkModeColors?.mainColor?.toHexStrColor()
+        else -> colors?.mainColor?.toHexStrColor()
+      },
+      backgroundColor = when {
+        isDarkMode -> darkModeColors?.background?.toHexStrColor()
+        else -> colors?.background?.toHexStrColor()
+      },
+      disabledColor = when {
+        isDarkMode -> darkModeColors?.disabled?.toHexStrColor()
+        else -> colors?.disabled?.toHexStrColor()
+      },
+      textColor = when {
+        isDarkMode -> darkModeColors?.text?.toHexStrColor()
+        else -> colors?.text?.toHexStrColor()
+      },
+      bordersColor = when {
+        isDarkMode -> darkModeColors?.borders?.toHexStrColor()
+        else -> colors?.borders?.toHexStrColor()
+      },
+      errorColor = when {
+        isDarkMode -> darkModeColors?.error?.toHexStrColor()
+        else -> colors?.error?.toHexStrColor()
+      }
+    )
+  }
+}
+
+@Serializable
+data class ColorThemeRN(
+  val mainColor: ColorRN? = null,
+  val contrastingColor: ColorRN? = null,
+  val background: ColorRN? = null,
+  val text: ColorRN? = null,
+  val contrastingText: ColorRN? = null,
+  val borders: ColorRN? = null, // or main color
+  val disabled: ColorRN? = null,
+  val error: ColorRN? = null,
+)
+
+@Serializable
+data class ColorRN(
+  val alpha: Int = 0,
+  val red: Int = 0,
+  val green: Int = 0,
+  val blue: Int = 0
+) {
+  fun toHexStrColor() = String.format("#%02X%02X%02X%02X", alpha, red, green, blue)
+}
+
 @Serializable
 data class PrimerDebugOptionsRN(val is3DSSanityCheckEnabled: Boolean = true)
 

package/android/src/main/java/com/primerioreactnative/extensions/PrimerUIOptionsRN.kt

@@ -1,7 +1,6 @@
 package com.primerioreactnative.extensions
 
 import com.primerioreactnative.datamodels.PrimerUIOptionsRN
-import io.primer.android.ui.settings.PrimerTheme
 import io.primer.android.ui.settings.PrimerUIOptions
 
 internal fun PrimerUIOptionsRN.toPrimerUIOptions() =
@@ -9,5 +8,5 @@ internal fun PrimerUIOptionsRN.toPrimerUIOptions() =
     isInitScreenEnabled,
     isSuccessScreenEnabled,
     isErrorScreenEnabled,
-    PrimerTheme.build()
+    theme.toPrimerTheme()
   )

package/ios/Sources/DataModels/PrimerThemeRN.swift

@@ -7,19 +7,52 @@ struct PrimerThemeRN: Decodable {
 
 extension PrimerThemeRN {
     func asPrimerTheme() -> PrimerTheme {
-        return PrimerTheme()
+
+        let isDarkMode = UITraitCollection.current.userInterfaceStyle == .dark
+
+        let _colors = isDarkMode ? darkModeColors : colors
+
+        guard let colors = _colors else {
+            return PrimerTheme()
+        }
+
+        let data = PrimerThemeData()
+        data.colors = PrimerThemeData.ColorSwatch()
+
+        if let mainColor = colors.text?.uiColor ?? colors.mainColor?.uiColor {
+            data.colors.primary = mainColor
+            data.colors.dark = mainColor
+            data.colors.gray = mainColor
+        }
+        if let disabledColor = colors.disabled?.uiColor {
+            data.colors.lightGray = disabledColor
+            data.buttons.main.disabledColor = disabledColor
+        }
+        if let errorColor = colors.error?.uiColor {
+            data.colors.error = errorColor
+        }
+        if let borderColor = colors.borders?.uiColor {
+            data.buttons.main.border.defaultColor = borderColor
+            data.input.border.defaultColor = borderColor
+        }
+
+        if let backgroundColor = colors.background?.uiColor {
+            data.view.backgroundColor = backgroundColor
+        }
+
+        return PrimerTheme(with: data)
     }
 }
 
 struct ColorThemeRN: Decodable {
-    let mainColor: ColorRN?
-    let contrastingColor: ColorRN?
-    let background: ColorRN?
-    let text: ColorRN?
-    let contrastingText: ColorRN?
-    let borders: ColorRN?
-    let disabled: ColorRN?
-    let error: ColorRN?
+    let mainColor: ColorRN? // primary
+    let contrastingColor: ColorRN? // ???
+    let background: ColorRN? // light
+    let text: ColorRN? // primary
+    let contrastingText: ColorRN? // ??
+    let borders: ColorRN? // ??
+    let disabled: ColorRN? // lightGray
+    let error: ColorRN? // error
 }
 
 extension ColorThemeRN {

package/ios/Sources/version.swift

@@ -1,2 +1,2 @@
 // swiftlint:disable:next identifier_name
-public let PrimerReactNativeSDKVersion = "2.23.0"
+public let PrimerReactNativeSDKVersion = "2.24.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer-io/react-native",
-  "version": "2.23.0",
+  "version": "2.24.0",
   "description": "Primer SDK for RN",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",