Merge pull request #38 from Omega-R/develop

anton-knyazev · web-flow · commit 600e11cfb4f8 · 2021-04-20T18:23:13.000+03:00
Develop
diff --git a/app/src/main/java/omega_r/com/omegatypesexample/MainActivity.kt b/app/src/main/java/omega_r/com/omegatypesexample/MainActivity.kt
@@ -5,16 +5,14 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
+import android.util.Log
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
-import com.omega_r.libs.omegatypes.Color
-import com.omega_r.libs.omegatypes.Text
-import com.omega_r.libs.omegatypes.TextStyle
+import com.omega_r.libs.omegatypes.*
 import com.omega_r.libs.omegatypes.file.File
 import com.omega_r.libs.omegatypes.file.from
 import com.omega_r.libs.omegatypes.image.*
-import com.omega_r.libs.omegatypes.join
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -31,16 +29,20 @@ class MainActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_main)
-        val text = Text.from("test ") +
-                Text.from(
+        val text = TextBuilder()
+                .append(Text.empty())
+                .append(Text.from("test "))
+                .append(Text.from(
                         R.string.hello_world,
                         Text.from(R.string.app_name),
                         textStyle = TextStyle.font(ResourcesCompat.getFont(this, R.font.noto_sans_regular)!!)
-                ) +
-                Text.from(
+                ))
+                .append(Text.from(
                         "   SEMI BOLD",
                         textStyle = TextStyle.font(ResourcesCompat.getFont(this, R.font.noto_sans_semi_bold)!!)
-                )
+                ))
+                .toText()
+
         text.applyTo(exampleTextView) // or exampleTextView.setText(text)
 
         val list = listOf(Text.from("1", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))), Text.from("2", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))), Text.from("3"))
@@ -74,7 +76,9 @@ class MainActivity : BaseActivity() {
 //            image
 //        }
 
-        imageView.setImage(image)
+        imageView.setImage(image, processor = GlideImagesProcessor(ImageProcessors.current), onImageApplied = {
+            Log.d("TAG","onImageApplied")
+        })
 
 
 
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/glide/src/main/java/com/omega_r/libs/omegatypes/image/GlideImagesProcessor.kt b/glide/src/main/java/com/omega_r/libs/omegatypes/image/GlideImagesProcessor.kt
@@ -3,11 +3,16 @@ package com.omega_r.libs.omegatypes.image
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
+import android.util.Log
 import android.view.View
 import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.CustomViewTarget
+import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.request.transition.Transition
 import com.omega_r.libs.omegatypes.decoders.BitmapDecoders
 import com.omega_r.libs.omegatypes.decoders.SimpleBitmapDecoders
@@ -18,8 +23,8 @@ import kotlin.reflect.KClass
 /**
  * Created by Anton Knyazev on 2019-10-03.
  */
-class GlideImagesProcessor(
-        private val oldImagesProcessor: ImageProcessors,
+open class GlideImagesProcessor(
+        protected val oldImagesProcessor: ImageProcessors,
         vararg excludeImageClasses: KClass<out Image>
 ) : ImageProcessors() {
 
@@ -37,7 +42,7 @@ class GlideImagesProcessor(
 
     private val excludeImageClasses = listOf(*excludeImageClasses)
 
-    private fun <T> RequestBuilder<T>.createRequestBuilder(image: Image): RequestBuilder<T>? {
+    protected fun <T> RequestBuilder<T>.createRequestBuilder(image: Image): RequestBuilder<T>? {
         if (excludeImageClasses.contains(image::class)) {
             return null
         }
@@ -53,11 +58,12 @@ class GlideImagesProcessor(
         }
     }
 
-    override fun Image.applyImage(imageView: ImageView, placeholderResId: Int) {
+    override fun Image.applyImage(imageView: ImageView, placeholderResId: Int, onImageApplied: (() -> Unit)?) {
         Glide.with(imageView)
                 .asDrawable()
                 .createRequestBuilder(this)
                 ?.applyPlaceholder(placeholderResId)
+                ?.listener(GlideImageRequestListener(onImageApplied))
                 ?.into(imageView)
                 ?: applyOld { applyImage(imageView, placeholderResId) }
     }
@@ -110,11 +116,45 @@ class GlideImagesProcessor(
                 ?: applyOld { preload(context) }
     }
 
-    private fun <T> RequestBuilder<T>.applyPlaceholder(placeholderResId: Int): RequestBuilder<T> {
+    protected fun <T> RequestBuilder<T>.applyPlaceholder(placeholderResId: Int): RequestBuilder<T> {
         return if (placeholderResId != NO_PLACEHOLDER_RES) placeholder(placeholderResId) else this
     }
 
-    private inline fun <R> applyOld(block: ImageProcessors.() -> R): R {
+    protected inline fun <R> applyOld(block: ImageProcessors.() -> R): R {
         return block(oldImagesProcessor)
     }
+}
+
+class GlideImageRequestListener(private val onImageLoaded: (() -> Unit)?) : RequestListener<Drawable> {
+
+    companion object {
+        private val TAG = GlideImageRequestListener::class.java.name
+    }
+
+    override fun onLoadFailed(
+            e: GlideException?,
+            model: Any?,
+            target: Target<Drawable>?,
+            isFirstResource: Boolean
+    ): Boolean {
+        Log.e(TAG, "Image load failed: ", e)
+        if (isFirstResource) {
+            onImageLoaded?.invoke()
+        }
+        return false
+    }
+
+    override fun onResourceReady(
+            resource: Drawable,
+            model: Any?,
+            target: Target<Drawable>,
+            dataSource: DataSource,
+            isFirstResource: Boolean
+    ): Boolean {
+        target.onResourceReady(resource, null)
+        if (isFirstResource) {
+            onImageLoaded?.invoke()
+        }
+        return true
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed May 29 11:12:26 MSK 2019
+#Tue Apr 21 10:08:25 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/omegatypes/src/main/java/com/omega_r/libs/omegatypes/Color.kt b/omegatypes/src/main/java/com/omega_r/libs/omegatypes/Color.kt
@@ -3,9 +3,11 @@ package com.omega_r.libs.omegatypes
 import android.content.Context
 import android.content.res.ColorStateList
 import android.content.res.Resources
+import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.util.SparseIntArray
 import android.util.TypedValue
+import android.view.View
 import android.widget.TextView
 import java.io.Serializable
 import java.util.*
@@ -179,4 +181,11 @@ var TextView.linkTextColor: Color
     get() = Color.fromColorList(linkTextColors)
     set(value) {
         setLinkTextColor(value.getColorStateList(context))
+    }
+
+var View.backgroundColor: Color?
+    get() = (background as? ColorDrawable)?.color?.let { Color.fromInt(it) }
+    set(value) {
+        value?.let { setBackgroundColor(it.getColorInt(context)) }
+                ?: setBackgroundDrawable(null)
     }
diff --git a/omegatypes/src/main/java/com/omega_r/libs/omegatypes/Text.kt b/omegatypes/src/main/java/com/omega_r/libs/omegatypes/Text.kt
@@ -2,10 +2,16 @@ package com.omega_r.libs.omegatypes
 
 import android.app.Activity
 import android.content.Context
+import android.text.Html
+import android.text.SpannableString
 import android.text.SpannableStringBuilder
+import android.text.Spanned
 import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
+import java.io.IOException
+import java.io.ObjectInputStream
+import java.io.ObjectOutputStream
 import java.io.Serializable
 import java.util.*
 
@@ -136,9 +142,14 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
 
 
     private class CharSequenceText internal constructor(
-            private val charSequence: CharSequence,
+            private var charSequence: CharSequence,
             textStyle: TextStyle?) : Text(textStyle) {
 
+        companion object {
+            private const val TYPE_SPANNED = 0.toByte()
+            private const val TYPE_STRING = 1.toByte()
+        }
+
         override fun isEmpty(): Boolean = charSequence.isEmpty()
 
         override fun getString(context: Context): String? {
@@ -149,6 +160,34 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
             return (defaultTextStyle + textStyle)?.applyStyle(context, charSequence) ?: charSequence
         }
 
+        @Throws(IOException::class)
+        private fun writeObject(stream: ObjectOutputStream) {
+            charSequence.let { charSequence->
+                when (charSequence) {
+                    is Spanned -> {
+                        stream.writeByte(TYPE_SPANNED.toInt())
+                        stream.writeObject(Html.toHtml(charSequence))
+                    }
+                    is String -> {
+                        stream.writeByte(TYPE_STRING.toInt())
+                        stream.writeUTF(charSequence)
+                    }
+                    else -> {
+                        throw IOException("Unknown type " + charSequence::class.simpleName)
+                    }
+                }
+            }
+        }
+
+        @Throws(IOException::class, ClassNotFoundException::class)
+        private fun readObject(stream: ObjectInputStream) {
+            charSequence = when (val type = stream.readByte()) {
+                TYPE_SPANNED -> Html.fromHtml(stream.readObject() as String)
+                TYPE_STRING -> stream.readUTF()
+                else -> throw IOException("Unknown type = $type")
+            }
+        }
+
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (javaClass != other?.javaClass) return false
@@ -297,7 +336,9 @@ open class Text(protected val defaultTextStyle: TextStyle?) : Serializable, Text
             val stringBuilder = SpannableStringBuilder()
             val newTextStyle = defaultTextStyle + textStyle
             for (text in texts) {
-                stringBuilder.append(text.getCharSequence(context, newTextStyle))
+                text.getCharSequence(context, newTextStyle)?.let { textCharSequence ->
+                    stringBuilder.append(textCharSequence)
+                }
             }
             return stringBuilder
         }
diff --git a/omegatypes/src/main/java/com/omega_r/libs/omegatypes/TextBuilder.kt b/omegatypes/src/main/java/com/omega_r/libs/omegatypes/TextBuilder.kt
@@ -48,6 +48,15 @@ class TextBuilder(capacity: Int) : Serializable {
         return Text.from(list)
     }
 
+    fun isEmpty(): Boolean {
+        for (text in list) {
+            if (!text.isEmpty()) {
+                return false
+            }
+        }
+        return true
+    }
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
diff --git a/omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/Image.kt b/omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/Image.kt
@@ -138,16 +138,22 @@ suspend fun Image.getStream(
 }
 
 @JvmOverloads
-fun ImageView.setImage(image: Image?, placeholderResId: Int = Image.NO_PLACEHOLDER_RES, processor: ImageProcessors = ImageProcessors.current) {
+fun ImageView.setImage(
+        image: Image?,
+        placeholderResId: Int = Image.NO_PLACEHOLDER_RES,
+        processor: ImageProcessors = ImageProcessors.current,
+        onImageApplied: (() -> Unit)? = null
+) {
     with(processor) {
         if (image != null) {
-            image.applyImage(this@setImage, placeholderResId)
+            image.applyImage(this@setImage, placeholderResId, onImageApplied)
         } else {
             if (placeholderResId == 0) {
                 setImageDrawable(null)
             } else {
                 setImageResource(placeholderResId)
             }
+            onImageApplied?.invoke()
         }
     }
 }
diff --git a/omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/ImageProcessors.kt b/omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/ImageProcessors.kt
@@ -27,7 +27,7 @@ abstract class ImageProcessors : CoroutineScope {
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Default
 
-    abstract fun Image.applyImage(imageView: ImageView, placeholderResId: Int)
+    abstract fun Image.applyImage(imageView: ImageView, placeholderResId: Int, onImageApplied: (() -> Unit)? = null)
 
     abstract fun Image.applyBackground(view: View, placeholderResId: Int)
 
@@ -43,8 +43,9 @@ abstract class ImageProcessors : CoroutineScope {
             map[imageClass] = imageProcessor
         }
 
-        override fun Image.applyImage(imageView: ImageView, placeholderResId: Int) = with(getImageProcessor()) {
+        override fun Image.applyImage(imageView: ImageView, placeholderResId: Int, onImageApplied: (() -> Unit)?): Unit = with(getImageProcessor()) {
             applyImage(imageView, placeholderResId)
+            onImageApplied?.invoke()
         }
 
         override fun Image.applyBackground(view: View, placeholderResId: Int) = with(getImageProcessor()) {
diff --git a/omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/UrlImage.kt b/omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/UrlImage.kt
@@ -6,21 +6,37 @@ import com.omega_r.libs.omegatypes.decoders.toBitmap
 import java.io.IOException
 import java.net.HttpURLConnection
 import java.net.URL
+import java.util.regex.Pattern
 
 
 /**
  * Created by Anton Knyazev on 2019-10-03.
  */
-data class UrlImage(val url: String) : BaseBitmapImage() {
+data class UrlImage(val baseUrl: String? = null, val relativeUrl: String) : BaseBitmapImage() {
 
     companion object {
+        private val PATTERN_ABSOLUTE_URL = Pattern.compile("\\A[a-z0-9.+-]+://.*", Pattern.CASE_INSENSITIVE)
+
+        var defaultBaseUrl: String? = null
 
         init {
             ImageProcessors.default.addImageProcessor(UrlImage::class, Processor())
         }
 
+        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("/")
+            val relativeUrl = relativeUrl.removePrefix("/")
+            "$baseUrl/$relativeUrl"
+        }
+
+    constructor(url: String) : this(null, url)
+
     class Processor : BaseBitmapImage.Processor<UrlImage>(true) {
 
 
diff --git a/picasso/src/main/java/com/omega_r/libs/omegatypes/image/PicassoImagesProcessor.kt b/picasso/src/main/java/com/omega_r/libs/omegatypes/image/PicassoImagesProcessor.kt
@@ -55,7 +55,7 @@ class PicassoImagesProcessor(
         }
     }
 
-    override fun Image.applyImage(imageView: ImageView, placeholderResId: Int) {
+    override fun Image.applyImage(imageView: ImageView, placeholderResId: Int, onImageApplied: (() -> Unit)?) {
         createRequestCreator()?.apply {
             if (placeholderResId != NO_PLACEHOLDER_RES) placeholder(placeholderResId)
             fit()
@@ -69,6 +69,7 @@ class PicassoImagesProcessor(
         } ?: with(oldImagesProcessor) {
             applyImage(imageView, placeholderResId)
         }
+        onImageApplied?.invoke()
     }
 
     override fun Image.applyBackground(view: View, placeholderResId: Int) {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ buildscript {`
`12`	`12`	`jcenter()`
`13`	`13`	`}`
`14`	`14`	`dependencies {`
`15`		`- classpath 'com.android.tools.build:gradle:3.4.1'`
	`15`	`+ classpath 'com.android.tools.build:gradle:3.6.3'`
`16`	`16`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`17`	`17`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'`
`18`	`18`	`// NOTE: Do not place your application dependencies here; they belong`
Original file line number	Diff line number	Diff line change
`@@ -138,16 +138,22 @@ suspend fun Image.getStream(`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`@JvmOverloads`
`141`		`-fun ImageView.setImage(image: Image?, placeholderResId: Int = Image.NO_PLACEHOLDER_RES, processor: ImageProcessors = ImageProcessors.current) {`
	`141`	`+fun ImageView.setImage(`
	`142`	`+ image: Image?,`
	`143`	`+ placeholderResId: Int = Image.NO_PLACEHOLDER_RES,`
	`144`	`+ processor: ImageProcessors = ImageProcessors.current,`
	`145`	`+ onImageApplied: (() -> Unit)? = null`
	`146`	`+) {`
`142`	`147`	`with(processor) {`
`143`	`148`	`if (image != null) {`
`144`		`- image.applyImage(this@setImage, placeholderResId)`
	`149`	`+ image.applyImage(this@setImage, placeholderResId, onImageApplied)`
`145`	`150`	`} else {`
`146`	`151`	`if (placeholderResId == 0) {`
`147`	`152`	`setImageDrawable(null)`
`148`	`153`	`} else {`
`149`	`154`	`setImageResource(placeholderResId)`
`150`	`155`	`}`
	`156`	`+ onImageApplied?.invoke()`
`151`	`157`	`}`
`152`	`158`	`}`
`153`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ abstract class ImageProcessors : CoroutineScope {`
`27`	`27`	`override val coroutineContext: CoroutineContext`
`28`	`28`	`get() = Dispatchers.Default`
`29`	`29`
`30`		`- abstract fun Image.applyImage(imageView: ImageView, placeholderResId: Int)`
	`30`	`+ abstract fun Image.applyImage(imageView: ImageView, placeholderResId: Int, onImageApplied: (() -> Unit)? = null)`
`31`	`31`
`32`	`32`	`abstract fun Image.applyBackground(view: View, placeholderResId: Int)`
`33`	`33`
`@@ -43,8 +43,9 @@ abstract class ImageProcessors : CoroutineScope {`
`43`	`43`	`map[imageClass] = imageProcessor`
`44`	`44`	`}`
`45`	`45`
`46`		`- override fun Image.applyImage(imageView: ImageView, placeholderResId: Int) = with(getImageProcessor()) {`
	`46`	`+ override fun Image.applyImage(imageView: ImageView, placeholderResId: Int, onImageApplied: (() -> Unit)?): Unit = with(getImageProcessor()) {`
`47`	`47`	`applyImage(imageView, placeholderResId)`
	`48`	`+ onImageApplied?.invoke()`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`override fun Image.applyBackground(view: View, placeholderResId: Int) = with(getImageProcessor()) {`