Fixed bug with Image, small improvements with Text

Author: AndroidLiba

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

@@ -180,28 +180,28 @@ open class Text : Serializable {
 
 }
 
-fun TextView.setText(text: Text) {
-    this.text = text.getString(this.resources)
+fun TextView.setText(text: Text?) {
+    this.text = text?.getString(this.resources)
 }
 
-fun EditText.setError(text: Text) {
-    this.error = text.getString(this.resources)
+fun EditText.setError(text: Text?) {
+    this.error = text?.getString(this.resources)
 }
 
-fun EditText.setHint(text: Text) {
-    this.hint = text.getString(this.resources)
+fun EditText.setHint(text: Text?) {
+    this.hint = text?.getString(this.resources)
 }
 
-fun Text.applyTo(textView: TextView) {
+fun Text?.applyTo(textView: TextView) {
     textView.setText(this)
 }
 
-fun Text.applyErrorTo(editText: EditText) {
+fun Text?.applyErrorTo(editText: EditText) {
     editText.setError(this)
 }
 
-fun Activity.setTitle(text: Text) {
-    title = text.getString(resources)
+fun Activity.setTitle(text: Text?) {
+    title = text?.getString(resources)
 }
 
 fun Context.toast(text: Text, duration: Int = Toast.LENGTH_SHORT): Toast {

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

@@ -0,0 +1,10 @@
+package com.omega_r.libs.omegatypes
+
+/**
+ * Created by Anton Knyazev on 14.04.2019.
+ */
+interface UrlImage {
+
+    val url: String
+
+}

…ibs/omegatypes/picasso/ImageExtension.kt …/libs/omegatypes/picasso/PicassoImage.ktpicasso/src/main/java/com/omega_r/libs/omegatypes/picasso/ImageExtension.kt renamed to picasso/src/main/java/com/omega_r/libs/omegatypes/picasso/PicassoImage.kt picasso/src/main/java/com/omega_r/libs/omegatypes/picasso/ImageExtension.kt renamed to picasso/src/main/java/com/omega_r/libs/omegatypes/picasso/PicassoImage.kt

@@ -9,6 +9,7 @@ import android.os.Looper
 import android.view.View
 import android.widget.ImageView
 import com.omega_r.libs.omegatypes.Image
+import com.omega_r.libs.omegatypes.UrlImage
 import com.omega_r.libs.omegatypes.toInputStream
 import com.squareup.picasso.Picasso
 import com.squareup.picasso.Target
@@ -20,15 +21,19 @@ import java.io.InputStream
 
 fun Image.Companion.from(url: String) = PicassoImage(url)
 
-class PicassoImage(val url: String) : Image() {
+class PicassoImage(override val url: String) : Image(), UrlImage {
 
     override fun applyImage(imageView: ImageView, placeholderResId: Int) {
         Picasso.get()
                 .load(url)
                 .apply {
                     if (placeholderResId != 0) placeholder(placeholderResId)
                     fit()
-                    centerCrop()
+                    if (imageView.scaleType == ImageView.ScaleType.CENTER_INSIDE) {
+                        centerInside()
+                    } else  {
+                        centerCrop()
+                    }
                     into(imageView)
                 }
     }