Merge pull request #2084 from kareemhamdy100/develop

[IMPROVEMENT] Hide the drawing toolbar while drawing

draw/src/main/java/chat/rocket/android/draw/main/ui/DrawActivity.kt

@@ -44,7 +44,15 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
             .show()
     }
 
+
     private fun setupListeners() {
+        custom_draw_view.setOnTouchListener { view, event ->
+            custom_draw_view.onTouch(
+                event,
+                draw_tools,
+                ::toggleCompleteDrawTools)
+        }
+
         image_close_drawing.setOnClickListener { finish() }
 
         image_send_drawing.setOnClickListener {
@@ -117,6 +125,15 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
         }
     }
 
+    fun toggleCompleteDrawTools(view: View, showView: Boolean = true) {
+        if (view.translationY == (112).toPx && showView) {
+            toggleDrawTools(draw_tools, false)
+        } else {
+            view.animate().translationY((112).toPx)
+        }
+    }
+
+
     private fun colorSelector() {
         image_color_black.setOnClickListener {
             custom_draw_view.setColor(
@@ -232,6 +249,7 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
         })
     }
 
+
     private val Int.toPx: Float
         get() = (this * Resources.getSystem().displayMetrics.density)
 }
\ No newline at end of file

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

@@ -79,7 +79,7 @@ class CustomDrawView(context: Context, attrs: AttributeSet) : View(context, attr
     }
 
     fun setAlpha(newAlpha: Int) {
-        val alpha = (newAlpha*255)/100
+        val alpha = (newAlpha * 255) / 100
         mPaintOptions.alpha = alpha
         setColor(mPaintOptions.color)
     }
@@ -157,22 +157,26 @@ class CustomDrawView(context: Context, attrs: AttributeSet) : View(context, attr
         mPaintOptions = PaintOptions(mPaintOptions.color, mPaintOptions.strokeWidth, mPaintOptions.alpha)
     }
 
-    override fun onTouchEvent(event: MotionEvent): Boolean {
+    fun onTouch(event: MotionEvent, drawTools: View, toggleDrawTools: (View, Boolean) -> Unit): Boolean {
         val x = event.x
         val y = event.y
-
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
+                toggleDrawTools(drawTools, false)
                 mStartX = x
                 mStartY = y
                 actionDown(x, y)
                 mUndonePaths.clear()
             }
             MotionEvent.ACTION_MOVE -> actionMove(x, y)
-            MotionEvent.ACTION_UP -> actionUp()
+            MotionEvent.ACTION_UP -> {
+                toggleDrawTools(drawTools, true)
+                actionUp()
+            }
         }
-
         invalidate()
         return true
     }
+
+
 }
\ No newline at end of file