Apply MD3 changes for set password screen to change password screen as well

briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java

@@ -32,6 +32,7 @@ import static android.widget.Toast.LENGTH_LONG;
 import static org.briarproject.bramble.api.crypto.DecryptionResult.KEY_STRENGTHENER_ERROR;
 import static org.briarproject.bramble.api.crypto.DecryptionResult.SUCCESS;
 import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK;
+import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.STRONG;
 import static org.briarproject.briar.android.login.LoginUtils.createKeyStrengthenerErrorDialog;
 import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
 import static org.briarproject.briar.android.util.UiUtils.setError;
@@ -123,12 +124,25 @@ public class ChangePasswordActivity extends BriarActivity
 		boolean passwordsMatch = firstPassword.equals(secondPassword);
 		float strength = viewModel.estimatePasswordStrength(firstPassword);
 		strengthMeter.setStrength(strength);
+
+		if (!firstPassword.isEmpty()) {
+			if (strength >= STRONG) {
+				newPasswordEntryWrapper.setHelperText(
+						getString(R.string.password_strong));
+			} else if (strength >= QUITE_WEAK) {
+				newPasswordEntryWrapper.setHelperText(
+						getString(R.string.password_quite_strong));
+			} else {
+				newPasswordEntryWrapper.setHelperTextEnabled(false);
+			}
+		}
+
 		setError(newPasswordEntryWrapper,
 				getString(R.string.password_too_weak),
-				firstPassword.length() > 0 && strength < QUITE_WEAK);
+				!firstPassword.isEmpty() && strength < QUITE_WEAK);
 		setError(newPasswordConfirmationWrapper,
 				getString(R.string.passwords_do_not_match),
-				secondPassword.length() > 0 && !passwordsMatch);
+				!secondPassword.isEmpty() && !passwordsMatch);
 		changePasswordButton.setEnabled(
 				!currentPassword.getText().toString().isEmpty() &&
 						passwordsMatch && strength >= QUITE_WEAK);

briar-android/src/main/res/layout/activity_change_password.xml

@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:fillViewport="true"
 	tools:context=".android.login.ChangePasswordActivity">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
@@ -64,15 +65,27 @@
 				android:maxLines="1" />
 		</com.google.android.material.textfield.TextInputLayout>
 
+		<org.briarproject.briar.android.login.StrengthMeter
+			android:id="@+id/strength_meter"
+			android:layout_width="match_parent"
+			android:layout_height="10dp"
+			android:layout_marginTop="8dp"
+			android:visibility="invisible"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
+			tools:visibility="visible" />
+
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/new_password_confirm_wrapper"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
+			app:layout_constraintTop_toBottomOf="@id/strength_meter"
 			app:passwordToggleEnabled="true">
 
 			<com.google.android.material.textfield.TextInputEditText
@@ -86,15 +99,6 @@
 				android:maxLines="1" />
 		</com.google.android.material.textfield.TextInputLayout>
 
-		<org.briarproject.briar.android.login.StrengthMeter
-			android:id="@+id/strength_meter"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:visibility="invisible"
-			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper" />
-
 		<Button
 			android:id="@+id/change_password"
 			style="@style/BriarButton"
@@ -103,9 +107,11 @@
 			android:layout_marginTop="@dimen/margin_medium"
 			android:enabled="false"
 			android:text="@string/change_password"
+			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/strength_meter"
+			app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper"
+			app:layout_constraintVertical_bias="1.0"
 			tools:enabled="true" />
 
 		<com.google.android.material.progressindicator.CircularProgressIndicator