From 92b8d874ed0d7e8f835dbd8ce4205e74841d7162 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 15 Jan 2015 16:59:11 +0100
Subject: affirmation -> linked identity

---
 .../layout/linked_create_dns_fragment_step2.xml    | 188 +++++++++++++++++++++
 1 file changed, 188 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml

(limited to 'OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml')

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
new file mode 100644
index 000000000..c416588d7
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="false"
+        android:layout_above="@+id/create_key_button_divider">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_dns_2_1" />
+
+            <EditText
+                android:id="@+id/linked_create_dns_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:layout_marginTop="8dp"
+                android:layout_gravity="center_horizontal"
+                android:inputType="textUri|none"
+                android:enabled="false"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_dns_2_2" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_gravity="center_horizontal">
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Share"
+                    android:id="@+id/button_send"
+                    android:layout_marginRight="8dip"/>
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Save"
+                    android:id="@+id/button_save"
+                    android:layout_marginLeft="8dip"/>
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                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">
+
+                <ImageView
+                    android:id="@+id/verify_image"
+                    android:src="@drawable/status_signature_unverified_cutout"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="16dip"
+                    android:layout_marginStart="16dip"
+                    />
+
+                <ProgressBar
+                    android:id="@+id/verify_progress"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    android:indeterminateOnly="true"/>
+
+                <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>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/linked_create_dns_2_4" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:id="@+id/create_key_button_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:background="?android:attr/listDivider"
+        android:layout_alignTop="@+id/create_key_buttons"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:id="@+id/create_key_buttons">
+
+        <TextView
+            android:id="@+id/back_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_back"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:gravity="center_vertical"
+            android:layout_gravity="center_vertical" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/next_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_next"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_play"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 6c153b15430c00b5213062be4bb5830d52f2589a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 16 Jan 2015 15:59:26 +0100
Subject: linked id ui work dns/twitter

---
 .../src/main/res/layout/linked_create_dns_fragment_step2.xml        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml')

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 c416588d7..edbe33c59 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
@@ -23,15 +23,13 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/linked_create_dns_2_1" />
 
-            <EditText
+            <TextView
                 android:id="@+id/linked_create_dns_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:imeOptions="actionNext"
                 android:layout_marginTop="8dp"
                 android:layout_gravity="center_horizontal"
-                android:inputType="textUri|none"
-                android:enabled="false"/>
+                android:textIsSelectable="true" />
 
             <TextView
                 android:layout_width="wrap_content"
-- 
cgit v1.2.3


From 5e53a5417c11f54f437d9f220d3e2e8579b8bf1b Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 2 Mar 2015 14:45:44 +0100
Subject: some fixes for compiling (still not working!)

---
 OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml')

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 edbe33c59..b54bab008 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
@@ -74,7 +74,7 @@
 
                 <ImageView
                     android:id="@+id/verify_image"
-                    android:src="@drawable/status_signature_unverified_cutout"
+                    android:src="@drawable/status_signature_unverified_cutout_24px"
                     android:layout_gravity="center_vertical"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-- 
cgit v1.2.3


From 9776957ab19bfcb19df20b74732497070b9a4c68 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 12 Mar 2015 22:50:22 +0100
Subject: fix linked wizard buttons

---
 .../src/main/res/layout/linked_create_dns_fragment_step2.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml')

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 33b7a6fb0..a8aa2c856 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
@@ -155,7 +155,10 @@
             android:text="@string/btn_back"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            android:background="?android:selectableItemBackground"
+            android:textAllCaps="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
+            android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:layout_gravity="center_vertical" />
 
@@ -176,11 +179,12 @@
             android:layout_weight="1"
             android:text="@string/btn_next"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
+            android:drawableRight="@drawable/ic_person_add_grey_24dp"
             android:drawablePadding="8dp"
-            android:gravity="center_vertical"
+            android:textAllCaps="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:gravity="center_vertical|right"
             android:clickable="true"
-            android:background="?android:selectableItemBackground"
             android:layout_gravity="center_vertical" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From b26e57ab1996d36005097b9bab3279dfa5c8d7b4 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 13 Mar 2015 01:37:54 +0100
Subject: change finish button label to "link identity"

---
 OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml')

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 a8aa2c856..7181089eb 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
@@ -177,7 +177,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/btn_next"
+            android:text="@string/btn_link_identity"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:drawableRight="@drawable/ic_person_add_grey_24dp"
             android:drawablePadding="8dp"
-- 
cgit v1.2.3


From 8fcffdd7cd1732b10ed6872fc88aead356fd7dbd Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 13 Mar 2015 13:54:52 +0100
Subject: use ViewAnimator for progress, streamline text on first step

---
 .../layout/linked_create_dns_fragment_step2.xml    | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml')

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 7181089eb..6aed07e83 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
@@ -72,22 +72,30 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp">
 
-                <ImageView
-                    android:id="@+id/verify_image"
-                    android:src="@drawable/status_signature_unverified_cutout_24dp"
-                    android:layout_gravity="center_vertical"
+                <ViewAnimator
+                    android:id="@+id/verify_progress"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="16dip"
                     android:layout_marginStart="16dip"
-                    />
-
-                <ProgressBar
-                    android:id="@+id/verify_progress"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    android:indeterminateOnly="true"/>
+                    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"
-- 
cgit v1.2.3


From 3f844cc70b487507f1f41f50b1d9867463b2161b Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 13 Mar 2015 16:30:49 +0100
Subject: work on second step of identity creation

---
 .../layout/linked_create_dns_fragment_step2.xml    | 90 +++++++---------------
 1 file changed, 28 insertions(+), 62 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml')

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"
-- 
cgit v1.2.3