From e663dadc32633dc12f846539196276265ccc3534 Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Fri, 18 Apr 2014 12:44:42 -0700
Subject: can search openkeychain, retrieve & install & use keys from there

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

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
new file mode 100644
index 000000000..248581342
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/import_keybase_query"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="top|left"
+            android:hint="@string/hint_keybase_search"
+            android:imeOptions="actionSearch"
+            android:inputType="textNoSuggestions"
+            android:singleLine="true"
+            android:lines="1"
+            android:maxLines="1"
+            android:minLines="1"
+            android:layout_gravity="center_vertical" />
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/import_keybase_search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            bootstrapbutton:bb_icon_left="fa-search"
+            bootstrapbutton:bb_roundedCorners="true"
+            bootstrapbutton:bb_size="default"
+            bootstrapbutton:bb_type="default" />
+    </LinearLayout>
+
+    <!--
+    <com.beardedhen.androidbootstrap.BootstrapButton
+        android:id="@+id/import_keybase_button"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:layout_margin="10dp"
+        android:text="@string/import_keybase_button"
+        bootstrapbutton:bb_size="default"
+        bootstrapbutton:bb_type="default" />
+        -->
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 6055b0b0da6ca3f6fdae3b7b1602a38d3a05bb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 5 May 2014 00:58:22 +0200
Subject: New key view design, using Android flat buttons and Android icons

---
 .../src/main/res/layout/certify_key_activity.xml   |   4 +-
 .../src/main/res/layout/import_keys_list_entry.xml |   2 +-
 OpenKeychain/src/main/res/layout/key_list_item.xml |   2 +-
 .../src/main/res/layout/view_key_activity.xml      |  13 +-
 .../src/main/res/layout/view_key_certs_item.xml    |  10 +-
 .../src/main/res/layout/view_key_keys_fragment.xml | 149 +++++++++++
 .../src/main/res/layout/view_key_main_fragment.xml | 284 +++++----------------
 .../main/res/layout/view_key_share_fragment.xml    | 179 +++++++++++++
 .../src/main/res/layout/view_key_userids_item.xml  |  47 ++--
 9 files changed, 442 insertions(+), 248 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_share_fragment.xml

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 0ae46a261..cba73a3c7 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -93,7 +93,7 @@
                     android:text="@string/label_fingerprint" />
 
                 <TextView
-                    android:id="@+id/fingerprint"
+                    android:id="@+id/view_key_fingerprint"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:typeface="monospace" />
@@ -111,7 +111,7 @@
             android:text="@string/section_uids_to_sign" />
 
         <org.sufficientlysecure.keychain.ui.widget.FixedListView
-            android:id="@+id/user_ids"
+            android:id="@+id/view_key_user_ids"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:descendantFocusability="blocksDescendants" />
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
index ba8ff91ca..f5ec71abe 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
@@ -106,7 +106,7 @@
             android:typeface="monospace" />
 
         <TextView
-            android:id="@+id/fingerprint"
+            android:id="@+id/view_key_fingerprint"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="0000 0000 0000 0000 0000\n0000 0000 0000 0000 0000"
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 4676a624d..db61728c1 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -52,7 +52,7 @@
         android:layout_height="match_parent">
 
         <Button
-            android:background="@drawable/selector_transparent_button"
+            style="@style/SelectableItem"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/edit"
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 58e4919dc..eed71945b 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -2,11 +2,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
+
+    <org.sufficientlysecure.keychain.util.SlidingTabLayout
+        android:id="@+id/view_key_sliding_tab_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
     <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
+        android:id="@+id/view_key_pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="0px"
+        android:layout_weight="1"
+        android:background="@android:color/white" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_item.xml b/OpenKeychain/src/main/res/layout/view_key_certs_item.xml
index de7570818..e84a98cdb 100644
--- a/OpenKeychain/src/main/res/layout/view_key_certs_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_certs_item.xml
@@ -12,22 +12,22 @@
     android:focusable="false">
 
     <TextView
-        android:id="@+id/signerKeyId"
+        android:id="@+id/signerName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="signer key id"
+        android:text="signer name"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true" />
 
     <TextView
-        android:id="@+id/signerUserId"
+        android:id="@+id/signerKeyId"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="&lt;user@example.com>"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_below="@+id/signerKeyId"
+        android:layout_below="@+id/signerName"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true" />
 
@@ -38,7 +38,7 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:text="status"
         android:visibility="visible"
-        android:layout_above="@+id/signerUserId"
+        android:layout_above="@+id/signerKeyId"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_marginRight="10dp" />
diff --git a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
new file mode 100644
index 000000000..88da26a95
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
@@ -0,0 +1,149 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="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:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:id="@+id/container">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_master_key" />
+
+        <TableLayout
+            android:layout_width="wrap_content"
+            android:paddingLeft="8dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:shrinkColumns="1">
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"
+                    android:text="@string/label_key_id" />
+
+                <TextView
+                    android:id="@+id/key_id"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingRight="5dip"
+                    android:text=""
+                    android:typeface="monospace" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/label_algorithm"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"
+                    android:text="@string/label_algorithm" />
+
+                <TextView
+                    android:id="@+id/algorithm"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingRight="5dip"
+                    android:text="" />
+            </TableRow>
+
+            <TableRow
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:id="@+id/tableRow">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"
+                    android:text="@string/label_fingerprint" />
+
+                <TextView
+                    android:id="@+id/view_key_fingerprint"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:typeface="monospace" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"
+                    android:text="@string/label_creation" />
+
+                <TextView
+                    android:id="@+id/creation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"
+                    android:text="@string/label_expiry" />
+
+                <TextView
+                    android:id="@+id/expiry"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"
+                    android:text="@string/label_secret_key" />
+
+                <TextView
+                    android:id="@+id/secret_key"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </TableRow>
+        </TableLayout>
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_keys" />
+
+        <org.sufficientlysecure.keychain.ui.widget.FixedListView
+            android:id="@+id/keys"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index e3448c39f..884eee430 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -17,248 +17,94 @@
 
         <TextView
             style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_master_user_id" />
-
-        <TableLayout
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            android:stretchColumns="1">
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_name" />
-
-                <TextView
-                    android:id="@+id/name"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_email" />
-
-                <TextView
-                    android:id="@+id/email"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_comment" />
-
-                <TextView
-                    android:id="@+id/comment"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="" />
-            </TableRow>
-        </TableLayout>
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
-            android:text="@string/section_master_key" />
+            android:text="@string/section_user_ids"
+            android:layout_weight="1" />
 
-        <TableLayout
-            android:layout_width="wrap_content"
+        <org.sufficientlysecure.keychain.ui.widget.FixedListView
+            android:id="@+id/view_key_user_ids"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            android:shrinkColumns="1">
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_key_id" />
-
-                <TextView
-                    android:id="@+id/key_id"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text=""
-                    android:typeface="monospace" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_algorithm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_algorithm" />
-
-                <TextView
-                    android:id="@+id/algorithm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="" />
-            </TableRow>
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:id="@+id/tableRow">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_fingerprint" />
-
-                <TextView
-                    android:id="@+id/fingerprint"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:typeface="monospace" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_creation" />
-
-                <TextView
-                    android:id="@+id/creation"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_expiry" />
-
-                <TextView
-                    android:id="@+id/expiry"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_secret_key" />
-
-                <TextView
-                    android:id="@+id/secret_key"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-        </TableLayout>
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_user_ids" />
+            android:layout_weight="1" />
 
-        <org.sufficientlysecure.keychain.ui.widget.FixedListView
-            android:id="@+id/user_ids"
+        <View
+            android:id="@+id/view_key_action_certify_divider"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_keys" />
-
-        <org.sufficientlysecure.keychain.ui.widget.FixedListView
-            android:id="@+id/keys"
+        <LinearLayout
+            android:id="@+id/view_key_action_certify"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:minHeight="?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_certify"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_good"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
 
         <TextView
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_marginTop="14dp"
-            android:text="@string/section_actions" />
+            android:text="@string/section_actions"
+            android:layout_weight="1" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
-            android:id="@+id/action_edit"
+        <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="50dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
             android:text="@string/key_view_action_edit"
-            bootstrapbutton:bb_icon_left="fa-key"
-            bootstrapbutton:bb_type="info"
-            android:visibility="gone" />
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_edit"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
-            android:id="@+id/action_encrypt"
+        <View
+            android:id="@+id/view_key_action_edit_divider"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
-            android:text="@string/key_view_action_encrypt"
-            bootstrapbutton:bb_icon_left="fa-lock"
-            bootstrapbutton:bb_type="info" />
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
-            android:id="@+id/action_certify"
+        <TextView
+            android:id="@+id/view_key_action_encrypt"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
-            android:text="@string/key_view_action_certify"
-            bootstrapbutton:bb_icon_left="fa-pencil"
-            bootstrapbutton:bb_type="info" />
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_encrypt"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_secure"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
new file mode 100644
index 000000000..ae6b750b2
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
@@ -0,0 +1,179 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="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:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:id="@+id/container">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            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="wrap_content"
+            android:minHeight="?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="match_parent"
+            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="wrap_content"
+            android:minHeight="?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" />
+
+        </LinearLayout>
+
+        <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="wrap_content"
+            android:minHeight="?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_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>
diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
index e56355ff3..5552757ef 100644
--- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:paddingRight="3dip"
     android:singleLine="true">
@@ -13,23 +14,42 @@
         android:clickable="false"
         android:focusable="false" />
 
-    <TextView
-        android:id="@+id/rank"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="0"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:layout_marginLeft="8dp"
         android:layout_gravity="center_vertical"
-        android:width="30sp" />
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/certified"
+            android:src="@drawable/key_certify_ok_self" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:id="@+id/primary_user_id_icon"
+            android:src="@drawable/ic_action_important_small" />
+    </LinearLayout>
 
     <LinearLayout
         android:orientation="vertical"
+        android:layout_gravity="center_vertical"
         android:layout_width="0dip"
+        android:layout_marginLeft="8dp"
         android:layout_height="wrap_content"
         android:layout_weight="1">
 
+        <TextView
+            android:id="@+id/address"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="alice@example.com"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
         <TextView
             android:id="@+id/userId"
             android:layout_width="wrap_content"
@@ -38,20 +58,13 @@
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
-            android:id="@+id/address"
+            android:id="@+id/comment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="alice@example.com"
+            android:textColor="@color/tertiary_text_light"
+            android:text="comment"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
     </LinearLayout>
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:id="@+id/certified"
-        android:src="@drawable/key_certify_ok_self"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp" />
-
 </LinearLayout>
-- 
cgit v1.2.3


From 0fe08233723e46ec966919cf358a30d6c289375e Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 5 May 2014 22:04:57 +0200
Subject: ui: remove primary subkey info

---
 .../src/main/res/layout/view_key_keys_fragment.xml | 117 ---------------------
 1 file changed, 117 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
index 88da26a95..84386074f 100644
--- a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
@@ -1,5 +1,4 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -15,122 +14,6 @@
         android:paddingRight="16dp"
         android:id="@+id/container">
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_master_key" />
-
-        <TableLayout
-            android:layout_width="wrap_content"
-            android:paddingLeft="8dp"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:shrinkColumns="1">
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_key_id" />
-
-                <TextView
-                    android:id="@+id/key_id"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text=""
-                    android:typeface="monospace" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_algorithm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_algorithm" />
-
-                <TextView
-                    android:id="@+id/algorithm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="" />
-            </TableRow>
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:id="@+id/tableRow">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_fingerprint" />
-
-                <TextView
-                    android:id="@+id/view_key_fingerprint"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:typeface="monospace" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_creation" />
-
-                <TextView
-                    android:id="@+id/creation"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_expiry" />
-
-                <TextView
-                    android:id="@+id/expiry"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_secret_key" />
-
-                <TextView
-                    android:id="@+id/secret_key"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-        </TableLayout>
-
         <TextView
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
-- 
cgit v1.2.3


From 162cb1cb7b6e3908716a6e874b6bcba4b3d825e3 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 5 May 2014 22:06:09 +0200
Subject: ui: subkey view redesign

---
 .../src/main/res/layout/view_key_keys_item.xml     | 142 ++++++++++++---------
 1 file changed, 80 insertions(+), 62 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_keys_item.xml b/OpenKeychain/src/main/res/layout/view_key_keys_item.xml
index 66cd4d7b5..13feaf2cc 100644
--- a/OpenKeychain/src/main/res/layout/view_key_keys_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_keys_item.xml
@@ -1,83 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
-    android:paddingLeft="8dip"
-    android:paddingRight="3dip">
+    android:paddingRight="3dip"
+    android:singleLine="true">
 
     <ImageView
         android:id="@+id/ic_masterKey"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:paddingRight="6dip"
-        android:layout_alignParentLeft="true"
-        android:src="@drawable/key_small" />
-
-    <TextView
-        android:id="@+id/keyId"
-        android:layout_toRightOf="@+id/ic_masterKey"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingRight="2dip"
-        android:text="@string/label_key_id"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:typeface="monospace" />
+        android:src="@drawable/key_small"
+        android:layout_marginLeft="8dp" />
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_alignParentEnd="true"
-        android:paddingBottom="2dip"
-        android:paddingTop="2dip"
-        android:id="@+id/linearLayout">
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp">
 
-        <ImageView
-            android:id="@+id/ic_revokedKey"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:src="@drawable/revoked_key_small" />
+            android:orientation="horizontal"
+            android:paddingBottom="2dip"
+            android:paddingTop="2dip">
 
-        <ImageView
-            android:id="@+id/ic_certifyKey"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/certify_small" />
+            <TextView
+                android:id="@+id/keyId"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@string/label_key_id"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:typeface="monospace"
+                android:layout_weight="1" />
 
-        <ImageView
-            android:id="@+id/ic_encryptKey"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/encrypted_small" />
+            <ImageView
+                android:id="@+id/ic_certifyKey"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/certify_small"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
 
-        <ImageView
-            android:id="@+id/ic_signKey"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/signed_small" />
-    </LinearLayout>
+            <ImageView
+                android:id="@+id/ic_encryptKey"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/encrypted_small"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
 
-    <TextView
-        android:id="@+id/keyDetails"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingRight="5dip"
-        android:text="(RSA, 1024bit)"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_below="@+id/ic_masterKey"
-        android:layout_toRightOf="@+id/ic_masterKey" />
+            <ImageView
+                android:id="@+id/ic_signKey"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/signed_small"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
 
-    <TextView
-        android:id="@+id/keyExpiry"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:text="@string/label_expiry"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_alignTop="@+id/keyDetails"
-        android:layout_alignRight="@+id/linearLayout"
-        android:layout_alignEnd="@+id/linearLayout" />
+            <ImageView
+                android:id="@+id/ic_revokedKey"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/revoked_key_small"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:id="@+id/keyDetails"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:paddingRight="5dip"
+                android:text="RSA, 1024bit"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/keyExpiry"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Expiry: 4/7/2016"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_gravity="right" />
+        </LinearLayout>
+
+    </LinearLayout>
 
-</RelativeLayout>
+</LinearLayout>
-- 
cgit v1.2.3


From d31ae89824b9a86d0e70f384b5fd5ac212a3e6cd Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 6 May 2014 00:04:37 +0200
Subject: ui: show revocation and expiry status on info tab

---
 .../src/main/res/layout/view_key_main_fragment.xml | 53 ++++++++++++++--------
 1 file changed, 34 insertions(+), 19 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index 884eee430..d90c4cd17 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -13,7 +13,30 @@
         android:orientation="vertical"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:id="@+id/container">
+        android:id="@+id/container"
+        android:visibility="visible">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="This key is expired!"
+            android:id="@+id/view_key_expired"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:textColor="@color/alert"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical|center_horizontal"
+            android:visibility="gone" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="This key has been revoked!"
+            android:id="@+id/view_key_revoked"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:textColor="@color/alert"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical|center_horizontal"
+            android:visibility="gone" />
 
         <TextView
             style="@style/SectionHeader"
@@ -37,28 +60,20 @@
             android:layout_height="1dip"
             android:background="?android:attr/listDivider" />
 
-        <LinearLayout
+        <TextView
             android:id="@+id/view_key_action_certify"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:text="@string/key_view_action_certify"
             android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_good"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
             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_certify"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_good"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-        </LinearLayout>
+            style="@style/SelectableItem" />
 
         <TextView
             style="@style/SectionHeader"
-- 
cgit v1.2.3


From 8564c4aca15f3dff339063054e137602dff42567 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 6 May 2014 00:39:09 +0200
Subject: ui: use primary icon color for certification status

---
 OpenKeychain/src/main/res/layout/view_key_userids_item.xml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
index 5552757ef..a6d147cc1 100644
--- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
@@ -27,12 +27,6 @@
             android:id="@+id/certified"
             android:src="@drawable/key_certify_ok_self" />
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:id="@+id/primary_user_id_icon"
-            android:src="@drawable/ic_action_important_small" />
     </LinearLayout>
 
     <LinearLayout
-- 
cgit v1.2.3


From 0d05ff98cb7ef992a040e7040c4fc534307e51e8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 6 May 2014 19:18:32 +0200
Subject: ui: use textviews instead of bootstrap buttons in SignEncrypt

---
 .../src/main/res/layout/encrypt_file_fragment.xml  | 15 +++---
 .../main/res/layout/encrypt_message_fragment.xml   | 61 ++++++++++++----------
 2 files changed, 41 insertions(+), 35 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
index efc4b4641..c7047b822 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
@@ -68,15 +68,18 @@
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true" />
 
-            <com.beardedhen.androidbootstrap.BootstrapButton
+            <TextView
                 android:id="@+id/action_encrypt_file"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/btn_encrypt_file"
-                bootstrapbutton:bb_icon_left="fa-lock"
-                bootstrapbutton:bb_type="info"
+                android:drawableRight="@drawable/ic_action_save"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true" />
diff --git a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
index 1fa338426..24e604398 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true">
@@ -22,41 +21,45 @@
             android:hint="@string/encrypt_content_edit_text_hint"
             android:layout_weight="1" />
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/section_encrypt_and_or_sign" />
-
         <LinearLayout
+            android:id="@+id/action_encrypt_share"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:clickable="true"
+            style="@style/SelectableItem"
             android:orientation="horizontal">
 
-            <com.beardedhen.androidbootstrap.BootstrapButton
-                android:id="@+id/action_encrypt_share"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginRight="4dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:layout_weight="1"
-                android:text="@string/btn_share"
-                bootstrapbutton:bb_icon_left="fa-share-square"
-                bootstrapbutton:bb_type="info" />
-
-            <com.beardedhen.androidbootstrap.BootstrapButton
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:text="@string/btn_share_encrypted_signed"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:layout_weight="1" />
+
+            <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/action_encrypt_clipboard"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:layout_weight="1"
-                android:text="@string/btn_clipboard"
-                bootstrapbutton:bb_icon_left="fa-clipboard"
-                bootstrapbutton:bb_type="info" />
+                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>
+
     </LinearLayout>
 </ScrollView>
-- 
cgit v1.2.3


From e0985878d732674626eee947a8d27c7a9193495c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 6 May 2014 19:18:32 +0200
Subject: ui: use textview buttons in decrypt verify dialogue

---
 .../src/main/res/layout/decrypt_file_fragment.xml  | 15 +++---
 .../main/res/layout/decrypt_message_fragment.xml   | 59 ++++++++++++----------
 .../src/main/res/layout/decrypt_result_include.xml | 42 ++++++++++-----
 3 files changed, 69 insertions(+), 47 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index 597652713..b43991ff1 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -74,15 +74,18 @@
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true" />
 
-                <com.beardedhen.androidbootstrap.BootstrapButton
+                <TextView
                     android:id="@+id/decrypt_file_action_decrypt"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="4dp"
+                    android:layout_height="wrap_content"
+                    android:minHeight="?android:attr/listPreferredItemHeight"
                     android:text="@string/btn_decrypt_verify"
-                    bootstrapbutton:bb_icon_left="fa-unlock"
-                    bootstrapbutton:bb_type="info"
+                    android:drawableRight="@drawable/ic_action_save"
+                    android:drawablePadding="8dp"
+                    android:gravity="center_vertical"
                     android:layout_alignParentBottom="true"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true" />
diff --git a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
index 831d7e888..6c1eb3bdd 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
@@ -37,43 +37,46 @@
                 android:scrollHorizontally="true"
                 android:layout_weight="1" />
 
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/section_decrypt_verify"
-                android:id="@+id/decrypt_message_section" />
-
             <LinearLayout
-                android:id="@+id/decrypt_buttons"
+                android:id="@+id/action_decrypt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:clickable="true"
+                style="@style/SelectableItem"
                 android:orientation="horizontal">
 
-                <com.beardedhen.androidbootstrap.BootstrapButton
-                    android:id="@+id/action_decrypt"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginRight="4dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="4dp"
-                    android:layout_weight="1"
+                <TextView
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minHeight="?android:attr/listPreferredItemHeight"
                     android:text="@string/btn_decrypt_verify"
-                    bootstrapbutton:bb_icon_left="fa-unlock"
-                    bootstrapbutton:bb_type="info" />
+                    android:gravity="center_vertical"
+                    android:layout_weight="1" />
 
-                <com.beardedhen.androidbootstrap.BootstrapButton
+                <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/action_decrypt_from_clipboard"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginLeft="4dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="4dp"
-                    android:layout_weight="1"
-                    android:text="@string/btn_decrypt_verify_clipboard"
-                    bootstrapbutton:bb_icon_left="fa-clipboard"
-                    bootstrapbutton:bb_type="info" />
+                    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>
+
         </LinearLayout>
+
     </LinearLayout>
+
 </ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 70faa1d80..76b20e75f 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -11,20 +11,36 @@
     android:paddingBottom="4dp"
     android:background="@color/result_blue">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"
+        android:layout_marginTop="4dp" />
+
     <TextView
         android:id="@+id/result_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="result text"
-        android:textColor="@color/white" />
+        android:textColor="@color/white"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider" />
 
     <RelativeLayout
         android:id="@+id/result_signature"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clickable="true"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp">
 
         <RelativeLayout
             android:layout_width="wrap_content"
@@ -67,17 +83,17 @@
             android:layout_toRightOf="@+id/result_signature_image"
             android:textColor="@color/white" />
 
-    </RelativeLayout>
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/lookup_key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/btn_lookup_key"
+            bootstrapbutton:bb_icon_left="fa-download"
+            bootstrapbutton:bb_type="info"
+            bootstrapbutton:bb_size="small"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true" />
 
-    <com.beardedhen.androidbootstrap.BootstrapButton
-        android:id="@+id/lookup_key"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
-        android:text="@string/btn_lookup_key"
-        bootstrapbutton:bb_icon_left="fa-download"
-        bootstrapbutton:bb_type="info"
-        bootstrapbutton:bb_size="small" />
+    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 797aeaf6e8c7a8df39ee325c39924cf1f1a96778 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 6 May 2014 19:18:32 +0200
Subject: ui: apply purple theme (twi is best color)

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

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 76b20e75f..3bc78d325 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -9,7 +9,7 @@
     android:paddingRight="16dp"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
-    android:background="@color/result_blue">
+    android:background="@color/result_purple">
 
     <View
         android:layout_width="match_parent"
-- 
cgit v1.2.3


From 274326f78065cf9f713504e6dbe213248b02ed5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 6 May 2014 22:48:47 +0200
Subject: Always use section style instead of custom class

---
 OpenKeychain/src/main/res/layout/key_list_header.xml       | 7 ++-----
 OpenKeychain/src/main/res/layout/view_key_certs_header.xml | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/key_list_header.xml b/OpenKeychain/src/main/res/layout/key_list_header.xml
index de7bdbd5c..8cb0d4262 100644
--- a/OpenKeychain/src/main/res/layout/key_list_header.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_header.xml
@@ -3,15 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content" >
 
-    <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView
+    <TextView
+        style="@style/SectionHeader"
         android:id="@+id/stickylist_header_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="start|left"
-        android:padding="8dp"
-        android:textColor="@color/emphasis"
-        android:textSize="17sp"
-        android:textStyle="bold"
         android:text="header text" />
 
     <TextView
diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_header.xml b/OpenKeychain/src/main/res/layout/view_key_certs_header.xml
index 037203dbd..f99c012c9 100644
--- a/OpenKeychain/src/main/res/layout/view_key_certs_header.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_certs_header.xml
@@ -3,15 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content" >
 
-    <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView
+    <TextView
+        style="@style/SectionHeader"
         android:id="@+id/stickylist_header_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="start|left"
-        android:padding="8dp"
-        android:textColor="@color/emphasis"
-        android:textSize="14sp"
-        android:textStyle="bold"
         android:text="header text" />
 
     <TextView
-- 
cgit v1.2.3


From 1c2919f07fb9739bbc57ce27bb5b4a6ca2d6be20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 6 May 2014 22:52:50 +0200
Subject: edit button with image

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

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index db61728c1..85d9afdd3 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -51,15 +51,16 @@
         android:layout_width="80dp"
         android:layout_height="match_parent">
 
-        <Button
+        <ImageButton
+            android:id="@+id/edit"
             style="@style/SelectableItem"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:id="@+id/edit"
             android:focusable="false"
             android:enabled="true"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/black"
+            android:src="@drawable/ic_action_edit"
             android:text="@string/edit" />
 
         <TextView
-- 
cgit v1.2.3


From 8eb74d171b31d8400ec826668cffccc0c073baaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 6 May 2014 23:11:10 +0200
Subject: Some small style fixes

---
 .../src/main/res/layout/decrypt_file_fragment.xml   | 21 ++++++++++-----------
 .../main/res/layout/decrypt_message_fragment.xml    | 10 ++++++++--
 .../src/main/res/layout/encrypt_file_fragment.xml   | 21 ++++++++++-----------
 .../main/res/layout/encrypt_message_fragment.xml    | 10 ++++++++--
 .../src/main/res/layout/view_key_keys_fragment.xml  |  5 +++--
 .../src/main/res/layout/view_key_main_fragment.xml  |  3 ++-
 .../src/main/res/layout/view_key_share_fragment.xml |  5 +++--
 7 files changed, 44 insertions(+), 31 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index b43991ff1..b5fd1fcc0 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -64,16 +64,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <TextView
-                    style="@style/SectionHeader"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="@string/section_decrypt_verify"
-                    android:layout_above="@+id/decrypt_file_action_decrypt"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true" />
-
                 <TextView
                     android:id="@+id/decrypt_file_action_decrypt"
                     android:paddingLeft="8dp"
@@ -83,12 +73,21 @@
                     android:layout_height="wrap_content"
                     android:minHeight="?android:attr/listPreferredItemHeight"
                     android:text="@string/btn_decrypt_verify"
+                    android:clickable="true"
+                    style="@style/SelectableItem"
                     android:drawableRight="@drawable/ic_action_save"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:layout_alignParentBottom="true"
                     android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true" />
+                    android:layout_alignParentStart="true"
+                    android:layout_marginBottom="8dp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider"
+                    android:layout_above="@+id/decrypt_file_action_decrypt" />
 
             </RelativeLayout>
         </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
index 6c1eb3bdd..e54edd0d1 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
@@ -37,19 +37,25 @@
                 android:scrollHorizontally="true"
                 android:layout_weight="1" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
             <LinearLayout
                 android:id="@+id/action_decrypt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:clickable="true"
                 style="@style/SelectableItem"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:layout_marginBottom="8dp">
 
                 <TextView
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:minHeight="?android:attr/listPreferredItemHeight"
                     android:text="@string/btn_decrypt_verify"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
index c7047b822..c8aaf77b8 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
@@ -58,16 +58,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:text="@string/section_encrypt_and_or_sign"
-                android:layout_above="@+id/action_encrypt_file"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true" />
-
             <TextView
                 android:id="@+id/action_encrypt_file"
                 android:paddingLeft="8dp"
@@ -77,12 +67,21 @@
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/btn_encrypt_file"
+                android:clickable="true"
+                style="@style/SelectableItem"
                 android:drawableRight="@drawable/ic_action_save"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true" />
+                android:layout_alignParentStart="true"
+                android:layout_marginBottom="8dp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+                android:layout_above="@+id/action_encrypt_file" />
 
         </RelativeLayout>
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
index 24e604398..fab983fa5 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml
@@ -21,19 +21,25 @@
             android:hint="@string/encrypt_content_edit_text_hint"
             android:layout_weight="1" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
         <LinearLayout
             android:id="@+id/action_encrypt_share"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:clickable="true"
             style="@style/SelectableItem"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:layout_marginBottom="8dp">
 
             <TextView
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/btn_share_encrypted_signed"
diff --git a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
index 84386074f..1b15c7363 100644
--- a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
@@ -19,13 +19,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
+            android:layout_marginTop="8dp"
             android:text="@string/section_keys" />
 
         <org.sufficientlysecure.keychain.ui.widget.FixedListView
             android:id="@+id/keys"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index d90c4cd17..7d0f714a0 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -43,7 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
+            android:layout_marginTop="8dp"
             android:text="@string/section_user_ids"
             android:layout_weight="1" />
 
@@ -109,6 +109,7 @@
             android:id="@+id/view_key_action_encrypt"
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
+            android:layout_marginBottom="8dp"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
index ae6b750b2..48730587d 100644
--- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
@@ -19,7 +19,7 @@
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_marginTop="14dp"
+            android:layout_marginTop="8dp"
             android:text="@string/section_fingerprint"
             android:layout_weight="1" />
 
@@ -141,7 +141,8 @@
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:clickable="true"
             style="@style/SelectableItem"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:layout_marginBottom="8dp">
 
             <TextView
                 android:paddingLeft="8dp"
-- 
cgit v1.2.3


From e97cdbd9ad06b66c67f7778eafce1970590aa654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 6 May 2014 23:16:08 +0200
Subject: Clarify language

---
 OpenKeychain/src/main/res/layout/certify_key_activity.xml | 2 +-
 OpenKeychain/src/main/res/layout/view_cert_activity.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index cba73a3c7..76f1e8a96 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -108,7 +108,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
-            android:text="@string/section_uids_to_sign" />
+            android:text="@string/section_uids_to_certify" />
 
         <org.sufficientlysecure.keychain.ui.widget.FixedListView
             android:id="@+id/view_key_user_ids"
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 76bf91757..264b84239 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -159,7 +159,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
-            android:text="@string/section_signer_id" />
+            android:text="@string/section_certifier_id" />
 
         <TableLayout
             android:layout_width="wrap_content"
-- 
cgit v1.2.3


From 6aafb314125f016e2215f7d33baf600b5768d72c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 7 May 2014 02:14:47 +0200
Subject: ui: move revocation/expiry notes above tab slider

---
 .../src/main/res/layout/view_key_activity.xml      | 29 ++++++++++++++++++++++
 .../src/main/res/layout/view_key_main_fragment.xml | 22 ----------------
 2 files changed, 29 insertions(+), 22 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index eed71945b..aa6089aa2 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -4,6 +4,35 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="This key is expired!"
+        android:id="@+id/view_key_expired"
+        android:textColor="@color/alert"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:gravity="center_vertical|center_horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:visibility="gone" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="This key has been revoked!"
+        android:id="@+id/view_key_revoked"
+        android:textColor="@color/alert"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:gravity="center_vertical|center_horizontal"
+        android:visibility="gone"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider" />
+
     <org.sufficientlysecure.keychain.util.SlidingTabLayout
         android:id="@+id/view_key_sliding_tab_layout"
         android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index 7d0f714a0..1cd0f0214 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -16,28 +16,6 @@
         android:id="@+id/container"
         android:visibility="visible">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="This key is expired!"
-            android:id="@+id/view_key_expired"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:textColor="@color/alert"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:gravity="center_vertical|center_horizontal"
-            android:visibility="gone" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="This key has been revoked!"
-            android:id="@+id/view_key_revoked"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:textColor="@color/alert"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:gravity="center_vertical|center_horizontal"
-            android:visibility="gone" />
-
         <TextView
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
-- 
cgit v1.2.3


From 0bb11be749cd2af71fc905d930ac1d9e3b9b22be Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 7 May 2014 02:15:09 +0200
Subject: ui: slight edit icon cosmetics in keylist

---
 OpenKeychain/src/main/res/layout/key_list_item.xml     | 11 ++++++-----
 OpenKeychain/src/main/res/layout/view_key_activity.xml |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 85d9afdd3..73a20bd2e 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -48,7 +48,7 @@
 
     <FrameLayout
         android:id="@+id/status_layout"
-        android:layout_width="80dp"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent">
 
         <ImageButton
@@ -61,19 +61,20 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/black"
             android:src="@drawable/ic_action_edit"
-            android:text="@string/edit" />
+            android:text="@string/edit"
+            android:padding="12dp" />
 
         <TextView
             android:id="@+id/revoked"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="8dp"
             android:singleLine="true"
             android:ellipsize="end"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:text="@string/revoked"
             android:textColor="#e00"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:padding="12dp" />
 
         <ImageView
             android:layout_width="wrap_content"
@@ -81,7 +82,7 @@
             android:id="@+id/verified"
             android:layout_gravity="center"
             android:src="@drawable/key_certify_ok_depth0"
-            android:paddingLeft="25dp" />
+            android:padding="16dp" />
     </FrameLayout>
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index aa6089aa2..f43aade25 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -31,7 +31,9 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
+        android:background="?android:attr/listDivider"
+        android:visibility="gone"
+        android:id="@+id/status_divider" />
 
     <org.sufficientlysecure.keychain.util.SlidingTabLayout
         android:id="@+id/view_key_sliding_tab_layout"
-- 
cgit v1.2.3


From 40793935ac3fdbb353fc1a084ac14fe46dc1fa30 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 7 May 2014 03:19:09 +0200
Subject: ui: primary certification icon was a pixel or two off

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

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
index a6d147cc1..2f4041f8c 100644
--- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
@@ -15,7 +15,7 @@
         android:focusable="false" />
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="22dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_gravity="center_vertical"
@@ -25,7 +25,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/certified"
-            android:src="@drawable/key_certify_ok_self" />
+            android:src="@drawable/key_certify_ok_self"
+            android:layout_gravity="center_horizontal" />
 
     </LinearLayout>
 
-- 
cgit v1.2.3


From 12f1162a1ee6ac407080db3b9de2c8bf7fd83314 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 7 May 2014 03:48:03 +0200
Subject: ui: use SlidingTabLayout in help activity

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

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index 58e4919dc..76ba183b7 100644
--- a/OpenKeychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
@@ -4,6 +4,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
+    <org.sufficientlysecure.keychain.util.SlidingTabLayout
+        android:id="@+id/sliding_tab_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
-- 
cgit v1.2.3


From 0155335a595cc7fb02bd7c7e88bb4185a8f703de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 7 May 2014 09:29:02 +0200
Subject: Clarify language

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

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 76f1e8a96..0f8588737 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
-            android:text="KEY TO SIGN" />
+            android:text="@string/section_key_to_certify" />
 
         <TableLayout
             android:layout_width="wrap_content"
-- 
cgit v1.2.3


From fb0f3c4778660c3ad9353b80173d2ef2d3684219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 7 May 2014 10:59:16 +0200
Subject: Use paste icon, clarify language once again

---
 OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml    | 2 +-
 OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index b5fd1fcc0..d1db1c782 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -72,7 +72,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:text="@string/btn_decrypt_verify"
+                    android:text="@string/btn_decrypt_verify_file"
                     android:clickable="true"
                     style="@style/SelectableItem"
                     android:drawableRight="@drawable/ic_action_save"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
index e54edd0d1..0db581910 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
@@ -58,7 +58,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:text="@string/btn_decrypt_verify"
+                    android:text="@string/btn_decrypt_verify_message"
                     android:gravity="center_vertical"
                     android:layout_weight="1" />
 
@@ -75,7 +75,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:padding="8dp"
-                    android:src="@drawable/ic_action_copy"
+                    android:src="@drawable/ic_action_paste"
                     android:layout_gravity="center_vertical"
                     style="@style/SelectableItem" />
 
-- 
cgit v1.2.3


From 7c2dc276c1bf01437db977026334ed17d2c1e65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 7 May 2014 13:48:19 +0200
Subject: Alignment in certify activity

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

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 0f8588737..6fd047187 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -41,6 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_weight="1"
+            android:layout_marginLeft="8dp"
             android:shrinkColumns="1">
 
             <TableRow
-- 
cgit v1.2.3


From f4cbd8cabbe9dcd01e430a4f9953f061092cdfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 7 May 2014 14:17:18 +0200
Subject: Design fixes for certification activity

---
 .../src/main/res/layout/view_cert_activity.xml     | 29 ++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 264b84239..12357fa0c 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -44,6 +44,7 @@
         <TableLayout
             android:layout_width="wrap_content"
             android:layout_height="0dp"
+            android:layout_marginLeft="8dp"
             android:layout_weight="1"
             android:stretchColumns="1">
 
@@ -164,6 +165,8 @@
         <TableLayout
             android:layout_width="wrap_content"
             android:layout_height="0dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginBottom="4dp"
             android:layout_weight="1"
             android:stretchColumns="1">
 
@@ -192,17 +195,39 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:paddingRight="10dip"
-                    android:text="@string/label_email" />
+                    android:text="@string/label_user_id" />
 
                 <TextView
                     android:id="@+id/signer_uid"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingRight="5dip"/>
+                    android:paddingRight="5dip" />
             </TableRow>
 
         </TableLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_cert_view_cert_key"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="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/btn_view_cert_key"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_person"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
     </LinearLayout>
 
 </ScrollView>
-- 
cgit v1.2.3


From e14ce09186cde662ec24312a1722692cac25d5c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 7 May 2014 14:33:20 +0200
Subject: Better handling of actionbars back

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

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 12357fa0c..66c635599 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -42,7 +42,7 @@
             android:text="@string/section_cert" />
 
         <TableLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginLeft="8dp"
             android:layout_weight="1"
@@ -163,7 +163,7 @@
             android:text="@string/section_certifier_id" />
 
         <TableLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginLeft="8dp"
             android:layout_marginBottom="4dp"
@@ -193,7 +193,7 @@
                     android:id="@+id/label_algorithm"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="top"
                     android:paddingRight="10dip"
                     android:text="@string/label_user_id" />
 
-- 
cgit v1.2.3


From 596478a21297888c561276b081eb70fbd29e66ab Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 8 May 2014 13:39:59 +0200
Subject: extract generic LoaderFragment superclass from KeyList

---
 .../src/main/res/layout/key_list_fragment.xml      | 137 ++++++++-------------
 OpenKeychain/src/main/res/layout/loader_layout.xml |  39 ++++++
 2 files changed, 93 insertions(+), 83 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/loader_layout.xml

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 951f8d729..c02854668 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -6,103 +6,74 @@
     android:orientation="vertical">
 
     <!--rebuild functionality of ListFragment -->
+
+    <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+        android:id="@+id/key_list_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:drawSelectorOnTop="true"
+        android:fastScrollEnabled="true"
+        android:paddingBottom="16dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="32dp"
+        android:scrollbarStyle="outsideOverlay" />
+
     <LinearLayout
-        android:id="@+id/key_list_progress_container"
-        android:orientation="vertical"
+        android:id="@+id/key_list_empty"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="visible"
-        android:gravity="center">
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="visible">
 
-        <ProgressBar
-            style="?android:attr/progressBarStyleLarge"
+        <TextView
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/key_list_empty_text1"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:gravity="center"
             android:text=""
-            android:paddingTop="4dip"
-            android:singleLine="true" />
-
-    </LinearLayout>
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <FrameLayout
-        android:id="@+id/key_list_list_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-            android:id="@+id/key_list_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:drawSelectorOnTop="true"
-            android:fastScrollEnabled="true"
-            android:paddingBottom="16dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="32dp"
-            android:scrollbarStyle="outsideOverlay" />
-
-        <LinearLayout
-            android:id="@+id/key_list_empty"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
             android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="@string/key_list_empty_text1"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:text="@string/key_list_empty_text2"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:gravity="center"
-                android:text="@string/key_list_empty_text2"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <com.beardedhen.androidbootstrap.BootstrapButton
-                android:id="@+id/key_list_empty_button_create"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:text="@string/key_list_empty_button_create"
-                bootstrapbutton:bb_icon_left="fa-plus"
-                bootstrapbutton:bb_type="default" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:gravity="center"
-                android:text="@string/key_list_empty_text3"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/key_list_empty_button_create"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:text="@string/key_list_empty_button_create"
+            bootstrapbutton:bb_icon_left="fa-plus"
+            bootstrapbutton:bb_type="default" />
 
-            <com.beardedhen.androidbootstrap.BootstrapButton
-                android:id="@+id/key_list_empty_button_import"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:text="@string/key_list_empty_button_import"
-                bootstrapbutton:bb_icon_left="fa-download"
-                bootstrapbutton:bb_type="default" />
-        </LinearLayout>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:gravity="center"
+            android:text="@string/key_list_empty_text3"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
-    </FrameLayout>
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/key_list_empty_button_import"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:text="@string/key_list_empty_button_import"
+            bootstrapbutton:bb_icon_left="fa-download"
+            bootstrapbutton:bb_type="default" />
+    </LinearLayout>
 
 </FrameLayout>
diff --git a/OpenKeychain/src/main/res/layout/loader_layout.xml b/OpenKeychain/src/main/res/layout/loader_layout.xml
new file mode 100644
index 000000000..50252d27c
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/loader_layout.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <!--rebuild functionality of ListFragment -->
+    <LinearLayout
+        android:id="@+id/loader_progress"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center">
+
+        <ProgressBar
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text=""
+            android:paddingTop="4dip"
+            android:singleLine="true" />
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/loader_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+    </FrameLayout>
+
+</FrameLayout>
-- 
cgit v1.2.3


From 185c4eed4349d7539c2ddcbe696a8c80b523d214 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 8 May 2014 13:57:46 +0200
Subject: use LoaderFragment in ViewKey tabs

Closes #616
---
 OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml  | 3 +--
 OpenKeychain/src/main/res/layout/view_key_main_fragment.xml  | 5 +----
 OpenKeychain/src/main/res/layout/view_key_share_fragment.xml | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
index 1b15c7363..caea22341 100644
--- a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml
@@ -11,8 +11,7 @@
         android:descendantFocusability="beforeDescendants"
         android:orientation="vertical"
         android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:id="@+id/container">
+        android:paddingRight="16dp">
 
         <TextView
             style="@style/SectionHeader"
diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index 1cd0f0214..d93420a99 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -1,5 +1,4 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -12,9 +11,7 @@
         android:descendantFocusability="beforeDescendants"
         android:orientation="vertical"
         android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:id="@+id/container"
-        android:visibility="visible">
+        android:paddingRight="16dp">
 
         <TextView
             style="@style/SectionHeader"
diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
index 48730587d..67c2e241a 100644
--- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
@@ -1,5 +1,4 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -12,8 +11,7 @@
         android:descendantFocusability="beforeDescendants"
         android:orientation="vertical"
         android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:id="@+id/container">
+        android:paddingRight="16dp">
 
         <TextView
             style="@style/SectionHeader"
-- 
cgit v1.2.3


From 33cad382f96b673587e841932ea322a1dd6fa23b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 8 May 2014 15:46:57 +0200
Subject: Use flat buttons where appropriate

---
 .../src/main/res/layout/certify_key_activity.xml   | 31 ++++++++----
 .../src/main/res/layout/edit_key_activity.xml      |  2 +-
 .../src/main/res/layout/import_keys_activity.xml   | 23 ++++++---
 .../src/main/res/layout/key_server_export.xml      | 40 ----------------
 .../src/main/res/layout/upload_key_activity.xml    | 55 ++++++++++++++++++++++
 5 files changed, 96 insertions(+), 55 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/key_server_export.xml
 create mode 100644 OpenKeychain/src/main/res/layout/upload_key_activity.xml

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 6fd047187..bb43fa805 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -135,22 +135,37 @@
             android:text="@string/label_send_key" />
 
         <Spinner
-            android:id="@+id/sign_key_keyserver"
+            android:id="@+id/upload_key_keyserver"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="4dp"
             android:enabled="false" />
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <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" />
+
+        <TextView
             android:id="@+id/sign_key_sign_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/btn_certify"
-            bootstrapbutton:bb_icon_left="fa-pencil"
-            bootstrapbutton:bb_type="info" />
+            android:layout_height="match_parent"
+            android:text="@string/key_view_action_certify"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_good"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem" />
+
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index fc4422cf0..1ce5c096f 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
@@ -33,7 +33,7 @@
             android:padding="4dp"
             android:text="@string/btn_set_passphrase"
             bootstrapbutton:bb_icon_left="fa-pencil"
-            bootstrapbutton:bb_type="info" />
+            bootstrapbutton:bb_type="default" />
 
         <LinearLayout
             android:id="@+id/edit_key_container"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index eb1333704..876374700 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -25,15 +25,26 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp">
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
             android:id="@+id/import_import"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
+            android:layout_height="match_parent"
             android:text="@string/import_import"
-            bootstrapbutton:bb_icon_left="fa-download"
-            bootstrapbutton:bb_type="info" />
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_download"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/key_server_export.xml b/OpenKeychain/src/main/res/layout/key_server_export.xml
deleted file mode 100644
index 6031bf7c7..000000000
--- a/OpenKeychain/src/main/res/layout/key_server_export.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
-    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
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_key_server" />
-        
-        <Spinner
-            android:id="@+id/sign_key_keyserver"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp" />
-
-        <com.beardedhen.androidbootstrap.BootstrapButton
-            android:id="@+id/btn_export_to_server"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/btn_export_to_server"
-            bootstrapbutton:bb_icon_left="fa-upload"
-            bootstrapbutton:bb_type="info" />
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
new file mode 100644
index 000000000..5a6f732d5
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    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
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_key_server" />
+
+        <Spinner
+            android:id="@+id/upload_key_keyserver"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp" />
+
+        <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" />
+
+        <TextView
+            android:id="@+id/upload_key_action_upload"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/btn_export_to_server"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_upload"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3