finish ui flow for yubikey import

2 files changed, 66 insertions, 23 deletions

diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_import_fragment.xml
index 0f5e50d42..e70188e49 100644
--- a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubikey_import_fragment.xml
@@ -3,38 +3,79 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:layout_above="@+id/create_key_buttons">
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:orientation="horizontal"
+        android:id="@+id/yubikey_status_layout" >
+
+        <ImageView
+            android:layout_margin="14dp"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/yubi_icon"/>
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
             android:orientation="vertical">
 
             <TextView
+                android:id="@+id/yubikey_serno"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="Yubikey #"
+                />
+
+            <TextView
+                android:id="@+id/yubikey_userid"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:id="@+id/create_yubikey_unknown_fp"
-                android:text="(yubikey fingerprint)" />
+                android:layout_gravity="center_vertical"
+                android:text="User ID"
+                />
 
             <TextView
+                android:id="@+id/yubikey_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="Hit next to import this key"
+                android:layout_gravity="center_vertical"
+                android:text="Unknown key, hit next to import"
                 />
 
         </LinearLayout>
 
-    </ScrollView>
+        <ImageButton
+            android:id="@+id/button_search"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="8dp"
+            android:src="@drawable/ic_search_grey_24dp"
+            android:layout_gravity="center_vertical"
+            android:background="?android:selectableItemBackground" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_marginTop="4dp"
+        android:layout_height="1dip"
+        android:layout_below="@id/yubikey_status_layout"
+        android:background="?android:attr/listDivider" />
+
+    <FrameLayout
+        android:id="@+id/yubikey_import_fragment"
+        android:layout_marginTop="8dp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/yubikey_status_layout"
+        android:layout_above="@id/create_key_buttons"
+        />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -71,10 +112,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/btn_next"
+            android:text="@string/btn_import"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
+            android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
             android:drawablePadding="8dp"
             android:gravity="right|center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6dfdb8997..27eda28a0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1124,7 +1124,7 @@
     <string name="msg_import_fetch_error_decode">"Error decoding retrieved keyring!"</string>
     <string name="msg_import_fetch_error">"Key could not be retrieved! (Network problems?)"</string>
     <string name="msg_import_fetch_keybase">"Retrieving from keybase.io: %s"</string>
-    <string name="msg_import_fetch_keyserver_error">"Could not retrieve key from keybase!"</string>
+    <string name="msg_import_fetch_keyserver_error">"Could not retrieve key from keyservers: %s"</string>
     <string name="msg_import_fetch_keyserver">"Retrieving from keyserver: %s"</string>
     <string name="msg_import_fetch_keyserver_ok">"Key retrieval successful"</string>
     <string name="msg_import_keyserver">"Using keyserver %s"</string>
@@ -1267,13 +1267,15 @@
     <string name="nfc_write_succesful">Successfully written on NFC tag</string>
     <string name="unlocked">Unlocked</string>
     <string name="nfc_settings">Settings</string>
-    <string name="snack_yubikey_view">View</string>
-    <string name="button_bind_key">Bind Key</string>
+    <string name="snack_yubikey_view">"View"</string>
+    <string name="snack_yubikey_import">"Import"</string>
+    <string name="button_bind_key">"Bind Key"</string>
     <string name="yubikey_serno">"Serial No: %s"</string>
     <string name="yubikey_key_holder">"Key holder: "</string>
     <string name="yubikey_key_holder_unset">"Key holder: &lt;unset&gt;"</string>
-    <string name="yubikey_status_bound">Yubikey matches, bound to key</string>
-    <string name="yubikey_status_unbound">Yubikey matches, can be bound to key</string>
-    <string name="yubikey_status_partly">Yubikey matches, partly bound to key</string>
+    <string name="yubikey_status_bound">"Yubikey matches, bound to key"</string>
+    <string name="yubikey_status_unbound">"Yubikey matches, can be bound to key"</string>
+    <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string>
+    <string name="btn_import">"Import"</string>
 
 </resources>