UI minor improvements
This commit is contained in:
parent
a1f4aa7c75
commit
7955f52182
6 changed files with 85 additions and 71 deletions
|
@ -140,7 +140,9 @@
|
||||||
android:visibility="visible" />
|
android:visibility="visible" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -185,6 +187,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/error"
|
android:text="@string/error"
|
||||||
android:visibility="invisible" />
|
android:visibility="invisible" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
@ -315,6 +318,7 @@
|
||||||
android:visibility="invisible" />
|
android:visibility="invisible" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|
||||||
<TableRow
|
<TableRow
|
||||||
|
@ -329,6 +333,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_column="1"
|
android:layout_column="1"
|
||||||
android:checked="false"
|
android:checked="false"
|
||||||
|
android:paddingLeft="5dp"
|
||||||
android:button="@drawable/checkbox"
|
android:button="@drawable/checkbox"
|
||||||
android:textColor="?attr/primaryTextColor"
|
android:textColor="?attr/primaryTextColor"
|
||||||
android:text="@string/use_username_instead_or_phone_number"
|
android:text="@string/use_username_instead_or_phone_number"
|
||||||
|
@ -347,6 +352,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_column="1"
|
android:layout_column="1"
|
||||||
android:checked="false"
|
android:checked="false"
|
||||||
|
android:paddingLeft="5dp"
|
||||||
android:button="@drawable/checkbox"
|
android:button="@drawable/checkbox"
|
||||||
android:textColor="?attr/primaryTextColor"
|
android:textColor="?attr/primaryTextColor"
|
||||||
android:text="@string/use_email_for_validation"
|
android:text="@string/use_email_for_validation"
|
||||||
|
|
|
@ -120,6 +120,7 @@
|
||||||
android:visibility="invisible" />
|
android:visibility="invisible" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -154,6 +155,7 @@
|
||||||
android:inputType="text|textNoSuggestions"
|
android:inputType="text|textNoSuggestions"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:textColor="@color/colorB" />
|
android:textColor="@color/colorB" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
@ -189,6 +191,7 @@
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:maxLines="1" />
|
android:maxLines="1" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|
||||||
<TableRow
|
<TableRow
|
||||||
|
@ -214,10 +217,12 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:button="@drawable/checkbox"
|
android:button="@drawable/checkbox"
|
||||||
|
android:paddingLeft="5dp"
|
||||||
android:textColor="?attr/primaryTextColor"
|
android:textColor="?attr/primaryTextColor"
|
||||||
android:text="@string/login_with_username"
|
android:text="@string/login_with_username"
|
||||||
android:visibility="visible" />
|
android:visibility="visible" />
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|
||||||
</TableLayout>
|
</TableLayout>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
|
|
|
@ -201,93 +201,93 @@
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/password_layout"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:id="@+id/password_layout"
|
||||||
|
android:visibility="gone"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:id="@+id/password_label"
|
android:orientation="vertical"
|
||||||
style="@style/font13"
|
|
||||||
android:text="@string/password"
|
|
||||||
android:textAllCaps="true"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"/>
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<EditText
|
<TextView
|
||||||
android:id="@+id/password"
|
android:id="@+id/password_label"
|
||||||
android:background="@drawable/resizable_textfield"
|
style="@style/font13"
|
||||||
android:textColor="@color/colorB"
|
android:text="@string/password"
|
||||||
android:inputType="textPassword"
|
android:textAllCaps="true"
|
||||||
android:textCursorDrawable="@null"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"/>
|
||||||
android:layout_height="40dp"
|
|
||||||
android:paddingLeft="10dp"
|
|
||||||
android:paddingRight="10dp"
|
|
||||||
android:maxLines="1"/>
|
|
||||||
|
|
||||||
<TextView
|
<EditText
|
||||||
android:id="@+id/password_error"
|
android:id="@+id/password"
|
||||||
android:text="@string/error"
|
android:background="@drawable/resizable_textfield"
|
||||||
style="@style/font20"
|
android:textColor="@color/colorB"
|
||||||
|
android:inputType="textPassword"
|
||||||
|
android:textCursorDrawable="@null"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="40dp"
|
||||||
|
android:paddingLeft="10dp"
|
||||||
|
android:paddingRight="10dp"
|
||||||
|
android:maxLines="1"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/password_error"
|
||||||
|
android:text="@string/error"
|
||||||
|
style="@style/font20"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:visibility="invisible"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/password_confirm_layout"
|
||||||
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:visibility="invisible"/>
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/confirm_password_label"
|
||||||
|
android:text="@string/confirm_password"
|
||||||
|
style="@style/font13"
|
||||||
|
android:textAllCaps="true"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"/>
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/confirm_password"
|
||||||
|
android:background="@drawable/resizable_textfield"
|
||||||
|
android:textColor="@color/colorB"
|
||||||
|
android:inputType="textPassword"
|
||||||
|
android:contentDescription="@string/content_description_confirm_password_field"
|
||||||
|
android:textCursorDrawable="@null"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="40dp"
|
||||||
|
android:paddingLeft="10dp"
|
||||||
|
android:paddingRight="10dp"
|
||||||
|
android:maxLines="1"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/confirm_password_error"
|
||||||
|
android:text="@string/error"
|
||||||
|
style="@style/font20"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:visibility="invisible"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/password_confirm_layout"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/confirm_password_label"
|
|
||||||
android:text="@string/confirm_password"
|
|
||||||
style="@style/font13"
|
|
||||||
android:textAllCaps="true"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"/>
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/confirm_password"
|
|
||||||
android:background="@drawable/resizable_textfield"
|
|
||||||
android:textColor="@color/colorB"
|
|
||||||
android:inputType="textPassword"
|
|
||||||
android:contentDescription="@string/content_description_confirm_password_field"
|
|
||||||
android:textCursorDrawable="@null"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="40dp"
|
|
||||||
android:paddingLeft="10dp"
|
|
||||||
android:paddingRight="10dp"
|
|
||||||
android:maxLines="1"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/confirm_password_error"
|
|
||||||
android:text="@string/error"
|
|
||||||
style="@style/font20"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:visibility="invisible"/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/use_username"
|
android:id="@+id/use_username"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
android:paddingLeft="5dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:button="@drawable/checkbox"
|
android:button="@drawable/checkbox"
|
||||||
|
@ -297,6 +297,7 @@
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/use_email"
|
android:id="@+id/use_email"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
android:paddingLeft="5dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:button="@drawable/checkbox"
|
android:button="@drawable/checkbox"
|
||||||
|
|
|
@ -189,6 +189,7 @@
|
||||||
android:id="@+id/use_username"
|
android:id="@+id/use_username"
|
||||||
android:visibility="visible"
|
android:visibility="visible"
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
|
android:paddingLeft="5dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:button="@drawable/checkbox"
|
android:button="@drawable/checkbox"
|
||||||
|
|
|
@ -83,6 +83,7 @@
|
||||||
android:layout_height="5dp"
|
android:layout_height="5dp"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:background="?attr/accentColor" />
|
android:background="?attr/accentColor" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
android:id="@+id/doNotAskAgain"
|
android:id="@+id/doNotAskAgain"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:buttonTint="?attr/accentColor" />
|
android:button="@drawable/checkbox" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/doNotAskAgainLabel"
|
android:id="@+id/doNotAskAgainLabel"
|
||||||
|
|
Loading…
Reference in a new issue