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

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

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

diff --git a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
new file mode 100644
index 000000000..deaa9098d
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/linked_select_1"
+            android:id="@+id/textView"
+            android:layout_weight="1" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/linked_select_2"
+            android:layout_weight="1" />
+
+        <org.sufficientlysecure.keychain.ui.widget.FixedListView
+            android:id="@+id/view_key_user_ids"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="4dp"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/linked_create_https_button"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <!-- separate ImageView required for recoloring -->
+            <ImageView
+                android:id="@+id/certify_key_action_certify_image"
+                android:layout_width="60dip"
+                android:layout_height="60dip"
+                android:padding="8dp"
+                android:src="@drawable/ssl_lock"
+                android:layout_gravity="center_vertical" />
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="Website (HTTPS)"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="4dp"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/linked_create_dns_button"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <!-- separate ImageView required for recoloring -->
+            <ImageView
+                android:layout_width="60dip"
+                android:layout_height="60dip"
+                android:padding="8dp"
+                android:src="@drawable/dns"
+                android:layout_gravity="center"
+                />
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="Domain Name (DNS)"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="4dp"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/linked_create_twitter_button"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <!-- separate ImageView required for recoloring -->
+            <ImageView
+                android:layout_width="60dip"
+                android:layout_height="60dip"
+                android:padding="8dp"
+                android:src="@drawable/twitter"
+                android:layout_gravity="center"
+                />
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="Twitter"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="4dp"
+            android:background="?android:attr/listDivider" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3


From b25371fc1bd604dd15f3f42bda7227e3f84d4515 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 24 Mar 2015 02:30:39 +0100
Subject: support github resource (re)

---
 .../src/main/res/layout/linked_select_fragment.xml | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
index 308eb60f5..a183cdc93 100644
--- a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
@@ -148,6 +148,41 @@
             android:layout_marginBottom="4dp"
             android:background="?android:attr/listDivider" />
 
+        <LinearLayout
+            android:id="@+id/linked_create_github_button"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            android:background="?android:selectableItemBackground"
+            android:orientation="horizontal">
+
+            <!-- separate ImageView required for recoloring -->
+            <ImageView
+                android:layout_width="60dip"
+                android:layout_height="60dip"
+                android:padding="8dp"
+                android:src="@drawable/github"
+                android:layout_gravity="center"
+                />
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="Github"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="4dp"
+            android:background="?android:attr/listDivider" />
+
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3


From aa6d0dd86773eda7d0a5a6855b40c2e1f95e2b45 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 26 Mar 2015 13:53:43 +0100
Subject: some linked id ui fine tuning

---
 .../src/main/res/layout/linked_select_fragment.xml | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
index a183cdc93..25b7bd413 100644
--- a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
@@ -48,7 +48,6 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            android:paddingRight="4dp"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
@@ -58,15 +57,16 @@
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/ssl_lock"
+                android:src="@drawable/linked_https"
                 android:layout_gravity="center_vertical" />
 
             <TextView
                 android:paddingLeft="8dp"
+                android:paddingRight="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="Website (HTTPS)"
+                android:text="@string/linked_title_https"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
@@ -83,7 +83,6 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            android:paddingRight="4dp"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
@@ -92,16 +91,17 @@
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/dns"
+                android:src="@drawable/linked_dns"
                 android:layout_gravity="center"
                 />
 
             <TextView
                 android:paddingLeft="8dp"
+                android:paddingRight="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="Domain Name (DNS)"
+                android:text="@string/linked_title_dns"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
@@ -118,7 +118,6 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            android:paddingRight="4dp"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
@@ -127,16 +126,17 @@
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/twitter"
+                android:src="@drawable/linked_twitter"
                 android:layout_gravity="center"
                 />
 
             <TextView
                 android:paddingLeft="8dp"
+                android:paddingRight="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="Twitter"
+                android:text="@string/linked_title_twitter"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
@@ -153,7 +153,6 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            android:paddingRight="4dp"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
@@ -162,16 +161,17 @@
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/github"
+                android:src="@drawable/linked_github"
                 android:layout_gravity="center"
                 />
 
             <TextView
                 android:paddingLeft="8dp"
+                android:paddingRight="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="Github"
+                android:text="@string/linked_title_github"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
-- 
cgit v1.2.3


From ee8101816349c53b119d5942bfc3076a10a1c744 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 31 Aug 2015 13:40:22 +0200
Subject: linked: disable DNS resource (for now)

---
 OpenKeychain/src/main/res/layout/linked_select_fragment.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
index 25b7bd413..4a2efac4a 100644
--- a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
@@ -72,6 +72,7 @@
 
         </LinearLayout>
 
+        <!--
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -86,7 +87,7 @@
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
-            <!-- separate ImageView required for recoloring -->
+            <!- separate ImageView required for recoloring ->
             <ImageView
                 android:layout_width="60dip"
                 android:layout_height="60dip"
@@ -106,6 +107,7 @@
                 android:gravity="center_vertical" />
 
         </LinearLayout>
+        -->
 
         <View
             android:layout_width="match_parent"
-- 
cgit v1.2.3


From 19c9fcc2c95b441133d3dffec9b5f71621fb2162 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 1 Sep 2015 14:07:04 +0200
Subject: linked: order selection dialog alphabetically

---
 .../src/main/res/layout/linked_select_fragment.xml | 45 ++++++++++------------
 1 file changed, 20 insertions(+), 25 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
index 4a2efac4a..cfb0fdee5 100644
--- a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
@@ -32,11 +32,6 @@
             android:text="@string/linked_select_2"
             android:layout_weight="1" />
 
-        <org.sufficientlysecure.keychain.ui.widget.FixedListView
-            android:id="@+id/view_key_user_ids"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -44,7 +39,7 @@
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
-            android:id="@+id/linked_create_https_button"
+            android:id="@+id/linked_create_github_button"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
@@ -53,12 +48,12 @@
 
             <!-- separate ImageView required for recoloring -->
             <ImageView
-                android:id="@+id/certify_key_action_certify_image"
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/linked_https"
-                android:layout_gravity="center_vertical" />
+                android:src="@drawable/linked_github"
+                android:layout_gravity="center"
+                />
 
             <TextView
                 android:paddingLeft="8dp"
@@ -66,13 +61,12 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="@string/linked_title_https"
+                android:text="@string/linked_title_github"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
         </LinearLayout>
 
-        <!--
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -80,19 +74,19 @@
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
-            android:id="@+id/linked_create_dns_button"
+            android:id="@+id/linked_create_twitter_button"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
-            <!- separate ImageView required for recoloring ->
+            <!-- separate ImageView required for recoloring -->
             <ImageView
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/linked_dns"
+                android:src="@drawable/linked_twitter"
                 android:layout_gravity="center"
                 />
 
@@ -102,13 +96,13 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="@string/linked_title_dns"
+                android:text="@string/linked_title_twitter"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
         </LinearLayout>
-        -->
 
+        <!--
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -116,19 +110,19 @@
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
-            android:id="@+id/linked_create_twitter_button"
+            android:id="@+id/linked_create_dns_button"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
-            <!-- separate ImageView required for recoloring -->
+            <!- separate ImageView required for recoloring ->
             <ImageView
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/linked_twitter"
+                android:src="@drawable/linked_dns"
                 android:layout_gravity="center"
                 />
 
@@ -138,11 +132,12 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="@string/linked_title_twitter"
+                android:text="@string/linked_title_dns"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
         </LinearLayout>
+        -->
 
         <View
             android:layout_width="match_parent"
@@ -151,7 +146,7 @@
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
-            android:id="@+id/linked_create_github_button"
+            android:id="@+id/linked_create_https_button"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
@@ -160,12 +155,12 @@
 
             <!-- separate ImageView required for recoloring -->
             <ImageView
+                android:id="@+id/certify_key_action_certify_image"
                 android:layout_width="60dip"
                 android:layout_height="60dip"
                 android:padding="8dp"
-                android:src="@drawable/linked_github"
-                android:layout_gravity="center"
-                />
+                android:src="@drawable/linked_https"
+                android:layout_gravity="center_vertical" />
 
             <TextView
                 android:paddingLeft="8dp"
@@ -173,7 +168,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="@string/linked_title_github"
+                android:text="@string/linked_title_https"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
-- 
cgit v1.2.3


From bb7efe0ce94f2bb8e111b17f5e3e4cfde045cd9b Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 8 Sep 2015 15:51:01 +0200
Subject: linked: fix button margins in select dialog

---
 OpenKeychain/src/main/res/layout/linked_select_fragment.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
index cfb0fdee5..a8d7b408b 100644
--- a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml
@@ -35,13 +35,14 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
-            android:layout_marginBottom="4dp"
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
             android:id="@+id/linked_create_github_button"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
             android:clickable="true"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
@@ -70,13 +71,14 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
-            android:layout_marginBottom="4dp"
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
             android:id="@+id/linked_create_twitter_button"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
             android:clickable="true"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
@@ -142,13 +144,14 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
-            android:layout_marginBottom="4dp"
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
             android:id="@+id/linked_create_https_button"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
             android:clickable="true"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
-- 
cgit v1.2.3