From bc43797c32542aa48a34f44d486645d24fca06ba Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 9 Mar 2015 00:37:14 +0530
Subject: added card

---
 .../src/main/res/layout/view_key_fragment.xml      | 38 +++++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index bba412f99..7f3ef0f1e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -1,7 +1,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+            xmlns:card_view="http://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -31,16 +31,44 @@
                     style="@style/CardViewHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/section_user_ids" />
+                    android:text="@string/section_user_ids"/>
 
                 <org.sufficientlysecure.keychain.ui.widget.FixedListView
                     android:id="@+id/view_key_user_ids"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp" />
+                    android:layout_marginBottom="4dp"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
+        <android.support.v7.widget.CardView
+            android:id="@+id/linked_system_contact_card"
+            android:layout_gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardElevation="2dp"
+            card_view:cardUseCompatPadding="true"
+            card_view:cardCornerRadius="4dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/CardViewHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/section_linked_system_contact"/>
+
+                <org.sufficientlysecure.keychain.ui.widget.FixedListView
+                    android:id="@+id/view_key_linked_system_contact"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
 
     </LinearLayout>
 
-- 
cgit v1.2.3


From f8a6f814dd4f4e015707085c297b91abf237ed14 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Tue, 10 Mar 2015 01:05:40 +0530
Subject: added contact linking

---
 .../src/main/res/layout/view_key_fragment.xml      | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 7f3ef0f1e..d8584bca6 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -62,11 +62,28 @@
                     android:layout_height="wrap_content"
                     android:text="@string/section_linked_system_contact"/>
 
-                <org.sufficientlysecure.keychain.ui.widget.FixedListView
-                    android:id="@+id/view_key_linked_system_contact"
+                <LinearLayout
+                    android:id='@+id/system_contact_layout'
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"/>
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/system_contact_picture"
+                        android:layout_margin="6dp"
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:scaleType="centerCrop"
+                        android:src="@color/bg_gray"/>
+
+                    <TextView
+                        android:id="@+id/system_contact_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="@string/view_key_fragment_no_system_contact"/>
+                </LinearLayout>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
-- 
cgit v1.2.3


From 5f0a468d9a3645c8c209d00d74b13709de154f5b Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Tue, 10 Mar 2015 02:48:04 +0530
Subject: changed default drawable for linked system contact

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

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index d8584bca6..59939d8fa 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -71,10 +71,10 @@
                     <ImageView
                         android:id="@+id/system_contact_picture"
                         android:layout_margin="6dp"
-                        android:layout_width="60dp"
-                        android:layout_height="60dp"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
                         android:scaleType="centerCrop"
-                        android:src="@color/bg_gray"/>
+                        android:src="@drawable/ic_person_grey_48dp"/>
 
                     <TextView
                         android:id="@+id/system_contact_name"
-- 
cgit v1.2.3


From b3257e0ffa53f93d550d71c1a5ffcecb4f4df0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 10 Mar 2015 02:13:36 +0100
Subject: Ripple

---
 OpenKeychain/src/main/res/layout/view_key_fragment.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 59939d8fa..454d5f9c7 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -64,6 +64,8 @@
 
                 <LinearLayout
                     android:id='@+id/system_contact_layout'
+                    android:clickable="true"
+                    android:background="?android:selectableItemBackground"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
-- 
cgit v1.2.3