Commit 24c8acd3 authored by Filipe de Lima Brito's avatar Filipe de Lima Brito

Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into develop

parents 89d4f617 ad9e42ed
......@@ -73,7 +73,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_marginBottom="32dp"
android:drawableStart="@drawable/ic_email_black_20dp"
android:hint="@string/msg_email"
android:inputType="textEmailAddress" />
......
......@@ -44,6 +44,7 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
.show()
}
private fun setupListeners() {
custom_draw_view.setOnTouchListener { view, event ->
custom_draw_view.onTouch(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment