aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-07-06 16:21:48 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-07-06 16:21:48 +0200
commit1eb438576d862df8bf8c7221a6bebee7e8dd85f3 (patch)
tree689853089f80748e3861f17379a5fedc7a378bf9 /OpenKeychain/src/main/res/layout
parent0c6ef6aed45130b3958fd351558df52738979dae (diff)
downloadopen-keychain-1eb438576d862df8bf8c7221a6bebee7e8dd85f3.tar.gz
open-keychain-1eb438576d862df8bf8c7221a6bebee7e8dd85f3.tar.bz2
open-keychain-1eb438576d862df8bf8c7221a6bebee7e8dd85f3.zip
Better YubiKey UX flow for error handling
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/nfc_operation_activity.xml (renamed from OpenKeychain/src/main/res/layout/nfc_activity.xml)63
1 files changed, 42 insertions, 21 deletions
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
index 992f8c14d..8b043861f 100644
--- a/OpenKeychain/src/main/res/layout/nfc_activity.xml
+++ b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
@@ -14,10 +14,6 @@
android:measureAllChildren="false"
android:minHeight="?listPreferredItemHeightSmall"
android:outAnimation="@anim/fade_out"
- android:paddingBottom="16dp"
- android:paddingLeft="24dp"
- android:paddingRight="24dp"
- android:paddingTop="16dp"
custom:initialView="3">
<RelativeLayout
@@ -25,20 +21,23 @@
android:layout_height="wrap_content">
<TextView
- android:id="@+id/nfc_activity_text"
+ android:id="@+id/nfc_activity_0_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginLeft="24dp"
+ android:layout_marginRight="24dp"
+ android:layout_marginTop="24dp"
android:text="@string/nfc_text"
android:textAppearance="@android:style/TextAppearance.Medium" />
<ImageView
- android:id="@+id/nfc_image"
+ android:id="@+id/nfc_activity_0_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_text"
- android:layout_marginTop="8dp"
+ android:layout_below="@+id/nfc_activity_0_text"
+ android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
android:src="@drawable/yubikey_phone" />
@@ -49,9 +48,12 @@
android:layout_height="wrap_content">
<TextView
- android:id="@+id/nfc_activity_text2"
+ android:id="@+id/nfc_activity_1_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginLeft="24dp"
+ android:layout_marginRight="24dp"
+ android:layout_marginTop="24dp"
android:text="@string/nfc_wait"
android:textAppearance="@android:style/TextAppearance.Medium" />
@@ -65,13 +67,13 @@
<!-- placeholder to retain dialog size -->
<ImageView
- android:id="@+id/nfc_image_placeholder1"
+ android:id="@+id/nfc_activity_1_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_text2"
- android:layout_marginTop="8dp"
+ android:layout_below="@+id/nfc_activity_1_text"
+ android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
android:src="@drawable/yubikey_phone"
@@ -84,21 +86,24 @@
android:layout_height="wrap_content">
<TextView
- android:id="@+id/nfc_activity_text3"
+ android:id="@+id/nfc_activity_2_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginLeft="24dp"
+ android:layout_marginRight="24dp"
+ android:layout_marginTop="24dp"
android:text="@string/nfc_finished"
android:textAppearance="@android:style/TextAppearance.Medium" />
<!-- placeholder to retain dialog size -->
<ImageView
- android:id="@+id/nfc_image_placeholder2"
+ android:id="@+id/nfc_activity_2_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_text3"
- android:layout_marginTop="8dp"
+ android:layout_below="@+id/nfc_activity_2_text"
+ android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
android:src="@drawable/yubikey_phone"
@@ -120,36 +125,52 @@
android:layout_height="wrap_content">
<TextView
- android:id="@+id/nfc_activity_text_placeholder"
+ android:id="@+id/nfc_activity_3_text_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignEnd="@+id/nfc_activity_3_placeholder"
+ android:layout_alignRight="@+id/nfc_activity_3_placeholder"
+ android:layout_marginLeft="24dp"
+ android:layout_marginTop="24dp"
android:text=""
android:textAppearance="@android:style/TextAppearance.Medium" />
<!-- placeholder to retain dialog size -->
<ImageView
- android:id="@+id/nfc_image_placeholder3"
+ android:id="@+id/nfc_activity_3_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_text_placeholder"
- android:layout_marginTop="8dp"
+ android:layout_below="@+id/nfc_activity_3_text_placeholder"
+ android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
android:src="@drawable/yubikey_phone"
android:visibility="invisible" />
<TextView
- android:id="@+id/nfc_activity_error_text"
+ android:id="@+id/nfc_activity_3_error_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
+ android:layout_margin="24dp"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textColor="@color/android_red_dark"
tools:text="Error text" />
+ <Button
+ android:id="@+id/nfc_activity_3_error_try_again"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="48dp"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/nfc_activity_3_placeholder"
+ android:layout_margin="8dp"
+ android:text="@string/error_nfc_try_again"
+ android:textColor="@color/accent" />
</RelativeLayout>