@octopus-community/react-native 1.0.6 → 1.0.7

package/README.md

@@ -115,7 +115,7 @@ await initialize({
       onPrimary: '#FFFFFF', // Text color on primary background
     },
     logo: {
-      image: Image.resolveAssetSource(require('./assets/logo.png')), // Your custom logo
+      image: Image.resolveAssetSource(require('./assets/images/logo.png')), // Your custom logo
     },
   }
 });
@@ -186,7 +186,7 @@ await initialize({
       onPrimary: '#FFFFFF', // Text color on primary background
     },
     logo: {
-      image: Image.resolveAssetSource(require('./assets/logo.png')),
+      image: Image.resolveAssetSource(require('./assets/images/logo.png')),
     },
   }
 });
@@ -351,7 +351,7 @@ await initialize({
     },
     // Custom logo
     logo: {
-      image: Image.resolveAssetSource(require('./assets/logo.png')),
+      image: Image.resolveAssetSource(require('./assets/images/logo.png')),
     },
   }
 });
@@ -408,7 +408,7 @@ const switchToGreenTheme = async () => {
 - `caption1`: Small captions (default: 12pt)
 - `caption2`: Extra small captions (default: 10pt)
 
-   
+
 
 **Supported Formats:**
 - **Colors**: 3-digit (`#F63`), 6-digit (`#FF6633`), 8-digit (`#FF6633FF`) hex codes

package/android/src/main/java/com/octopuscommunity/octopusreactnativesdk/OctopusReactNativeSdkModule.kt

@@ -12,7 +12,7 @@ class OctopusReactNativeSdkModule(reactContext: ReactApplicationContext) :
   private val sdkInitializer = OctopusSDKInitializer()
   private val eventEmitter = OctopusEventEmitter(reactContext)
   private val uiController = OctopusUIController(reactContext)
-  private val ssoAuthenticator = OctopusSSOAuthenticator(eventEmitter)
+  private val ssoAuthenticator = OctopusSSOAuthenticator(reactContext, eventEmitter)
 
   override fun getName(): String = NAME
 
@@ -85,10 +85,10 @@ class OctopusReactNativeSdkModule(reactContext: ReactApplicationContext) :
       promise.reject("UPDATE_THEME_ERROR", "Failed to update theme", e)
     }
   }
-  
+
   private fun parseColor(colorString: String?): String? {
     if (colorString == null) return null
-    
+
     return try {
       // Validate that the color string is a valid hex color
       android.graphics.Color.parseColor(colorString)
@@ -99,31 +99,31 @@ class OctopusReactNativeSdkModule(reactContext: ReactApplicationContext) :
       null
     }
   }
-  
+
   private fun parseFontsConfig(fontsMap: ReadableMap): OctopusFontsConfig? {
     // Use pre-processed configuration from TypeScript layer
     val parsedConfig = fontsMap.getMap("parsedConfig")
     if (parsedConfig != null) {
       return parsePreProcessedFontsConfig(parsedConfig)
     }
-    
+
     return null
   }
-  
+
   private fun parsePreProcessedFontsConfig(parsedConfig: ReadableMap): OctopusFontsConfig? {
     val textStylesMap = parsedConfig.getMap("textStyles")
     val textStyles = mutableMapOf<String, OctopusTextStyleConfig>()
-    
+
     // Parse pre-processed font configuration from TypeScript layer
     textStylesMap?.let { textStylesMap ->
       val textStyleKeys = arrayOf("title1", "title2", "body1", "body2", "caption1", "caption2")
-      
+
       textStyleKeys.forEach { key ->
         val textStyleMap = textStylesMap.getMap(key)
         textStyleMap?.let { style ->
           val fontType = style.getString("fontType")
           val fontSize = if (style.hasKey("fontSize")) style.getDouble("fontSize") else Double.NaN
-          
+
           if (fontType != null || (!fontSize.isNaN() && fontSize > 0)) {
             textStyles[key] = OctopusTextStyleConfig(
               fontType = fontType,
@@ -133,14 +133,14 @@ class OctopusReactNativeSdkModule(reactContext: ReactApplicationContext) :
         }
       }
     }
-    
+
     // Only create fonts config if we have text styles
     if (textStyles.isNotEmpty()) {
       return OctopusFontsConfig(
         textStyles = textStyles
       )
     }
-    
+
     return null
   }
 

package/android/src/main/java/com/octopuscommunity/octopusreactnativesdk/OctopusSDKInitializer.kt

@@ -18,11 +18,11 @@ class OctopusSDKInitializer {
 
     try {
       val connectionMode = parseConnectionMode(options)
-      
+
       // Store theme configuration for later use in UI
       val themeConfig = parseThemeConfig(options)
       OctopusThemeManager.setThemeConfig(themeConfig)
-      
+
       OctopusSDK.initialize(
         context = context,
         apiKey = apiKey,
@@ -35,19 +35,19 @@ class OctopusSDKInitializer {
       promise.reject("INITIALIZE_ERROR", "Failed to initialize Octopus SDK", e)
     }
   }
-  
+
   fun parseThemeConfig(options: ReadableMap): OctopusThemeConfig? {
-    
+
     val themeMap = options.getMap("theme")
     val colorScheme = options.getString("colorScheme") // Get colorScheme from React Native
-    
+
     var primaryColor: String? = null
     var primaryLowContrastColor: String? = null
     var primaryHighContrastColor: String? = null
     var onPrimaryColor: String? = null
     var logoSource: ReadableMap? = null
     var fontsConfig: OctopusFontsConfig? = null
-    
+
     // Parse colors from theme if available
     themeMap?.let { theme ->
       val colorsMap = theme.getMap("colors")
@@ -55,7 +55,7 @@ class OctopusSDKInitializer {
         // Check if this is a dual-mode theme (has light and dark properties)
         val lightColors = colors.getMap("light")
         val darkColors = colors.getMap("dark")
-        
+
         if (lightColors != null && darkColors != null) {
           // Dual-mode theme - select colors based on current color scheme
           val selectedColors = if (colorScheme == "dark") darkColors else lightColors
@@ -71,7 +71,7 @@ class OctopusSDKInitializer {
           onPrimaryColor = parseColor(if (colors.hasKey("onPrimary")) colors.getString("onPrimary") else null)
         }
       }
-      
+
       // Handle logo from theme
       val logoMap = theme.getMap("logo")
       logoMap?.let { logo ->
@@ -80,7 +80,7 @@ class OctopusSDKInitializer {
           logoSource = imageSource
         }
       }
-      
+
       // Handle fonts from theme - use pre-processed configuration from TypeScript layer
       val fontsMap = theme.getMap("fonts")
       fontsMap?.let { fonts ->
@@ -90,7 +90,7 @@ class OctopusSDKInitializer {
         }
       }
     }
-    
+
     // Handle logo at root level (for backward compatibility)
     if (logoSource == null) {
       val rootLogoMap = options.getMap("logo")
@@ -101,7 +101,7 @@ class OctopusSDKInitializer {
         }
       }
     }
-    
+
     // Only create theme config if we have at least one customization
     if (primaryColor != null || logoSource != null || colorScheme != null || fontsConfig != null) {
       return OctopusThemeConfig(
@@ -114,24 +114,24 @@ class OctopusSDKInitializer {
         fonts = fontsConfig
       )
     }
-    
+
     return null
   }
-  
+
   private fun parsePreProcessedFontsConfig(parsedConfig: ReadableMap): OctopusFontsConfig? {
     val textStylesMap = parsedConfig.getMap("textStyles")
     val textStyles = mutableMapOf<String, OctopusTextStyleConfig>()
-    
+
     // Parse pre-processed font configuration from TypeScript layer
     textStylesMap?.let { textStylesMap ->
       val textStyleKeys = arrayOf("title1", "title2", "body1", "body2", "caption1", "caption2")
-      
+
       textStyleKeys.forEach { key ->
         val textStyleMap = textStylesMap.getMap(key)
         textStyleMap?.let { style ->
           val fontType = style.getString("fontType")
           val fontSize = if (style.hasKey("fontSize")) style.getDouble("fontSize") else Double.NaN
-          
+
           if (fontType != null || (!fontSize.isNaN() && fontSize > 0)) {
             textStyles[key] = OctopusTextStyleConfig(
               fontType = fontType,
@@ -141,18 +141,18 @@ class OctopusSDKInitializer {
         }
       }
     }
-    
+
     // Only create fonts config if we have text styles
     if (textStyles.isNotEmpty()) {
       return OctopusFontsConfig(
         textStyles = textStyles
       )
     }
-    
+
     return null
   }
 
-  
+
   private fun extractResourceNameFromUri(uri: String): String? {
     // Extract resource name from React Native image URI
     // Examples: "logo.png" -> "logo", "images/logo.png" -> "logo"
@@ -163,10 +163,10 @@ class OctopusSDKInitializer {
       null
     }
   }
-  
+
   private fun parseColor(colorString: String?): String? {
     if (colorString == null) return null
-    
+
     return try {
       // Validate that the color string is a valid hex color
       Color.parseColor(colorString)

package/android/src/main/java/com/octopuscommunity/octopusreactnativesdk/OctopusSSOAuthenticator.kt

@@ -15,8 +15,13 @@ import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
+import android.content.Context
 
-class OctopusSSOAuthenticator(private val eventEmitter: OctopusEventEmitter) {
+
+class OctopusSSOAuthenticator(
+  private val context: Context,
+  private val eventEmitter: OctopusEventEmitter
+ ) {
 
   private val coroutineScope = CoroutineScope(Dispatchers.Main)
   private val pendingTokenRequests =
@@ -107,10 +112,22 @@ class OctopusSSOAuthenticator(private val eventEmitter: OctopusEventEmitter) {
     } else null
 
     val profilePicture = profileParams.getString("profilePicture")?.let { pictureUrl ->
-      if (pictureUrl.isNotBlank() && (pictureUrl.startsWith("http://") || pictureUrl.startsWith("https://"))) {
+      if (pictureUrl.startsWith("http://") || pictureUrl.startsWith("https://")) {
         Image.Remote(pictureUrl)
-      } else if (pictureUrl.isNotBlank()) {
+      } else if (pictureUrl.startsWith("file") || pictureUrl.startsWith("android.resource")) {
         Image.Local(pictureUrl)
+      } else if(pictureUrl.isNotBlank()) {
+        // Asset names like "assets_images_logo" need conversion
+        // Convert to drawable resource URI
+        val resourceId = context.resources.getIdentifier(pictureUrl, "drawable", context.packageName)
+        Image.Local(
+          if (resourceId != 0) {
+            "android.resource://${context.packageName}/$resourceId"
+          } else {
+            // Fallback: try assets folder
+            "file:///android_asset/$pictureUrl"
+          }
+        )
       } else {
         null
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octopus-community/react-native",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "React Native module for the Octopus Community SDK",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",