Merge branch 'feature/text' of https://github.com/Omega-R/OmegaEntities into feature/text_core

roman_tcaregorodtcev · roman_tcaregorodtcev · commit accd743233e7 · 2020-02-28T15:29:43.000+03:00
# Conflicts:
#	examples/android/build.gradle
diff --git a/core/src/androidMain/kotlin/com/omega_r/libs/entities/extensions/OmegaImegaExtensions.kt b/core/src/androidMain/kotlin/com/omega_r/libs/entities/extensions/OmegaImegaExtensions.kt
@@ -29,26 +29,21 @@ fun OmegaImage.Format.toCompressFormat(): Bitmap.CompressFormat {
 fun ImageView.setImage(
         image: OmegaImage?,
         placeholderResId: Int = OmegaImage.NO_PLACEHOLDER_RES,
-        holder: OmegaImageProcessorsHolder = OmegaImageProcessorsHolder.Default,
+        holder: OmegaImageProcessorsHolder = OmegaImageProcessorsHolder.current,
         extractor: OmegaResourceExtractor = OmegaResourceExtractor.Default
 ) {
-    val imageView = this
-    if (image != null) {
-        val placeholderImage = OmegaImage.from(placeholderResId, image)
-        holder.getProcessor(placeholderImage)
-                .applyImage(placeholderImage, imageView, holder, extractor)
+    val finalImage = image.formatImage(placeholderResId)
+    if (finalImage == null) {
+        setImageDrawable(null)
     } else {
-        if (placeholderResId == OmegaImage.NO_PLACEHOLDER_RES) {
-            setImageDrawable(null)
-        } else {
-            setImageResource(placeholderResId)
-        }
+        holder.getProcessor(finalImage)
+                .applyImage(finalImage, this, holder, extractor)
     }
 }
 
 @JvmOverloads
 fun OmegaImage.preload(
-        holder: OmegaImageProcessorsHolder = OmegaImageProcessorsHolder.Default,
+        holder: OmegaImageProcessorsHolder = OmegaImageProcessorsHolder.current,
         extractor: OmegaResourceExtractor = OmegaResourceExtractor.Default
 ) {
     holder.getProcessor(this).preload(this, extractor)
@@ -58,22 +53,28 @@ fun OmegaImage.preload(
 fun View.setBackground(
         image: OmegaImage?,
         placeholderResId: Int = OmegaImage.NO_PLACEHOLDER_RES,
-        holder: OmegaImageProcessorsHolder = OmegaImageProcessorsHolder.Default,
+        holder: OmegaImageProcessorsHolder = OmegaImageProcessorsHolder.current,
         extractor: OmegaResourceExtractor = OmegaResourceExtractor.Default
 ) {
-    if (image != null) {
-        val placeholderImage = OmegaImage.from(placeholderResId, image)
-        holder.getProcessor(placeholderImage)
-                .applyBackground(placeholderImage, this, holder, extractor)
+    val finalImage = image.formatImage(placeholderResId)
+    if (finalImage == null) {
+        background = null
     } else {
-        if (placeholderResId == OmegaImage.NO_PLACEHOLDER_RES) {
-            background = null
-        } else {
-            setBackgroundResource(placeholderResId)
-        }
+        holder.getProcessor(finalImage)
+                .applyBackground(finalImage, this, holder, extractor)
     }
 }
 
+private fun OmegaImage?.formatImage(placeholderResId: Int): OmegaImage? {
+    val image = this
+    return if (image == null) {
+        if (placeholderResId == OmegaImage.NO_PLACEHOLDER_RES) null else OmegaImage.from(placeholderResId)
+    } else {
+        if (placeholderResId == OmegaImage.NO_PLACEHOLDER_RES) image else OmegaImage.from(placeholderResId, image)
+    }
+}
+
+
 var TextView.imageStart: OmegaImage?
     get() = getImage(0)
     set(value) = setImage(0, value)
diff --git a/core/src/androidMain/kotlin/com/omega_r/libs/entities/images/OmegaResourceImage.kt b/core/src/androidMain/kotlin/com/omega_r/libs/entities/images/OmegaResourceImage.kt
@@ -9,8 +9,6 @@ import com.omega_r.libs.entities.extensions.toBitmapAndRecycle
 import com.omega_r.libs.entities.extensions.toInputStream
 import com.omega_r.libs.entities.resources.OmegaResource
 import com.omega_r.libs.entities.resources.OmegaResourceExtractor
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.io.InputStream
 
 actual data class OmegaResourceImage(actual val resource: OmegaResource.Image) : OmegaImage {
@@ -21,7 +19,7 @@ actual data class OmegaResourceImage(actual val resource: OmegaResource.Image) :
         }
     }
 
-    constructor(@DrawableRes drawableRes: Int): this(OmegaResource.Image(drawableRes))
+    constructor(@DrawableRes drawableRes: Int) : this(OmegaResource.Image(drawableRes))
 
     class Processor : OmegaBaseImageProcessor<OmegaResourceImage>() {
 
@@ -60,7 +58,8 @@ actual data class OmegaResourceImage(actual val resource: OmegaResource.Image) :
                 holder: OmegaImageProcessorsHolder,
                 extractor: OmegaResourceExtractor
         ) {
-            val drawable = extractor.getDrawable(entity.resource)
+            val id = entity.resource.id
+            val drawable = if (id == OmegaImage.NO_PLACEHOLDER_RES) null else extractor.getDrawable(entity.resource)
             OmegaImageProcessor.applyCompoundDrawable(textView, drawable, index)
         }
 
@@ -69,8 +68,12 @@ actual data class OmegaResourceImage(actual val resource: OmegaResource.Image) :
                 extractor: OmegaResourceExtractor,
                 format: OmegaImage.Format,
                 quality: Int
-        ): InputStream? = extractor.getDrawable(entity.resource)?.toBitmapAndRecycle {
-            toInputStream(format, quality)
+        ): InputStream? {
+            return if (entity.resource.id == OmegaImage.NO_PLACEHOLDER_RES) {
+                null
+            } else extractor.getDrawable(entity.resource)?.toBitmapAndRecycle {
+                toInputStream(format, quality)
+            }
         }
 
     }
diff --git a/core/src/androidMain/kotlin/com/omega_r/libs/entities/resources/OmegaResourceExtractor.kt b/core/src/androidMain/kotlin/com/omega_r/libs/entities/resources/OmegaResourceExtractor.kt
@@ -6,6 +6,8 @@ import android.content.ContentResolver
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.os.Build
+import com.omega_r.libs.entities.extensions.NO_PLACEHOLDER_RES
+import com.omega_r.libs.entities.images.OmegaImage
 import java.lang.ref.WeakReference
 import java.util.*
 
@@ -54,6 +56,7 @@ actual open class OmegaResourceExtractor {
     }
 
     open fun getDrawable(resource: OmegaResource.Image): Drawable? {
+        if (resource.id == OmegaImage.NO_PLACEHOLDER_RES) return null
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.L) {
             context?.getDrawable(resource.id)
         } else {
diff --git a/core/src/androidMain/kotlin/com/omega_r/libs/entities/tools/ImageSizeExtractor.kt b/core/src/androidMain/kotlin/com/omega_r/libs/entities/tools/ImageSizeExtractor.kt
@@ -3,6 +3,10 @@ package com.omega_r.libs.entities.tools
 import android.view.View
 import android.view.View.OnAttachStateChangeListener
 import android.view.ViewTreeObserver.OnPreDrawListener
+import com.omega_r.libs.entities.images.OmegaImage
+import com.omega_r.libs.entities.images.OmegaImageProcessor
+import com.omega_r.libs.entities.images.OmegaImageProcessorsHolder
+import kotlinx.coroutines.runBlocking
 import java.lang.ref.WeakReference
 import java.util.*
 
@@ -45,9 +49,7 @@ class ImageSizeExtractor<V : View>(target: V, callback: suspend (view: V) -> Uni
         vto.removeOnPreDrawListener(this)
         this.target.clear()
 
-//        ImageProcessors.current.launch {
-//            callback?.invoke(target)
-//        }
+        runBlocking { callback?.invoke(target) }
 
         return true
     }
diff --git a/examples/android/build.gradle b/examples/android/build.gradle
@@ -54,9 +54,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'core', include: ['*.jar'])
     implementation project(':core')
+    implementation project(':glide')
 
-    api "io.ktor:ktor-client-core:1.3.1"
-    api "io.ktor:ktor-client-android:1.3.1"
+    implementation "io.ktor:ktor-client-core:$ktor_version"
+    implementation "io.ktor:ktor-client-android:$ktor_version"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.0.2'
diff --git a/examples/android/src/main/java/com/omega_r/libs/entities/examples/MainActivity.kt b/examples/android/src/main/java/com/omega_r/libs/entities/examples/MainActivity.kt
@@ -1,21 +1,15 @@
 package com.omega_r.libs.entities.examples
 
 import android.content.Intent
-import android.graphics.BitmapFactory
-import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.omega_r.libs.entities.files.OmegaFile
+import com.omega_r.entities.image.glide.OmegaGlideImageProcessorsHolder
+import com.omega_r.libs.entities.extensions.setBackground
 import com.omega_r.libs.entities.files.OmegaFileProcessorsHolder
 import com.omega_r.libs.entities.files.url.OmegaUrlFile
 import com.omega_r.libs.entities.files.url.OmegaUrlFileProcessor
-import com.omega_r.libs.entities.files.url.from
-import io.ktor.util.asStream
+import com.omega_r.libs.entities.images.OmegaImage
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class MainActivity : AppCompatActivity() {
 
@@ -33,21 +27,9 @@ class MainActivity : AppCompatActivity() {
 
         OmegaFileProcessorsHolder.Default.addProcessor(OmegaUrlFile::class, OmegaUrlFileProcessor())
 
-        val file: OmegaFile = OmegaFile.from("https://dejagerart.com/wp-content/uploads/2018/09/Test-Logo-Circle-black-transparent.png")
-
-        GlobalScope.launch {
-            val isExist = file.isExist()
-            if(file.isExist() == true) {
-                val input = file.getInput()
-                input?.let {
-                    val bitmap = BitmapFactory.decodeStream(it.asStream())
-                    val drawable = BitmapDrawable(bitmap)
-                    withContext(Dispatchers.Main) {
-                        layout_container.background = drawable
-                    }
-                }
-            }
-        }
+        val image = OmegaImage.from("https://dejagerart.com/wp-content/uploads/2018/09/Test-Logo-Circle-black-transparent.png")
+        OmegaGlideImageProcessorsHolder.setAsCurrentImagesProcessor()
+        layout_container.setBackground(image)
     }
 
 }
diff --git a/examples/android/src/main/res/layout/activity_main.xml b/examples/android/src/main/res/layout/activity_main.xml
@@ -7,6 +7,11 @@
     android:id="@+id/layout_container"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/imageview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <ScrollView
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/glide/src/main/java/com/omega_r/entities/image/glide/OmegaGlideImageProcessorsHolder.kt b/glide/src/main/java/com/omega_r/entities/image/glide/OmegaGlideImageProcessorsHolder.kt
@@ -11,6 +11,7 @@ import com.bumptech.glide.request.target.CustomViewTarget
 import com.bumptech.glide.request.transition.Transition
 import com.omega_r.libs.entities.decoders.BitmapDecoders
 import com.omega_r.libs.entities.decoders.SimpleBitmapDecoders
+import com.omega_r.libs.entities.extensions.NO_PLACEHOLDER_RES
 import com.omega_r.libs.entities.extensions.toInputStream
 import com.omega_r.libs.entities.images.*
 import com.omega_r.libs.entities.resources.OmegaResourceExtractor
@@ -69,8 +70,14 @@ class OmegaGlideImageProcessorsHolder(
                     when (val placeholderImage = image.placeholderImage) {
                         is OmegaUrlImage -> thumbnail(load(placeholderImage.url))
                                 .load(createRequestBuilder(image.finalImage, extractor))
-                        is OmegaResourceImage -> placeholder(placeholderImage.resource.id)
-                                .load(createRequestBuilder(image.finalImage, extractor))
+                        is OmegaResourceImage -> {
+                            if (placeholderImage.resource.id == OmegaImage.NO_PLACEHOLDER_RES) {
+                                createRequestBuilder(image.finalImage, extractor)
+                            } else {
+                                placeholder(placeholderImage.resource.id)
+                                        .load(createRequestBuilder(image.finalImage, extractor))
+                            }
+                        }
                         is OmegaDrawableImage -> placeholder(placeholderImage.drawable)
                                 .load(createRequestBuilder(image.finalImage, extractor))
                         is OmegaBitmapImage, is OmegaUriImage, is OmegaJavaFileImage, is OmegaByteArrayImage -> {
diff --git a/picasso/src/main/java/com/omega_r/libs/entities/image/picasso/OmegaPicassoProcessorsHolder.kt b/picasso/src/main/java/com/omega_r/libs/entities/image/picasso/OmegaPicassoProcessorsHolder.kt
@@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import com.omega_r.libs.entities.extensions.NO_PLACEHOLDER_RES
 import com.omega_r.libs.entities.extensions.toInputStream
 import com.omega_r.libs.entities.images.*
 import com.omega_r.libs.entities.resources.OmegaResourceExtractor
@@ -61,7 +62,7 @@ class OmegaPicassoProcessorsHolder(
                 is OmegaPlaceholderImage -> {
                     val request = createRequestCreator(image.finalImage)
                     when (val placeholderImage = image.placeholderImage) {
-                        is OmegaResourceImage -> request?.placeholder(placeholderImage.resource.id)
+                        is OmegaResourceImage -> if(placeholderImage.resource.id == OmegaImage.NO_PLACEHOLDER_RES) request else request?.placeholder(placeholderImage.resource.id)
                         is OmegaDrawableImage -> request?.placeholder(placeholderImage.drawable)
                         else -> null
                     }
