Add AssetImage

Author: anton-knyazev

app/src/main/assets/test.png

@@ -12,6 +12,7 @@ import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.text.HtmlCompat
 import com.omega_r.libs.omegatypes.*
+import com.omega_r.libs.omegatypes.Size.Unit.SP
 import com.omega_r.libs.omegatypes.file.File
 import com.omega_r.libs.omegatypes.file.from
 import com.omega_r.libs.omegatypes.image.*
@@ -51,8 +52,8 @@ class MainActivity : BaseActivity() {
             .append(addText)
             .append(Text.empty())
             .append(Text.from(R.string.text_format_test, "1-9"))
-
-            .append(Text.from("test "))
+            .append(Text.from(" test Image -> "))
+//            .append(AssetImage("test.webp"))
             .append(Text.from(Image.from(R.drawable.ic_test)))
             .append(
                 Text.from(
@@ -71,6 +72,8 @@ class MainActivity : BaseActivity() {
 
         text.applyTo(exampleTextView) // or exampleTextView.setText(text)
 
+        exampleTextView.setTextSize(16.sp)
+
         val list = listOf(
             Text.from("1", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))),
             Text.from("2", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))),
@@ -79,8 +82,8 @@ class MainActivity : BaseActivity() {
 
         title = list.join(",", postfix = ".").getCharSequence(this)
 
-        val image =
-            Image.from("https://dejagerart.com/wp-content/uploads/2018/09/Test-Logo-Circle-black-transparent.png")
+        val image = AssetImage("test.webp")
+            //Image.from("https://dejagerart.com/wp-content/uploads/2018/09/Test-Logo-Circle-black-transparent.png")
 
 //        val image = intent.getSerializableExtra("test") as? Image ?: run {
 //

app/src/main/assets/test.webp

@@ -54,6 +54,7 @@ open class GlideImagesProcessor(
             is BitmapImage -> load(image.bitmap)
             is DrawableImage -> load(image.drawable)
             is ByteArrayImage -> load(image.byteArray)
+            is AssetImage -> load("file:///android_asset/" + image.fileName)
             else -> null
         }
     }

app/src/main/java/omega_r/com/omegatypesexample/MainActivity.kt

@@ -12,7 +12,6 @@ import android.widget.TextView
 import java.io.Serializable
 import java.util.*
 
-
 /**
  * Created by Anton Knyazev on 18.05.2019.
  */
@@ -23,9 +22,11 @@ abstract class Color : Serializable {
 
     abstract fun getColorInt(context: Context): Int
 
-    open fun getColorStateList(context: Context): ColorStateList {
-        return ColorStateList.valueOf(getColorInt(context))
-    }
+    open fun getColorStateList(context: Context): ColorStateList = ColorStateList.valueOf(getColorInt(context))
+
+    abstract override fun equals(other: Any?): Boolean
+
+    abstract override fun hashCode(): Int
 
     companion object {
 
@@ -79,17 +80,47 @@ abstract class Color : Serializable {
 
         @JvmStatic
         fun fromColorList(colorStateList: ColorStateList): Color = ColorStateListColor(colorStateList)
-
     }
 
     class IntColor(private val colorInt: Int) : Color() {
+
         override fun getColorInt(context: Context) = colorInt
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is IntColor) return false
+
+            if (colorInt != other.colorInt) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            return colorInt
+        }
     }
 
     class HexStringColor(val hexString: String) : Color() {
+
         private val colorInt: Int = GraphicColor.parseColor(hexString)
 
         override fun getColorInt(context: Context) = colorInt
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is HexStringColor) return false
+
+            if (hexString != other.hexString) return false
+            if (colorInt != other.colorInt) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = hexString.hashCode()
+            result = 31 * result + colorInt
+            return result
+        }
     }
 
     class ResourceColor(private val colorRes: Int) : Color() {
@@ -109,14 +140,26 @@ abstract class Color : Serializable {
                 context.resources.getColorStateList(colorRes)
             }
         }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is ResourceColor) return false
+
+            if (colorRes != other.colorRes) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            return colorRes
+        }
     }
 
     class AttrThemeColor(private val attrInt: Int) : Color() {
 
         companion object {
 
             private val cache = WeakHashMap<Resources.Theme, SparseIntArray>()
-
         }
 
         override fun getColorInt(context: Context): Int {
@@ -149,6 +192,18 @@ abstract class Color : Serializable {
             }
         }
 
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is AttrThemeColor) return false
+
+            if (attrInt != other.attrInt) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            return attrInt
+        }
     }
 
     class ColorStateListColor(private val colorStateList: ColorStateList) : Color() {
@@ -161,8 +216,19 @@ abstract class Color : Serializable {
             return colorStateList
         }
 
-    }
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is ColorStateListColor) return false
+
+            if (colorStateList != other.colorStateList) return false
 
+            return true
+        }
+
+        override fun hashCode(): Int {
+            return colorStateList.hashCode()
+        }
+    }
 }
 
 var TextView.textColor: Color
@@ -187,5 +253,5 @@ var View.backgroundColor: Color?
     get() = (background as? ColorDrawable)?.color?.let { Color.fromInt(it) }
     set(value) {
         value?.let { setBackgroundColor(it.getColorInt(context)) }
-                ?: setBackgroundDrawable(null)
+            ?: setBackgroundDrawable(null)
     }

glide/src/main/java/com/omega_r/libs/omegatypes/image/GlideImagesProcessor.kt

@@ -133,6 +133,10 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
             return string
         }
 
+        override fun toString(): String {
+            return string.toString()
+        }
+
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (javaClass != other?.javaClass) return false
@@ -170,6 +174,10 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
             return (defaultTextStyle + textStyle)?.applyStyle(context, charSequence) ?: charSequence
         }
 
+        override fun toString(): String {
+            return charSequence.toString()
+        }
+
         @Throws(IOException::class)
         private fun writeObject(stream: ObjectOutputStream) {
             charSequence.let { charSequence ->
@@ -231,6 +239,10 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
             return context.getString(stringRes)
         }
 
+        override fun toString(): String {
+            return "ResourceText($stringRes)"
+        }
+
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (javaClass != other?.javaClass) return false
@@ -271,6 +283,7 @@ 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) {
@@ -312,6 +325,10 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
 
         override fun getText(context: Context): CharSequence = context.getText(stringRes)
 
+        override fun toString(): String {
+            return "ResourceFormatText($stringRes, $formatArgs)"
+        }
+
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (javaClass != other?.javaClass) return false
@@ -360,6 +377,10 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
             result = 31 * result + formatArgs.contentHashCode()
             return result
         }
+
+        override fun toString(): String {
+            return "PluralsFormatText(res=$res, quantity=$quantity, formatArgs=$formatArgs)"
+        }
     }
 
     private class ArrayText constructor(
@@ -413,6 +434,10 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
             result = 31 * result + texts.contentHashCode()
             return result
         }
+
+        override fun toString(): String {
+            return "ArrayText(texts=$texts)"
+        }
     }
 
     interface StringHolder {

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

@@ -2,6 +2,7 @@ package com.omega_r.libs.omegatypes
 
 import android.content.Context
 import android.content.res.Resources
+import com.omega_r.libs.omegatypes.image.Image
 import java.io.Serializable
 
 /**
@@ -27,6 +28,8 @@ class TextBuilder(capacity: Int) : Serializable {
         return this
     }
 
+    fun append(image: Image): TextBuilder = append(Text.from(image))
+
     fun append(string: String) = append(Text.from(string))
 
     fun append(stringRes: Int) = append(Text.from(stringRes))

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

@@ -0,0 +1,24 @@
+package com.omega_r.libs.omegatypes.image
+
+import android.content.Context
+import android.graphics.Bitmap
+import com.omega_r.libs.omegatypes.decoders.toBitmap
+
+data class AssetImage(val fileName: String) : BaseBitmapImage() {
+
+    companion object {
+
+        init {
+            ImageProcessors.default.addImageProcessor(AssetImage::class, Processor())
+        }
+    }
+
+    class Processor : BaseBitmapImage.Processor<AssetImage>(true) {
+
+        override suspend fun getBitmap(context: Context, image: AssetImage, width: Int?, height: Int?): Bitmap? {
+            return context.assets.open(image.fileName).use {
+                it.toBitmap(width, height)
+            }
+        }
+    }
+}

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

@@ -7,9 +7,6 @@ import com.omega_r.libs.omegatypes.decoders.toBitmap
 import com.omega_r.libs.omegatypes.file.File
 import com.omega_r.libs.omegatypes.file.FileSystems
 
-/**
- * Created by Anton Knyazev on 2019-10-07.
- */
 /**
  * Created by Anton Knyazev on 2019-10-03.
  */

omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/AssetImage.kt

@@ -26,8 +26,7 @@ data class UrlImage(val baseUrl: String? = null, val relativeUrl: String) : Base
         private fun String.isAbsoluteUrl(): Boolean = PATTERN_ABSOLUTE_URL.matcher(this).matches()
 
     }
-
-
+    
     val url: String
         get() = if (relativeUrl.isAbsoluteUrl()) relativeUrl else {
             val baseUrl = (baseUrl ?: defaultBaseUrl ?: "").removeSuffix("/")