Refactoring Color, Size and Text

Author: anton-knyazev

build.gradle

@@ -1,6 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.3.41'
     ext.kotlin_version = '1.3.30'
     ext.supportVersion = '28.0.0'
     ext.compileSdkVersion = 28

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

@@ -111,12 +111,6 @@ abstract class Color : Serializable {
 
         }
 
-        private fun extractColor(theme: Resources.Theme): Int {
-            return TypedValue().run {
-                if (theme.resolveAttribute(attrInt, this, true)) data else 0
-            }
-        }
-
         override fun getColorInt(context: Context): Int {
 
             val theme = context.theme
@@ -127,15 +121,23 @@ abstract class Color : Serializable {
                 if (this >= 0) {
                     sparseIntArray.valueAt(this)
                 } else {
-                    extractColor(theme).apply {
-                        sparseIntArray.put(attrInt, this)
-                    }
+                    sparseIntArray.extractAndPutCache(theme)
                 }
             } ?: SparseIntArray().run {
                 cache[theme] = this
-                extractColor(theme).apply {
-                    put(attrInt, this)
-                }
+                extractAndPutCache(theme)
+            }
+        }
+
+        private fun SparseIntArray.extractAndPutCache(theme: Resources.Theme): Int {
+            return extractColor(theme).apply {
+                put(attrInt, this)
+            }
+        }
+
+        private fun extractColor(theme: Resources.Theme): Int {
+            return TypedValue().run {
+                if (theme.resolveAttribute(attrInt, this, true)) data else 0
             }
         }
 
@@ -165,4 +167,10 @@ var TextView.hintTextColor: Color
     get() = Color.fromColorList(hintTextColors)
     set(value) {
         setHintTextColor(value.getColorStateList(context))
+    }
+
+var TextView.linkTextColor: Color
+    get() = Color.fromColorList(linkTextColors)
+    set(value) {
+        setLinkTextColor(value.getColorStateList(context))
     }

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

@@ -1,9 +1,15 @@
 package com.omega_r.libs.omegatypes
 
 import android.content.Context
+import android.content.res.Resources
 import android.util.DisplayMetrics
+import android.util.SparseArray
+import android.util.SparseIntArray
+import android.util.TypedValue
 import android.util.TypedValue.*
+import android.widget.TextView
 import java.io.Serializable
+import java.util.*
 
 /**
  * Created by Anton Knyazev on 18.05.2019.
@@ -18,6 +24,9 @@ abstract class Size : Serializable {
         @JvmStatic
         fun from(dimensionRes: Int): Size = DimensionResourceSize(dimensionRes)
 
+        @JvmStatic
+        fun fromAttribute(dimensionAttr: Int): Size = AttrThemeSize(dimensionAttr)
+
     }
 
     abstract fun getSize(context: Context, unit: Unit): Float
@@ -102,11 +111,58 @@ abstract class Size : Serializable {
     private class DimensionResourceSize(private val sizeRes: Int) : Size() {
 
         override fun getSize(context: Context, unit: Unit) = context.resources.run {
-            getDimension(sizeRes).applyFactor(context, Unit.PX, unit)
+            getRawSize(context).applyFactor(context, Unit.PX, unit)
         }
 
         override fun getRawSize(context: Context) = context.resources.getDimension(sizeRes)
 
     }
+
+    class AttrThemeSize(private val attrInt: Int) : Size() {
+
+        companion object {
+
+            private val cache = WeakHashMap<Resources.Theme, SparseArray<Float>>()
+
+        }
+
+        override fun getSize(context: Context, unit: Unit): Float = context.resources.run {
+            getRawSize(context).applyFactor(context, Unit.PX, unit)
+        }
+
+        override fun getRawSize(context: Context): Float {
+            val theme = context.theme
+            val metrics = context.resources.displayMetrics
+            val sparseIntArray = cache[theme]
+
+            return (sparseIntArray?.indexOfKey(attrInt)?.run {
+                if (this >= 0) {
+                    sparseIntArray.valueAt(this)
+                } else {
+                    sparseIntArray.extractAndPutCache(metrics, theme)
+                }
+            } ?: SparseArray<Float>().run {
+                cache[theme] = this
+                extractAndPutCache(metrics, theme)
+            })
+        }
+
+        private fun SparseArray<Float>.extractAndPutCache(metrics: DisplayMetrics, theme: Resources.Theme): Float {
+            return extractSize(metrics, theme).apply {
+                put(attrInt, this)
+            }
+        }
+
+        private fun extractSize(metrics: DisplayMetrics, theme: Resources.Theme): Float {
+            return TypedValue().run {
+                if (theme.resolveAttribute(attrInt, this, true)) getDimension(metrics) else 0f
+            }
+        }
+
+    }
+
 }
 
+fun TextView.setTextSize(size: Size) {
+    setTextSize(COMPLEX_UNIT_PX, size.getSize(context, Size.Unit.PX))
+}

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

@@ -35,7 +35,7 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
 
         @JvmStatic
         @JvmOverloads
-        fun from(stringRes: Int, quantity: Int, vararg formatArgs: Any, textStyle: TextStyle? = null): Text = PluralsText(stringRes, quantity, *formatArgs, textStyle = textStyle)
+        fun fromPlurals(stringRes: Int, quantity: Int, vararg formatArgs: Any, textStyle: TextStyle? = null): Text = PluralsText(stringRes, quantity, *formatArgs, textStyle = textStyle)
 
         @JvmStatic
         @JvmOverloads