improved draw code quality

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -662,14 +662,14 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             image_send_drawing.setOnClickListener {
                 if (!canWriteToExternalStorage()) {
                     checkWritingPermission()
-                    return@setOnClickListener
-                }
-                val bitmap = custom_draw_view.getBitmap()
-                val uri = saveImage(bitmap)
-                if (uri != null) {
-                    uploadFile(uri)
+                }else{
+                    val bitmap = custom_draw_view.getBitmap()
+                    val uri = saveImage(bitmap)
+                    if (uri != null) {
+                        uploadFile(uri)
+                    }
+                    drawDialog.dismiss()
                 }
-                drawDialog.dismiss()
             }
             image_close_drawing.setOnClickListener {
                 drawDialog.dismiss()
@@ -836,14 +836,15 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     private fun canWriteToExternalStorage(): Boolean {
-        return AndroidPermissionsHelper.checkPermission(activity!!.applicationContext, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+        return context?.let { AndroidPermissionsHelper.checkPermission(it, Manifest.permission.WRITE_EXTERNAL_STORAGE) }!!
     }
 
     private fun checkWritingPermission() {
-            AndroidPermissionsHelper.requestPermission(this.activity!!,
+        activity?.let {
+            AndroidPermissionsHelper.requestPermission(it,
                     Manifest.permission.WRITE_EXTERNAL_STORAGE,
                     AndroidPermissionsHelper.WRITE_EXTERNAL_STORAGE_CODE)
-            Timber.e("checkWritingPermission")
+        }
     }
 
     private fun setupSuggestionsView() {

app/src/main/java/chat/rocket/android/widget/draw/CustomDrawView.kt

@@ -65,8 +65,6 @@ class CustomDrawView(context: Context, attrs: AttributeSet) : View(context, attr
         val lastKey = mUndonePaths.keys.last()
         addPath(lastKey, mUndonePaths.values.last())
         mUndonePaths.remove(lastKey)
-        if (mUndonePaths.isEmpty()) {
-        }
         invalidate()
     }
 

app/src/main/java/chat/rocket/android/widget/draw/Line.kt

@@ -4,28 +4,7 @@ import android.graphics.Path
 import java.io.Writer
 import java.security.InvalidParameterException
 
-class Line : Action {
-
-    val x: Float
-    val y: Float
-
-    constructor(data: String) {
-        if (!data.startsWith("L"))
-            throw InvalidParameterException("The Line data should start with 'L'.")
-
-        try {
-            val xy = data.substring(1).split(",".toRegex()).dropLastWhile(String::isEmpty).toTypedArray()
-            x = xy[0].trim().toFloat()
-            y = xy[1].trim().toFloat()
-        } catch (ignored: Exception) {
-            throw InvalidParameterException("Error parsing the given Line data.")
-        }
-    }
-
-    constructor(x: Float, y: Float) {
-        this.x = x
-        this.y = y
-    }
+class Line(val x: Float, val y: Float) : Action {
 
     override fun perform(path: Path) {
         path.lineTo(x, y)

app/src/main/java/chat/rocket/android/widget/draw/Move.kt

@@ -4,15 +4,7 @@ import android.graphics.Path
 import java.io.Writer
 import java.security.InvalidParameterException
 
-class Move : Action {
-
-    val x: Float
-    val y: Float
-
-    constructor(x: Float, y: Float) {
-        this.x = x
-        this.y = y
-    }
+class Move(val x: Float, val y: Float) : Action {
 
     override fun perform(path: Path) {
         path.moveTo(x, y)

app/src/main/java/chat/rocket/android/widget/draw/PaintOptions.kt

@@ -2,5 +2,4 @@ package chat.rocket.android.widget.draw
 
 import android.graphics.Color
 
-data class PaintOptions(var color: Int = Color.BLACK, var strokeWidth: Float = 8f, var alpha: Int = 255) {
-}
+data class PaintOptions(var color: Int = Color.BLACK, var strokeWidth: Float = 8f, var alpha: Int = 255)
\ No newline at end of file

app/src/main/java/chat/rocket/android/widget/draw/Quad.kt

@@ -3,19 +3,7 @@ package chat.rocket.android.widget.draw
 import android.graphics.Path
 import java.io.Writer
 
-class Quad : Action {
-
-    val x1: Float
-    val y1: Float
-    val x2: Float
-    val y2: Float
-
-    constructor(x1: Float, y1: Float, x2: Float, y2: Float) {
-        this.x1 = x1
-        this.y1 = y1
-        this.x2 = x2
-        this.y2 = y2
-    }
+class Quad(val x1: Float, val y1: Float, val x2: Float, val y2: Float) : Action {
 
     override fun perform(path: Path) {
         path.quadTo(x1, y1, x2, y2)