From 17a6003eddff3fd52b4b2ac5ee553e3f70315d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 24 Feb 2015 11:25:19 +0100
Subject: Remove tabs in view key

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

(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
new file mode 100644
index 000000000..fadad0e56
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -0,0 +1,360 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:descendantFocusability="beforeDescendants"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/section_user_ids"
+            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="0dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_actions"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_certify"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_action_certify_text"
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_certify"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/view_key_action_certify_image"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/status_signature_verified_cutout"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/view_key_action_certify_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_edit"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_edit"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_edit"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
+            android:id="@+id/view_key_action_edit_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+
+        <LinearLayout
+            android:id="@+id/view_key_action_encrypt_text"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_action_encrypt_text_text"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_encrypt"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_secure"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:id="@+id/view_key_action_encrypt_files"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_encrypt_files"
+                android:drawableRight="@drawable/ic_action_secure"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_update"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_update"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_download"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/section_fingerprint"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_fingerprint_share"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_fingerprint"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text=""
+                android:layout_weight="1"
+                android:typeface="monospace"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_fingerprint_clipboard"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_copy"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <ImageView
+            android:id="@+id/view_key_fingerprint_qr_code_image"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            style="@style/SelectableItem" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_share_key"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_key_share"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_share_with"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_key_clipboard"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_copy"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_key_safeslinger"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_safeslinger"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_upload"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_upload"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_upload"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_nfc_help"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal"
+            android:layout_marginBottom="8dp">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_share_nfc"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_help"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_nfc_prefs"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_settings"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</ScrollView>
-- 
cgit v1.2.3


From 430ba2f7778e70c6c8a8c46e51de46543e074f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 11:29:46 +0100
Subject: Bigger status icon in key view

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

(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 fadad0e56..790d4143e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout"
+                android:src="@drawable/status_signature_verified_cutout_24px"
                 android:layout_gravity="center_vertical" />
 
         </LinearLayout>
-- 
cgit v1.2.3


From fa92ceeae3ba89d11cce1282e7c2f824969acf80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 13:49:21 +0100
Subject: Toolbar: qr code in header, cleanup of fragment

---
 .../src/main/res/layout/view_key_fragment.xml      | 368 ++-------------------
 1 file changed, 26 insertions(+), 342 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 790d4143e..d37a41236 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -1,358 +1,42 @@
 <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">
 
-    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:descendantFocusability="beforeDescendants"
         android:orientation="vertical"
+        android:paddingTop="16dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp">
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            android:text="@string/section_user_ids"
-            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="0dp"
-            android:layout_marginBottom="4dp"
-            android:layout_weight="1" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_actions"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_certify"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_action_certify_text"
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_certify"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
-
-            <ImageView
-                android:id="@+id/view_key_action_certify_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout_24px"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <View
-            android:id="@+id/view_key_action_certify_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_edit"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_edit"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_edit"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:id="@+id/view_key_action_edit_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-
-        <LinearLayout
-            android:id="@+id/view_key_action_encrypt_text"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_text_text"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_files"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt_files"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_update"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_update"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_download"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            android:text="@string/section_fingerprint"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_fingerprint_share"
+        <android.support.v7.widget.CardView
+            android:id="@+id/card_view"
+            android:layout_gravity="center"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_fingerprint"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text=""
-                android:layout_weight="1"
-                android:typeface="monospace"
-                android:drawableRight="@drawable/ic_action_share"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_fingerprint_clipboard"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <ImageView
-            android:id="@+id/view_key_fingerprint_qr_code_image"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:layout_width="200dp"
             android:layout_height="200dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            style="@style/SelectableItem" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_share_key"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_key_share"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_share_with"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_key_clipboard"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_key_safeslinger"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_safeslinger"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_upload"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_upload"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_upload"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_nfc_help"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal"
-            android:layout_marginBottom="8dp">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_share_nfc"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_help"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_nfc_prefs"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_settings"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
+            card_view:cardCornerRadius="4dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/SectionHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    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" />
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
 
 
     </LinearLayout>
-- 
cgit v1.2.3


From 27263edda5ffba4241e54e2f64f35eb1058663e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 18:37:31 +0100
Subject: CardView and more header design

---
 OpenKeychain/src/main/res/layout/view_key_fragment.xml | 9 ++++++---
 1 file changed, 6 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 d37a41236..8e1bad3a8 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -8,6 +8,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingTop="16dp"
+        android:paddingBottom="16dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp">
 
@@ -15,7 +16,10 @@
             android:id="@+id/card_view"
             android:layout_gravity="center"
             android:layout_width="match_parent"
-            android:layout_height="200dp"
+            android:layout_height="wrap_content"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardElevation="2sp"
+            card_view:cardUseCompatPadding="true"
             card_view:cardCornerRadius="4dp">
 
             <LinearLayout
@@ -24,10 +28,9 @@
                 android:orientation="vertical">
 
                 <TextView
-                    style="@style/SectionHeader"
+                    style="@style/CardViewHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
                     android:text="@string/section_user_ids" />
 
                 <org.sufficientlysecure.keychain.ui.widget.FixedListView
-- 
cgit v1.2.3


From 54e04f496ea27800ad5fa03023d102f08b33ee67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 22:26:11 +0100
Subject: Better qr code resizing

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

(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 8e1bad3a8..bba412f99 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             card_view:cardBackgroundColor="@android:color/white"
-            card_view:cardElevation="2sp"
+            card_view:cardElevation="2dp"
             card_view:cardUseCompatPadding="true"
             card_view:cardCornerRadius="4dp">
 
-- 
cgit v1.2.3