Merge pull request #154 from DroidsOnRoids/fix/toa-153-message-hint

[TOA-153] Fix message hint and app multi-clicking bugs
DroidsOnRoids · Mar 29, 2018 · d45242f · d45242f
2 parents 058f195 + 83bfd28
commit d45242f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/app/src/main/res/layout/fragment_contact.xml b/app/src/main/res/layout/fragment_contact.xml
@@ -15,7 +15,8 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/paleGrayBackground">
 
         <ScrollView
             android:id="@+id/contactScrollContainer"
@@ -45,10 +46,10 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/margin_medium"
                     android:layout_marginTop="@dimen/margin_large"
-                    app:error="@{contactViewModel.nameInputError}"
                     android:hint="@string/your_name"
-                    app:errorEnabled="true"
                     android:labelFor="@+id/contactNameEditText"
+                    app:error="@{contactViewModel.nameInputError}"
+                    app:errorEnabled="true"
                     app:layout_constraintEnd_toStartOf="@+id/contactEmailInputLayout"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/topicSpinner">
@@ -71,11 +72,11 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/margin_medium"
                     android:layout_marginTop="@dimen/margin_large"
+                    android:hint="@string/email_address"
+                    android:labelFor="@+id/contactEmailEditText"
                     app:error="@{contactViewModel.emailInputError}"
                     app:errorEnabled="true"
-                    android:labelFor="@+id/contactEmailEditText"
                     app:layout_constraintEnd_toEndOf="parent"
-                    android:hint="@string/email_address"
                     app:layout_constraintStart_toEndOf="@+id/contactNameInputLayout"
                     app:layout_constraintTop_toBottomOf="@+id/topicSpinner">
 
@@ -100,11 +101,11 @@
                     android:layout_marginEnd="@dimen/margin_large"
                     android:layout_marginStart="@dimen/margin_large"
                     android:hint="@string/your_message"
+                    android:labelFor="@+id/contactMessageEditText"
                     app:error="@{contactViewModel.messageInputError}"
                     app:errorEnabled="true"
                     app:hintEnabled="false"
                     android:scrollbars="vertical"
-                    android:labelFor="@+id/contactMessageEditText"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/contactNameInputLayout">
@@ -114,6 +115,7 @@
                         style="@style/ContactMessageInputStyle"
                         android:layout_width="match_parent"
                         android:layout_height="113dp"
+                        android:hint="@string/your_message"
                         android:paddingBottom="12dp"
                         android:paddingEnd="@dimen/margin_medium"
                         android:paddingStart="@dimen/margin_medium"
@@ -126,12 +128,12 @@
                     android:id="@+id/characterCounter"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:paddingTop="113dp"
                     android:text="@{contactViewModel.messageCounter}"
                     android:textSize="@dimen/text_size_tiny"
                     app:layout_constraintEnd_toEndOf="@id/contactMessageInputLayout"
-                    tools:layout_editor_absoluteY="291dp"
-                    android:paddingTop="113dp"
                     app:layout_constraintTop_toTopOf="@id/contactMessageInputLayout"
+                    tools:layout_editor_absoluteY="291dp"
                     tools:text="12 / 250"/>
 
                 <FrameLayout

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -8,6 +8,8 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorControlNormal">@color/paleGray</item>
         <item name="colorControlActivated">@color/colorAccent</item>
+        <item name="android:splitMotionEvents">false</item>
+        <item name="android:windowEnableSplitTouch">false</item>
     </style>
 
     <style name="AppTheme.NoActionBar">