diff --git a/app/build.gradle b/app/build.gradle index 7795689..816ca01 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 23 targetSdkVersion 29 versionCode 1 - versionName "1.0.11" + versionName "1.0.12" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/sk/backbone/android/shared/utils/UiUtils.kt b/app/src/main/java/sk/backbone/android/shared/utils/UiUtils.kt index be5ac1a..9c2d0a1 100644 --- a/app/src/main/java/sk/backbone/android/shared/utils/UiUtils.kt +++ b/app/src/main/java/sk/backbone/android/shared/utils/UiUtils.kt @@ -17,6 +17,7 @@ import androidx.core.content.ContextCompat import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions import sk.backbone.android.shared.ui.components.SafeClickListener +import java.math.BigDecimal fun View.setSafeOnClickListener(action: (View) -> Unit) { @@ -118,7 +119,23 @@ fun TextView?.setTextAndUpdateVisibility(input: CharSequence?){ this?.text = input } -fun ImageView.loadResource(url: String?, options: RequestOptions = RequestOptions().apply{ centerCrop() }, defaultImage: Int){ +fun ImageView.loadResource(url: String?, defaultImage: Int? = null, options: RequestOptions = RequestOptions().apply{ centerCrop() }){ Glide.with(this).clear(this) - Glide.with(this).load(url).apply(options).placeholder(defaultImage).fallback(defaultImage).into(this) + Glide.with(this).load(url).apply(options).apply { + if (defaultImage != null) { + placeholder(defaultImage).fallback(defaultImage).into(this@loadResource) + } + else { + into(this@loadResource) + } + } +} + +fun Int.getResourceStringValue(context: Context) : String{ + return context.resources.getString(this) +} + +fun BigDecimal.getAsEuros(context: Context): String{ + val euroSign = "€" + return String.format("$this $euroSign") } \ No newline at end of file