Merge pull request nickbutcher#248 from nickbutcher/nb/ktx

Add Android KTX
SeJay · Feb 6, 2018 · bcf1b06 · bcf1b06
2 parents afcd7e8 + a9574ba
commit bcf1b06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -69,6 +69,7 @@ repositories {
 }
 
 dependencies {
+    implementation 'androidx.core:core-ktx:0.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta4'
     implementation "com.android.support:customtabs:${versions.supportLibrary}"
     implementation "com.android.support:design:${versions.supportLibrary}"

diff --git a/app/src/main/java/io/plaidapp/ui/widget/BadgedFourThreeImageView.kt b/app/src/main/java/io/plaidapp/ui/widget/BadgedFourThreeImageView.kt
@@ -16,7 +16,6 @@ package io.plaidapp.ui.widget
 
 import android.content.Context
 import android.graphics.Bitmap
-import android.graphics.Bitmap.Config.ARGB_8888
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.ColorFilter
@@ -34,6 +33,8 @@ import android.support.annotation.ColorInt
 import android.text.TextPaint
 import android.util.AttributeSet
 import android.view.Gravity
+import androidx.graphics.applyCanvas
+import androidx.graphics.createBitmap
 import io.plaidapp.R
 
 /**
@@ -117,10 +118,7 @@ class BadgedFourThreeImageView(context: Context, attrs: AttributeSet
                 textPaint.getTextBounds(GIF, 0, GIF.length, textBounds)
                 val height = padding + textBounds.height() + padding
                 val width = padding + textBounds.width() + padding
-                bitmap = Bitmap.createBitmap(width.toInt(), height.toInt(), ARGB_8888).apply {
-                    setHasAlpha(true)
-                }
-                Canvas(bitmap).apply {
+                bitmap = createBitmap(width.toInt(), height.toInt()).applyCanvas {
                     val backgroundPaint = Paint(ANTI_ALIAS_FLAG)
                     backgroundPaint.color = BACKGROUND_COLOR
                     val cornerRadius = CORNER_RADIUS * density