work on second step of identity creation

5 files changed, 161 insertions, 204 deletions

diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
index 6aed07e83..62e267f05 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
@@ -10,7 +10,7 @@
         android:layout_above="@+id/create_key_button_divider">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
@@ -29,7 +29,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:layout_gravity="center_horizontal"
-                android:textIsSelectable="true" />
+                android:textIsSelectable="true"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -39,24 +41,38 @@
                 android:text="@string/linked_create_dns_2_2" />
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_gravity="center_horizontal">
+                android:layout_gravity="center_horizontal"
+                style="?android:buttonBarStyle"
+                android:showDividers="middle">
 
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Share"
-                    android:id="@+id/button_send"
-                    android:layout_marginRight="8dip"/>
+                    android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    style="?android:buttonBarButtonStyle"
+                    android:drawableLeft="@drawable/ic_content_copy_grey_24dp"
+                    android:drawableStart="@android:drawable/ic_menu_share"
+                    android:text="Copy"
+                    android:id="@+id/button_save"
+                    />
 
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Save"
-                    android:id="@+id/button_save"
-                    android:layout_marginLeft="8dip"/>
+                    android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    style="?android:buttonBarButtonStyle"
+                    android:drawableLeft="@android:drawable/ic_menu_share"
+                    android:drawableStart="@android:drawable/ic_menu_share"
+                    android:text="Share"
+                    android:id="@+id/button_send"
+                    />
 
             </LinearLayout>
 
@@ -67,57 +83,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/linked_create_dns_2_3" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp">
-
-                <ViewAnimator
-                    android:id="@+id/verify_progress"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginStart="16dip"
-                    android:layout_gravity="center_vertical"
-                    android:inAnimation="@anim/fade_in"
-                    android:outAnimation="@anim/fade_out"
-                    >
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:id="@+id/verify_image"
-                        android:src="@drawable/status_signature_unverified_cutout_24dp"
-                        />
-
-                    <ProgressBar
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:indeterminateOnly="true"/>
-
-                </ViewAnimator>
-
-                <TextView
-                    android:id="@+id/verify_status"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="@string/linked_verify_pending"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginStart="16dip"
-                    android:layout_weight="1"
-                    />
-
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Verify"
-                    android:id="@+id/button_verify"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginEnd="16dip"
-                    />
-
-            </LinearLayout>
+            <include layout="@layout/linked_create_verify" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -185,7 +151,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/btn_link_identity"
+            android:text="@string/btn_finish"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:drawableRight="@drawable/ic_person_add_grey_24dp"
             android:drawablePadding="8dp"
diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml
index b756cbe7a..dc6895a54 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml
@@ -43,24 +43,38 @@
                 android:text="@string/linked_create_https_2_2" />
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_gravity="center_horizontal">
+                android:layout_gravity="center_horizontal"
+                style="?android:buttonBarStyle"
+                >
 
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Share"
-                    android:id="@+id/button_send"
-                    android:layout_marginRight="8dip"/>
+                    android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    style="?android:buttonBarButtonStyle"
+                    android:drawableLeft="@android:drawable/ic_menu_save"
+                    android:drawableStart="@android:drawable/ic_menu_save"
+                    android:text="Save"
+                    android:id="@+id/button_save"
+                    />
 
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Save"
-                    android:id="@+id/button_save"
-                    android:layout_marginLeft="8dip"/>
+                    android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    style="?android:buttonBarButtonStyle"
+                    android:drawableLeft="@android:drawable/ic_menu_share"
+                    android:drawableStart="@android:drawable/ic_menu_share"
+                    android:text="Share"
+                    android:id="@+id/button_send"
+                    />
 
             </LinearLayout>
 
@@ -71,57 +85,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/linked_create_https_2_3" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp">
-
-                <ViewAnimator
-                    android:id="@+id/verify_progress"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginStart="16dip"
-                    android:layout_gravity="center_vertical"
-                    android:inAnimation="@anim/fade_in"
-                    android:outAnimation="@anim/fade_out"
-                    >
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:id="@+id/verify_image"
-                        android:src="@drawable/status_signature_unverified_cutout_24dp"
-                        />
-
-                    <ProgressBar
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:indeterminateOnly="true"/>
-
-                </ViewAnimator>
-
-                <TextView
-                    android:id="@+id/verify_status"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="@string/linked_verify_pending"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginStart="16dip"
-                    android:layout_weight="1"
-                    />
-
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Verify"
-                    android:id="@+id/button_verify"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginEnd="16dip"
-                    />
-
-            </LinearLayout>
+            <include layout="@layout/linked_create_verify" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -189,7 +153,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/btn_link_identity"
+            android:text="@string/btn_finish"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:textAllCaps="true"
             android:drawableRight="@drawable/ic_person_add_grey_24dp"
diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml
index 2ffcd468b..e42c23b51 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml
@@ -23,18 +23,6 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/linked_create_twitter_2_1" />
 
-            <EditText
-                android:id="@+id/linked_create_twitter_preview"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:imeOptions="actionNext"
-                android:layout_marginTop="8dp"
-                android:ems="10"
-                android:layout_gravity="center_horizontal"
-                android:inputType="textMultiLine"
-                android:enabled="false"
-                android:textSize="@dimen/abc_text_size_small_material"/>
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -43,28 +31,37 @@
                 android:text="@string/linked_create_twitter_2_2" />
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_gravity="center_horizontal">
+                android:layout_gravity="center_horizontal"
+                style="?android:buttonBarStyle">
 
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    style="?android:buttonBarButtonStyle"
                     android:drawableLeft="@android:drawable/ic_menu_send"
                     android:drawableStart="@android:drawable/ic_menu_send"
                     android:text="Tweet"
                     android:id="@+id/button_send"
-                    android:layout_marginRight="8dip" />
+                    />
 
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    style="?android:buttonBarButtonStyle"
                     android:drawableLeft="@android:drawable/ic_menu_share"
                     android:drawableStart="@android:drawable/ic_menu_share"
                     android:text="Share"
                     android:id="@+id/button_share"
-                    android:layout_marginLeft="8dip" />
+                    />
 
             </LinearLayout>
 
@@ -75,57 +72,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/linked_create_twitter_2_3" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp">
-
-                <ViewAnimator
-                    android:id="@+id/verify_progress"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginStart="16dip"
-                    android:layout_gravity="center_vertical"
-                    android:inAnimation="@anim/fade_in"
-                    android:outAnimation="@anim/fade_out"
-                    >
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:id="@+id/verify_image"
-                        android:src="@drawable/status_signature_unverified_cutout_24dp"
-                        />
-
-                    <ProgressBar
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:indeterminateOnly="true"/>
-
-                </ViewAnimator>
-
-                <TextView
-                    android:id="@+id/verify_status"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="@string/linked_verify_pending"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginStart="16dip"
-                    android:layout_weight="1"
-                    />
-
-                <Button
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/linked_create_verify"
-                    android:id="@+id/button_verify"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginEnd="16dip"
-                    />
-
-            </LinearLayout>
+            <include layout="@layout/linked_create_verify" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -193,7 +140,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/btn_link_identity"
+            android:text="@string/btn_finish"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:textAllCaps="true"
             android:drawableRight="@drawable/ic_person_add_grey_24dp"
diff --git a/OpenKeychain/src/main/res/layout/linked_create_verify.xml b/OpenKeychain/src/main/res/layout/linked_create_verify.xml
new file mode 100644
index 000000000..837bae09a
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/linked_create_verify.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
+    tools:showIn="@layout/linked_create_https_fragment_step2">
+
+    <ViewAnimator
+        android:id="@+id/verify_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_gravity="center_vertical"
+        android:inAnimation="@anim/fade_in"
+        android:outAnimation="@anim/fade_out"
+        >
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:id="@+id/verify_image"
+            android:src="@drawable/status_signature_unverified_cutout_24dp"
+            />
+
+        <ProgressBar
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:indeterminateOnly="true" />
+
+    </ViewAnimator>
+
+    <TextView
+        android:id="@+id/verify_status"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/linked_verify_pending"
+        android:layout_marginLeft="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_weight="1"
+        />
+
+    <ViewAnimator
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dip"
+        android:inAnimation="@anim/fade_in"
+        android:outAnimation="@anim/fade_out"
+        android:id="@+id/verify_buttons"
+        >
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:buttonBarButtonStyle"
+            android:text="Verify"
+            android:id="@+id/button_verify"
+            />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:buttonBarButtonStyle"
+            android:text="Retry"
+            android:id="@+id/button_retry"
+            />
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </ViewAnimator>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6611390ce..1e1e5ffe3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1280,16 +1280,16 @@
     <string name="linked_create_https_2_1">"A proof file for this URI has been created:"</string>
     <string name="linked_create_https_2_2">"For the next step, you should save and upload this file."</string>
     <string name="linked_create_https_2_3">"Make sure the file is reachable at the correct URI, then verify your setup."</string>
-    <string name="linked_create_https_2_4">"After verification is successful, hit next to add the linked identity to your keyring and finish the process."</string>
+    <string name="linked_create_https_2_4">"After successful verification, press the Finish button to add the Linked Identity to your keyring and finish the process."</string>
 
     <string name="linked_create_twitter_1_1">"By creating a Linked Identity of this type, you can link your key to a Twitter account you control."</string>
     <string name="linked_create_twitter_1_2">"To do this, you publish a specific Tweet on your timeline, then create a Linked Identity which links to this tweet."</string>
     <string name="linked_create_twitter_1_3">"Please enter your Twitter screen name to proceed."</string>
     <string name="linked_create_twitter_handle">Twitter Handle</string>
-    <string name="linked_create_twitter_2_1">"This is the text for your Tweet:"</string>
-    <string name="linked_create_twitter_2_2">"You may add more text to the Tweet, so long as the text inside the brackets is unmodified. Tweet this message using either method."</string>
-    <string name="linked_create_twitter_2_3">"Once your Tweet is published, click the button below to scan your timeline for it."</string>
-    <string name="linked_create_twitter_2_4">"Next"</string>
+    <string name="linked_create_twitter_2_1">"Click either button to tweet the message!"</string>
+    <string name="linked_create_twitter_2_2">"You can edit the Tweet before posting it, so long as the text inside the brackets is unmodified."</string>
+    <string name="linked_create_twitter_2_3">"Once your Tweet is published, click the Verify button to scan your timeline for it."</string>
+    <string name="linked_create_twitter_2_4">"After successful verification, press the Finish button to add the Linked Identity to your keyring and finish the process."</string>
 
     <string name="linked_create_dns_1_1">"By creating a Linked Identity of this type, you can link your key to a domain name you control."</string>
     <string name="linked_create_dns_1_2">"To do this, you create a specific TXT record for the domain, then create a Linked Identity which links to this record."</string>
@@ -1299,20 +1299,21 @@
     <string name="linked_create_dns_2_1">"Your proof text:"</string>
     <string name="linked_create_dns_2_2">"For the next step, bla bla"</string>
     <string name="linked_create_dns_2_3">"More bla:"</string>
-    <string name="linked_create_dns_2_4">"bla bla"</string>
+    <string name="linked_create_dns_2_4">"After successful verification, press the Finish button to add the Linked Identity to your keyring and finish the process."</string>
 
     <string name="linked_select_1">"A \'linked identity\' connects your pgp key to a resource on the web."</string>
-    <string name="linked_select_2">Please select a type:</string>
+    <string name="linked_select_2">"Please select a type:"</string>
     <string name="linked_id_generic_text">"This file claims ownership of the OpenPGP key with long id %2$s.\n\nCookie for proof:\n%1$s"</string>
-    <string name="linked_verifying">Verifying…</string>
-    <string name="linked_verify_success">Verified!</string>
-    <string name="linked_verify_error">Verification error!</string>
-    <string name="linked_verify_pending">Not yet verified</string>
+    <string name="linked_verifying">"Verifying…"</string>
+    <string name="linked_verify_success">"Verified!"</string>
+    <string name="linked_verify_error">"Verification error!"</string>
+    <string name="linked_verify_pending">"Not yet verified"</string>
     <string name="linked_need_verify">The resource needs to be verified before you can proceed!</string>
     <string name="menu_linked_add_identity">"Add Linked Identity"</string>
-    <string name="section_linked_identities">Linked Identities</string>
-    <string name="btn_link_identity">Link Identity</string>
-    <string name="linked_create_verify">Verify</string>
+    <string name="section_linked_identities">"Linked Identities"</string>
+    <string name="btn_finish">"Finish"</string>
+    <string name="linked_create_verify">"Verify"</string>
+    <string name="linked_text_clipboard">Text has been copied to clipboard</string>
     <plurals name="linked_id_expand">
         <item quantity="one">"There is one more unknown identity type"</item>
         <item quantity="other">"There are %d more unknown identity types"</item>