passdialog: switch to ViewAnimator

2 files changed, 14 insertions, 16 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index c3a33fc92..897719fc2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -44,6 +44,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.widget.ViewAnimator;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
@@ -191,7 +192,6 @@ public class PassphraseDialogActivity extends FragmentActivity {
     public static class PassphraseDialogFragment extends DialogFragment implements TextView.OnEditorActionListener {
         private EditText mPassphraseEditText;
         private TextView mPassphraseText;
-        private View mInput, mProgress;
         private EditText[] mBackupCodeEditText;
 
         private CanonicalizedSecretKeyRing mSecretRing = null;
@@ -199,6 +199,7 @@ public class PassphraseDialogActivity extends FragmentActivity {
         private long mSubKeyId;
 
         private Intent mServiceIntent;
+        private ViewAnimator mLayout;
 
         @NonNull
         @Override
@@ -234,13 +235,11 @@ public class PassphraseDialogActivity extends FragmentActivity {
             }
 
             LayoutInflater inflater = LayoutInflater.from(theme);
-            View view = inflater.inflate(R.layout.passphrase_dialog, null);
-            alert.setView(view);
+            mLayout = (ViewAnimator) inflater.inflate(R.layout.passphrase_dialog, null);
+            alert.setView(mLayout);
 
-            mPassphraseText = (TextView) view.findViewById(R.id.passphrase_text);
-            mPassphraseEditText = (EditText) view.findViewById(R.id.passphrase_passphrase);
-            mInput = view.findViewById(R.id.input);
-            mProgress = view.findViewById(R.id.progress);
+            mPassphraseText = (TextView) mLayout.findViewById(R.id.passphrase_text);
+            mPassphraseEditText = (EditText) mLayout.findViewById(R.id.passphrase_passphrase);
 
             alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
 
@@ -428,8 +427,7 @@ public class PassphraseDialogActivity extends FragmentActivity {
                         return;
                     }
 
-                    mInput.setVisibility(View.INVISIBLE);
-                    mProgress.setVisibility(View.VISIBLE);
+                    mLayout.setDisplayedChild(1);
                     positive.setEnabled(false);
 
                     new AsyncTask<Void, Void, Boolean>() {
@@ -469,8 +467,7 @@ public class PassphraseDialogActivity extends FragmentActivity {
                             if (!result) {
                                 mPassphraseEditText.setText("");
                                 mPassphraseEditText.setError(getString(R.string.wrong_passphrase));
-                                mInput.setVisibility(View.VISIBLE);
-                                mProgress.setVisibility(View.INVISIBLE);
+                                mLayout.setDisplayedChild(0);
                                 positive.setEnabled(true);
                                 return;
                             }
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index a2e6af27c..cd6b3e87b 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
     android:paddingLeft="24dp"
     android:paddingRight="24dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    custom:initialView="0">
 
     <LinearLayout
-        android:id="@+id/input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -34,7 +36,6 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/progress"
         android:layout_centerInParent="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -57,4 +58,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
\ No newline at end of file