Text.format

Color.withAlpha

Author: anton-knyazev

omegatypes/src/main/java/com/omega_r/libs/omegatypes/Color.kt

@@ -24,6 +24,8 @@ abstract class Color : Serializable {
 
     open fun getColorStateList(context: Context): ColorStateList = ColorStateList.valueOf(getColorInt(context))
 
+    fun withAlpha(alpha: Int) = AlphaColor(alpha, this)
+
     abstract override fun equals(other: Any?): Boolean
 
     abstract override fun hashCode(): Int
@@ -75,13 +77,24 @@ abstract class Color : Serializable {
         @JvmStatic
         fun fromArgb(alpha: Int, red: Int, green: Int, blue: Int): Color = IntColor(GraphicColor.argb(alpha, red, green, blue))
 
+        @JvmStatic
+        fun fromRgb(red: Int, green: Int, blue: Int): Color = fromArgb(255, red, green, blue)
+
         @JvmStatic
         fun fromString(colorString: String): Color = HexStringColor(colorString)
 
         @JvmStatic
         fun fromColorList(colorStateList: ColorStateList): Color = ColorStateListColor(colorStateList)
     }
 
+    data class AlphaColor(private val alpha: Int, private val color: Color) : Color() {
+
+        override fun getColorInt(context: Context): Int {
+            val colorInt = color.getColorInt(context)
+            return GraphicColor.argb(alpha, GraphicColor.red(colorInt), GraphicColor.green(colorInt), GraphicColor.blue(colorInt))
+        }
+    }
+
     class IntColor(private val colorInt: Int) : Color() {
 
         override fun getColorInt(context: Context) = colorInt

omegatypes/src/main/java/com/omega_r/libs/omegatypes/Text.kt

@@ -69,6 +69,12 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
 
         @JvmStatic
         fun from(image: Image): Text = ImageText(image)
+
+        fun format(stringRes: Int, vararg formatArgs: Serializable, textStyle: TextStyle? = null) =
+            from(stringRes, formatArgs = formatArgs, textStyle)
+
+        fun format(format: Text, vararg formatArgs: Serializable, textStyle: TextStyle? = null): Text =
+            TextFormatText(format, formatArgs = formatArgs, textStyle)
     }
 
     open fun isEmpty(): Boolean = true
@@ -124,7 +130,7 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
 
     private class StringText constructor(
         private val string: String?,
-        textStyle: TextStyle?
+        textStyle: TextStyle?,
     ) : Text(textStyle) {
 
         override fun isEmpty(): Boolean = string.isNullOrEmpty()
@@ -155,7 +161,7 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
 
     private class CharSequenceText constructor(
         private var charSequence: CharSequence,
-        textStyle: TextStyle?
+        textStyle: TextStyle?,
     ) : Text(textStyle) {
 
         companion object {
@@ -224,7 +230,7 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
 
     private class ResourceText constructor(
         private val stringRes: Int,
-        textStyle: TextStyle?
+        textStyle: TextStyle?,
     ) : Text(textStyle) {
 
         override fun isEmpty(): Boolean = stringRes <= 0
@@ -261,7 +267,7 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
 
     private abstract class FormatText(
         protected vararg val formatArgs: Serializable,
-        defaultTextStyle: TextStyle?
+        defaultTextStyle: TextStyle?,
     ) : Text(defaultTextStyle) {
 
         protected abstract fun getText(context: Context): CharSequence
@@ -283,7 +289,6 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
             return String.format(context.getLocale(), string, *formatArgs)
         }
 
-
         override fun getCharSequence(context: Context, textStyle: TextStyle?): CharSequence {
             val text = getText(context)
             return if (text is Spanned || formatArgs.firstOrNull { it is Text || it is Image } != null) {
@@ -317,12 +322,11 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
     private class ResourceFormatText constructor(
         private val stringRes: Int,
         vararg formatArgs: Serializable,
-        textStyle: TextStyle?
+        textStyle: TextStyle?,
     ) : FormatText(formatArgs = *formatArgs, defaultTextStyle = textStyle) {
 
         override fun isEmpty(): Boolean = stringRes <= 0
 
-
         override fun getText(context: Context): CharSequence = context.getText(stringRes)
 
         override fun toString(): String {
@@ -349,7 +353,7 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
         private val res: Int,
         private val quantity: Int,
         vararg formatArgs: Serializable,
-        textStyle: TextStyle? = null
+        textStyle: TextStyle? = null,
     ) : FormatText(formatArgs = *formatArgs, defaultTextStyle = textStyle) {
 
         override fun isEmpty(): Boolean = res <= 0
@@ -383,9 +387,42 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
         }
     }
 
+    private class TextFormatText(
+        private val text: Text,
+        vararg formatArgs: Serializable,
+        textStyle: TextStyle? = null,
+    ) : FormatText(formatArgs = formatArgs, defaultTextStyle = textStyle) {
+
+        override fun isEmpty(): Boolean {
+            return text.isEmpty()
+        }
+
+        override fun getText(context: Context): CharSequence {
+            return text.getCharSequence(context) ?: ""
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is TextFormatText) return false
+            if (!super.equals(other)) return false
+
+            if (text != other.text) return false
+            if (!formatArgs.contentEquals(other.formatArgs)) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = super.hashCode()
+            result = 31 * result + text.hashCode()
+            result = 31 * result + formatArgs.contentHashCode()
+            return result
+        }
+    }
+
     private class ArrayText constructor(
         private vararg val texts: Text,
-        textStyle: TextStyle?
+        textStyle: TextStyle?,
     ) : Text(textStyle) {
 
         override fun isEmpty(): Boolean {
@@ -512,7 +549,7 @@ fun List<Textable>.join(
     prefix: String = "",
     postfix: String = "",
     limit: Int = -1,
-    truncated: String = "..."
+    truncated: String = "...",
 ): Text {
     var buffer = if (prefix.isNotEmpty()) Text.from(prefix) else Text.from()