feat: custom color support hex, rgba, named colors

Author: 4cc3ssX

README.md

@@ -177,7 +177,7 @@ alert({
 - [x] `tintColor` for icon (v.1.0.5)
 - [x] `backgroundColor` (v.1.0.3)
 - [x] `spinner preset for toast` (v.1.1.0)
-- [ ] custom color like StyleSheet (e.g. `#fff`, `red`, `rgba(0, 0, 0, .8)`)
+- [x] custom color like StyleSheet (e.g. `#fff`, `red`, `rgba(0, 0, 0, .8)`)
 - [ ] `shouldDismissByDrag` on **Android**
 - [ ] `callback`
 

android/src/main/java/com/ting/TingModule.kt

@@ -38,9 +38,9 @@ class TingModule internal constructor(context: ReactApplicationContext) : TingSp
   private var alertOptionInit: ReadableMap? = null
 
   @ReactMethod
-  override fun toast(RNOptions: ReadableMap) {
+  override fun toast(options: ReadableMap) {
     // get container View
-    val options = toastOptionInit?.let { mergeMaps(it, RNOptions) } ?: RNOptions
+    val options = toastOptionInit?.let { mergeMaps(it, options) } ?: options
 
     val container = getContainerView(R.layout.toast, options, "toast")
     val duration: Int = getDuration(options)
@@ -77,8 +77,8 @@ class TingModule internal constructor(context: ReactApplicationContext) : TingSp
   }
 
   @ReactMethod
-  override fun alert(RNOptions: ReadableMap) {
-    val options = alertOptionInit?.let { mergeMaps(it, RNOptions) } ?: RNOptions
+  override fun alert(options: ReadableMap) {
+    val options = alertOptionInit?.let { mergeMaps(it, options) } ?: options
 
     val container = getContainerView(R.layout.alert, options, "alert")
     val duration: Int = getDuration(options)
@@ -280,14 +280,36 @@ fun isNumber(value: Any?): Boolean {
   return value != null && (value is Int || value is Long || value is Float || value is Double)
 }
 
-fun parseColor(hexColor: String): Int {
+fun parseColor(colorString: String): Int {
   val fallbackColor = Color.BLACK
-  val color = try {
-    Color.parseColor(hexColor)
-  } catch (e: IllegalArgumentException) {
-    fallbackColor
+  // Try parsing color as hex
+  if (colorString.startsWith("#")) {
+    return Color.parseColor(colorString)
   }
-  return color
+
+  // Try parsing color as named color
+  val namedColor = try {
+    Color::class.java.getField(colorString.uppercase()).get(null) as Int
+  } catch (e: Exception) {
+    null
+  }
+  if (namedColor != null) {
+    return namedColor
+  }
+
+  // Try parsing color as RGB or RGBA
+  val rgbRegex = Regex("""rgba?\((\d{1,3}), (\d{1,3}), (\d{1,3})(, (\d(\.\d)?))?\)""")
+  val rgbMatchResult = rgbRegex.matchEntire(colorString)
+  if (rgbMatchResult != null) {
+    val red = rgbMatchResult.groups[1]?.value?.toIntOrNull() ?: return fallbackColor
+    val green = rgbMatchResult.groups[2]?.value?.toIntOrNull() ?: return fallbackColor
+    val blue = rgbMatchResult.groups[3]?.value?.toIntOrNull() ?: return fallbackColor
+    val alpha = if (colorString.startsWith("rgb(")) 1.0f else rgbMatchResult.groups[5]?.value?.toFloatOrNull() ?: 1.0f
+    return Color.argb((alpha * 255).toInt(), red, green, blue)
+  }
+
+  // Return fallback color if parsing fails
+  return fallbackColor
 }
 
 fun convertInt2Size(number: Int?): Int {

ios/Type.swift

@@ -27,14 +27,14 @@ class Options {
         self.title = option["title"] as? String ?? "Title"
         self.message = option["message"] as? String
         self.duration = option["duration"] as? TimeInterval ?? 3
-        self.backgroundColor = UIColor.hexStringToColor(option["backgroundColor"] as? String)
+        self.backgroundColor = UIColor.parseColor(option["backgroundColor"] as? String)
 
         if let messageColor = option["messageColor"] as? String {
-            self.messageColor = UIColor.hexStringToColor(messageColor)
+            self.messageColor = UIColor.parseColor(messageColor)
         }
 
         if let titleColor = option["titleColor"] as? String {
-            self.titleColor = UIColor.hexStringToColor(titleColor)
+            self.titleColor = UIColor.parseColor(titleColor)
         }
 
         // custom icon
@@ -53,7 +53,7 @@ class Options {
 func getCustomIcon(icon: NSDictionary) -> UIImage? {
     if let iconURI = icon["uri"] as? String {
         if let iconImage = getImage(icon: iconURI) {
-            let color = UIColor.hexStringToColor(icon["tintColor"] as? String)
+            let color = UIColor.parseColor(icon["tintColor"] as? String)
             if(color != nil){
                 return iconImage.getTintColor(color!)
             }

ios/Utils.swift

@@ -30,26 +30,57 @@ extension UIImage {
 }
 
 extension UIColor {
-    static func hexStringToColor(_ stringToConvert: String?) -> UIColor? {
-        if stringToConvert == nil {
+    static func parseColor(_ colorString: String?) -> UIColor? {
+        guard let colorString = colorString else {
             return nil
         }
 
-        let noHashString = stringToConvert!.replacingOccurrences(of: "#", with: "")
-        
-        // Đảm bảo độ dài chuỗi hợp lệ
-        guard noHashString.count == 6 else {
-            return nil
+        // Try parsing color as hex
+        if colorString.hasPrefix("#") {
+            let hexString = String(colorString.dropFirst()) // Remove '#' character
+            
+            // Check if the hex string has valid length
+            guard hexString.count == 6 || hexString.count == 8 else {
+                return .gray // Return gray color for invalid hex string
+            }
+            
+            // Parse hex values
+            var rgbValue: UInt64 = 0
+            Scanner(string: hexString).scanHexInt64(&rgbValue)
+            
+            // Extract individual color components
+            let red = CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0
+            let green = CGFloat((rgbValue & 0x00FF00) >> 8) / 255.0
+            let blue = CGFloat(rgbValue & 0x0000FF) / 255.0
+            let alpha = hexString.count == 8 ? CGFloat((rgbValue & 0xFF000000) >> 24) / 255.0 : 1.0
+            
+            // Create and return UIColor
+            return UIColor(red: red, green: green, blue: blue, alpha: alpha)
         }
 
-        var rgbValue: UInt64 = 0
-        Scanner(string: noHashString).scanHexInt64(&rgbValue)
+        // Try parsing color as named color
+        if let namedColor = UIColor(named: colorString) {
+            return namedColor
+        }
 
-        let r = CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0
-        let g = CGFloat((rgbValue & 0x00FF00) >> 8) / 255.0
-        let b = CGFloat(rgbValue & 0x0000FF) / 255.0
+        // Try parsing color as RGB or RGBA
+        let rgbRegex = try! NSRegularExpression(pattern: #"rgba?\((\d{1,3}), (\d{1,3}), (\d{1,3})(, (\d(\.\d)?))?\)"#)
+        if let rgbMatch = rgbRegex.firstMatch(in: colorString, range: NSRange(colorString.startIndex..., in: colorString)) {
+            let red = Int(colorString[Range(rgbMatch.range(at: 1), in: colorString)!])!
+            let green = Int(colorString[Range(rgbMatch.range(at: 2), in: colorString)!])!
+            let blue = Int(colorString[Range(rgbMatch.range(at: 3), in: colorString)!])!
+            let alpha = rgbMatch.numberOfRanges > 5 ? Float(colorString[Range(rgbMatch.range(at: 5), in: colorString)!])! : 1.0
+            
+            // If the color string starts with "rgb(", ignore the alpha component
+            if colorString.hasPrefix("rgb(") {
+                return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: 1.0)
+            } else {
+                return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(alpha))
+            }
+        }
 
-        return UIColor(red: r, green: g, blue: b, alpha: 1.0)
+        // Fallback to black color
+        return .black
     }
 }