From 92d14c4a0090c71842440d96be1f84dab5a82d16 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 28 Apr 2015 14:46:52 +0200
Subject: increased padding on image buttons on v21 to match material
 guidelines

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

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

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 75572877..b7817b38 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -34,7 +34,7 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:background="?android:selectableItemBackground"
-        android:padding="8dp"
+        android:padding="@dimen/image_button_padding"
         android:src="?attr/icon_remove"
         android:visibility="invisible" />
 
-- 
cgit v1.2.3


From ffffca10f0c3e399fbbcde200ea4758acc5ba03f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 13 Jul 2015 12:55:13 +0200
Subject: renamed colors

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

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

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index b7817b38..933b72b4 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -15,7 +15,7 @@
             android:id="@+id/key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeBody"
             android:typeface="monospace" />
 
@@ -23,7 +23,7 @@
             android:id="@+id/key_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/secondarytext"
+            android:textColor="@color/black54"
             android:textSize="?attr/TextSizeInfo"/>
     </LinearLayout>
 
-- 
cgit v1.2.3


From 23a4e1e6fada4eb5309db35efcf80d6f1f6f4d34 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Thu, 9 Jul 2015 14:26:19 +0200
Subject: Display trust status in ContactDetailsActivity

---
 src/main/res/layout/contact_key.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

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

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 933b72b4..79b9af62 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -3,12 +3,11 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent" >
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_toLeftOf="@+id/button_remove"
-        android:orientation="vertical"
         android:padding="8dp" >
 
         <TextView
@@ -16,6 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/black87"
+            android:layout_alignParentLeft="true"
             android:textSize="?attr/TextSizeBody"
             android:typeface="monospace" />
 
@@ -24,8 +24,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/black54"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/key"
             android:textSize="?attr/TextSizeInfo"/>
-    </LinearLayout>
+
+        <TextView
+            android:id="@+id/key_trust"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/key"
+            android:visibility="gone"
+            android:textColor="@color/black54"
+            android:textSize="?attr/TextSizeInfo"/>
+    </RelativeLayout>
 
     <ImageButton
         android:id="@+id/button_remove"
-- 
cgit v1.2.3


From 3d339460889644c859d932eb3f2e324bd5696707 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Fri, 10 Jul 2015 02:56:44 +0200
Subject: Add key trust toggle to ContactDetailsActivity

Can now toggle IdentityKey trust
---
 src/main/res/layout/contact_key.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 79b9af62..a43f8083 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -50,4 +50,14 @@
         android:src="?attr/icon_remove"
         android:visibility="invisible" />
 
+    <ImageButton
+        android:id="@+id/button_trust"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:background="?android:selectableItemBackground"
+        android:padding="@dimen/image_button_padding"
+        android:src="?attr/icon_done"
+        android:visibility="invisible" />
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 6f67469bda0ffe97cb8cd8d400affed5a17c34c5 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sun, 19 Jul 2015 14:09:49 +0200
Subject: Refactor trust key ui and show in account details

Refactored the trust key row UI element so it can be used in multiple
places. It now also uses a slider to toggle the trust state, and the
redundant trust state description was removed.

EditAccountActivity now shows the keys of other devices associated with
that account.
---
 src/main/res/layout/contact_key.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index a43f8083..64f6075c 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -4,10 +4,10 @@
     android:layout_height="match_parent" >
 
     <RelativeLayout
+        android:id="@+id/key_data"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@+id/button_remove"
         android:padding="8dp" >
 
         <TextView
@@ -16,6 +16,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/black87"
             android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@+id/tgl_trust"
             android:textSize="?attr/TextSizeBody"
             android:typeface="monospace" />
 
@@ -37,27 +38,28 @@
             android:visibility="gone"
             android:textColor="@color/black54"
             android:textSize="?attr/TextSizeInfo"/>
-    </RelativeLayout>
 
     <ImageButton
         android:id="@+id/button_remove"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
+        android:layout_toRightOf="@+id/key"
         android:layout_centerVertical="true"
         android:background="?android:selectableItemBackground"
         android:padding="@dimen/image_button_padding"
         android:src="?attr/icon_remove"
-        android:visibility="invisible" />
+        android:visibility="gone" />
 
-    <ImageButton
-        android:id="@+id/button_trust"
+
+    <eu.siacs.conversations.ui.widget.Switch
+        android:id="@+id/tgl_trust"
+        android:visibility="invisible"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:background="?android:selectableItemBackground"
-        android:padding="@dimen/image_button_padding"
-        android:src="?attr/icon_done"
-        android:visibility="invisible" />
+        style="@style/MaterialDesignButton"/>
+
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 576330f6a937d2294bb3fd4f197acd0c3340ae8f Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Mon, 20 Jul 2015 14:14:27 +0200
Subject: Use MD style for key trust toggle switch

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

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

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 64f6075c..7cb0bae7 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -59,7 +59,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        style="@style/MaterialDesignButton"/>
+        style="@style/MD"/>
 
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 8559ca05ab67f8f149be4beeb57b2aab86e1aa3c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 20 Jul 2015 15:43:28 +0200
Subject: fixed monospace font and android L

---
 src/main/res/layout/contact_key.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 7cb0bae7..6b86f80a 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -18,7 +18,8 @@
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/tgl_trust"
             android:textSize="?attr/TextSizeBody"
-            android:typeface="monospace" />
+            android:typeface="monospace"
+            android:fontFamily="monospace"/>
 
         <TextView
             android:id="@+id/key_type"
-- 
cgit v1.2.3


From 2b3bb0226121acb173080e4893421eefef4a9571 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Wed, 29 Jul 2015 20:21:37 +0200
Subject: Highlight selected message's fingerprint in list

---
 src/main/res/layout/contact_key.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 6b86f80a..0f61a15f 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -28,6 +28,7 @@
             android:textColor="@color/black54"
             android:layout_alignParentLeft="true"
             android:layout_below="@+id/key"
+            android:maxLines="1"
             android:textSize="?attr/TextSizeInfo"/>
 
         <TextView
-- 
cgit v1.2.3


From a6e00837af31a7671013b5fe007008db55b4c84c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 8 Aug 2015 14:09:02 +0200
Subject: decreased right hand side padding in contact keys

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

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

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 0f61a15f..a4fd29e9 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -8,7 +8,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:padding="8dp" >
+        android:paddingTop="8dp"
+        android:paddingLeft="8dp"
+        android:paddingBottom="8dp">
 
         <TextView
             android:id="@+id/key"
-- 
cgit v1.2.3