From f71596c258e2c74edd3b04f055a53f414635ee91 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 11 Dec 2015 11:32:51 +0000
Subject: [PATCH] Align progress wheel with button.
---
briar-android/res/layout/activity_password.xml | 8 ++++----
.../org/briarproject/android/PasswordActivity.java | 11 ++++-------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/briar-android/res/layout/activity_password.xml b/briar-android/res/layout/activity_password.xml
index e29fcb6a15..76ce7c1277 100644
--- a/briar-android/res/layout/activity_password.xml
+++ b/briar-android/res/layout/activity_password.xml
@@ -43,12 +43,12 @@
style="?android:attr/progressBarStyleInverse"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/edit_password"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:visibility="gone" />
+ android:layout_alignTop="@id/btn_sign_in"
+ android:layout_alignBottom="@id/btn_sign_in"
+ android:gravity="center"
+ android:visibility="invisible" />
<TextView
- android:id="@+id/forgot_password"
style="@style/BriarTextBody"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index 6a024f9caf..75e8b64c83 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -24,7 +24,7 @@ import java.util.concurrent.Executor;
import javax.inject.Inject;
-import static android.view.View.GONE;
+import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
@@ -33,7 +33,7 @@ public class PasswordActivity extends BaseActivity {
@Inject @CryptoExecutor private Executor cryptoExecutor;
private Button signInButton;
private ProgressBar progress;
- private TextView title, forgotPassword;
+ private TextView title;
private EditText password;
private byte[] encrypted;
@@ -57,7 +57,6 @@ public class PasswordActivity extends BaseActivity {
signInButton = (Button) findViewById(R.id.btn_sign_in);
progress = (ProgressBar) findViewById(R.id.progress_wheel);
title = (TextView) findViewById(R.id.title_password);
- forgotPassword = (TextView) findViewById(R.id.forgot_password);
password = (EditText) findViewById(R.id.edit_password);
password.setOnEditorActionListener(new OnEditorActionListener() {
@Override
@@ -100,8 +99,7 @@ public class PasswordActivity extends BaseActivity {
private void validatePassword(final byte[] encrypted, Editable e) {
hideSoftKeyboard();
// Replace the button with a progress bar
- signInButton.setVisibility(GONE);
- forgotPassword.setVisibility(GONE);
+ signInButton.setVisibility(INVISIBLE);
progress.setVisibility(VISIBLE);
// Decrypt the database key in a background thread
final String password = e.toString();
@@ -123,8 +121,7 @@ public class PasswordActivity extends BaseActivity {
public void run() {
title.setText(R.string.try_again);
signInButton.setVisibility(VISIBLE);
- forgotPassword.setVisibility(VISIBLE);
- progress.setVisibility(GONE);
+ progress.setVisibility(INVISIBLE);
password.setText("");
}
});
--
GitLab