diff --git a/briar-android/src/main/res/layout/activity_change_password.xml b/briar-android/src/main/res/layout/activity_change_password.xml index e2c54958e82965c45967c0a86d3154b28a88b407..91d37787864e5cd956cc37fe3dbbc0b5e98c948d 100644 --- a/briar-android/src/main/res/layout/activity_change_password.xml +++ b/briar-android/src/main/res/layout/activity_change_password.xml @@ -18,79 +18,55 @@ android:paddingStart="@dimen/margin_activity_horizontal" android:paddingTop="@dimen/margin_activity_vertical"> - <TextView - android:id="@+id/current_password_title" - style="@style/BriarTextTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:text="@string/current_password" - android:textSize="@dimen/text_size_medium"/> - <android.support.design.widget.TextInputLayout android:id="@+id/current_password_entry_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/current_password_title" android:layout_centerHorizontal="true" - app:errorEnabled="true"> + app:errorEnabled="true" + app:hintEnabled="false"> <EditText android:id="@+id/current_password_entry" android:layout_width="match_parent" android:layout_height="wrap_content" + android:hint="@string/current_password" android:inputType="textPassword" android:maxLines="1"/> </android.support.design.widget.TextInputLayout> - <TextView - android:id="@+id/new_password_title" - style="@style/BriarTextTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/current_password_entry_wrapper" - android:layout_centerHorizontal="true" - android:text="@string/choose_new_password" - android:textSize="@dimen/text_size_medium"/> - <android.support.design.widget.TextInputLayout android:id="@+id/new_password_entry_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/new_password_title" + android:layout_below="@id/current_password_entry_wrapper" android:layout_centerHorizontal="true" - app:errorEnabled="true"> + app:errorEnabled="true" + app:hintEnabled="false"> <EditText android:id="@+id/new_password_entry" android:layout_width="match_parent" android:layout_height="wrap_content" + android:hint="@string/choose_new_password" android:inputType="textPassword" android:maxLines="1"/> </android.support.design.widget.TextInputLayout> - <TextView - android:id="@+id/new_password_confirm_title" - style="@style/BriarTextTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/new_password_entry_wrapper" - android:layout_centerHorizontal="true" - android:text="@string/confirm_new_password" - android:textSize="@dimen/text_size_medium"/> - <android.support.design.widget.TextInputLayout android:id="@+id/new_password_confirm_wrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/new_password_confirm_title" + android:layout_below="@id/new_password_entry_wrapper" android:layout_centerHorizontal="true" - app:errorEnabled="true"> + app:errorEnabled="true" + app:hintEnabled="false"> <EditText android:id="@+id/new_password_confirm" android:layout_width="match_parent" android:layout_height="wrap_content" + android:hint="@string/confirm_new_password" android:imeOptions="actionDone" android:inputType="textPassword" android:maxLines="1"/> @@ -113,7 +89,8 @@ android:layout_centerHorizontal="true" android:layout_marginTop="@dimen/margin_medium" android:enabled="false" - android:text="@string/change_password"/> + android:text="@string/change_password" + tools:enabled="true"/> <ProgressBar android:id="@+id/progress_wheel" diff --git a/briar-android/src/main/res/layout/activity_create_forum.xml b/briar-android/src/main/res/layout/activity_create_forum.xml index 6b2317689572a28e6e9818ba92dd49e6e0b5353e..e759e25c465544164cd82215efc0920933810585 100644 --- a/briar-android/src/main/res/layout/activity_create_forum.xml +++ b/briar-android/src/main/res/layout/activity_create_forum.xml @@ -12,7 +12,8 @@ android:id="@+id/createForumNameLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - app:errorEnabled="true"> + app:errorEnabled="true" + app:hintEnabled="false"> <EditText android:id="@+id/createForumNameEntry" @@ -28,7 +29,8 @@ android:id="@+id/createForumButton" style="@style/BriarButton" android:enabled="false" - android:text="@string/create_forum_button"/> + android:text="@string/create_forum_button" + tools:enabled="true"/> <ProgressBar android:id="@+id/createForumProgressBar" diff --git a/briar-android/src/main/res/layout/activity_password.xml b/briar-android/src/main/res/layout/activity_password.xml index 953b83811e4dbec8ff354aca46f13fceee446fd5..db8e12da2fa3d98d0df71efae077f08885650f4f 100644 --- a/briar-android/src/main/res/layout/activity_password.xml +++ b/briar-android/src/main/res/layout/activity_password.xml @@ -11,35 +11,27 @@ android:orientation="vertical" android:paddingBottom="@dimen/margin_activity_vertical" android:paddingEnd="@dimen/margin_activity_horizontal" + android:paddingLeft="@dimen/margin_activity_horizontal" android:paddingRight="@dimen/margin_activity_horizontal" android:paddingStart="@dimen/margin_activity_horizontal" - android:paddingLeft="@dimen/margin_activity_horizontal" android:paddingTop="@dimen/margin_activity_vertical"> - <TextView - android:id="@+id/title_password" - style="@style/BriarTextTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:padding="@dimen/margin_large" - android:text="@string/enter_password" /> - <android.support.design.widget.TextInputLayout android:id="@+id/password_layout" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerHorizontal="true" - android:layout_below="@id/title_password" - app:errorEnabled="true"> + app:errorEnabled="true" + app:hintEnabled="false"> <EditText android:id="@+id/edit_password" android:layout_width="match_parent" android:layout_height="wrap_content" + android:hint="@string/enter_password" android:imeOptions="actionDone" android:inputType="textPassword" - android:maxLines="1" /> + android:maxLines="1"/> </android.support.design.widget.TextInputLayout> <Button @@ -50,7 +42,7 @@ android:layout_below="@id/password_layout" android:layout_marginTop="@dimen/margin_medium" android:onClick="onSignInClick" - android:text="@string/sign_in_button" /> + android:text="@string/sign_in_button"/> <ProgressBar android:id="@+id/progress_wheel" @@ -58,7 +50,7 @@ android:layout_height="wrap_content" android:layout_alignTop="@id/btn_sign_in" android:layout_centerHorizontal="true" - android:visibility="invisible" /> + android:visibility="invisible"/> <TextView style="@style/BriarTextBody" @@ -70,7 +62,7 @@ android:clickable="true" android:onClick="onForgottenPasswordClick" android:text="@string/forgotten_password" - android:textColor="?android:attr/textColorLink" /> + android:textColor="?android:attr/textColorLink"/> </RelativeLayout> diff --git a/briar-android/src/main/res/layout/fragment_create_group.xml b/briar-android/src/main/res/layout/fragment_create_group.xml index 1df8c9e382fae09ee2fcb83f0e7f490ec935304b..3fc495e9ba20f4c0e7a6cfbdb03d4fdbefa1c421 100644 --- a/briar-android/src/main/res/layout/fragment_create_group.xml +++ b/briar-android/src/main/res/layout/fragment_create_group.xml @@ -12,7 +12,8 @@ android:id="@+id/nameLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - app:errorEnabled="true"> + app:errorEnabled="true" + app:hintEnabled="false"> <EditText android:id="@+id/name" @@ -28,7 +29,8 @@ android:id="@+id/button" style="@style/BriarButton" android:enabled="false" - android:text="@string/groups_create_group_button"/> + android:text="@string/groups_create_group_button" + tools:enabled="true"/> <ProgressBar android:id="@+id/progressBar" diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 52a0944ae3df74311772ce12d00edd110a73aa57..2112043bf5f14aed7ab8dc9180af8d7ddf686728 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -27,7 +27,7 @@ <string name="warning_dozed">%s was unable to run in the background</string> <!-- Login --> - <string name="enter_password">Enter your password:</string> + <string name="enter_password">Enter your password</string> <string name="try_again">Wrong password, try again</string> <string name="sign_in_button">Sign In</string> <string name="forgotten_password">I have forgotten my password</string> @@ -343,9 +343,9 @@ <!-- Settings Security and Panic --> <string name="security_settings_title">Security</string> <string name="change_password">Change password</string> - <string name="current_password">Enter your current password:</string> - <string name="choose_new_password">Choose your new password:</string> - <string name="confirm_new_password">Confirm your new password:</string> + <string name="current_password">Enter your current password</string> + <string name="choose_new_password">Choose your new password</string> + <string name="confirm_new_password">Confirm your new password</string> <string name="password_changed">Password has been changed.</string> <string name="panic_setting">Panic button setup</string> <string name="panic_setting_title">Panic button</string>