From a17481b80a2d717afdfc981c5c7e7528d1a7abca Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Thu, 20 Mar 2014 18:33:19 +0100
Subject: Group fingerprint again to make it visually consistent

---
 .../main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java  | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenPGP-Keychain/src/main')

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
index 35412d4b8..ec0932773 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
@@ -511,6 +511,11 @@ public class PgpKeyHelper {
 
 
     public static SpannableStringBuilder colorizeFingerprint(String fingerprint) {
+        // add line breaks to have a consistent "image" that can be recognized
+        char[] chars = fingerprint.toCharArray();
+        chars[24] = '\n';
+        fingerprint = String.valueOf(chars);
+
         SpannableStringBuilder sb = new SpannableStringBuilder(fingerprint);
         try {
             // for each 4 characters of the fingerprint + 1 space
-- 
cgit v1.2.3


From 602fb654af521c7a892ea0c8557a74d8e9cffeda Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Thu, 20 Mar 2014 18:33:46 +0100
Subject: Move fingerprint to the right in key list entry

Fits much better there and doesn't separate the user ID.
---
 .../src/main/res/layout/import_keys_list_entry.xml       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'OpenPGP-Keychain/src/main')

diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml
index fb092793b..724f538dd 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml
@@ -51,13 +51,6 @@
                 android:text="@string/label_main_user_id"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
-            <TextView
-                android:id="@+id/fingerprint"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="fingerprint"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
             <TextView
                 android:id="@+id/mainUserIdRest"
                 android:layout_width="wrap_content"
@@ -89,6 +82,13 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
+            <TextView
+                android:id="@+id/fingerprint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="fingerprint"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
             <TextView
                 android:id="@+id/status"
                 android:layout_width="wrap_content"
@@ -106,4 +106,4 @@
         android:orientation="vertical" >
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
-- 
cgit v1.2.3


From f5ecd2ae466837f24f4a9614240fd9eb4a6fb536 Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Thu, 20 Mar 2014 18:34:40 +0100
Subject: Move fingerprint up below the algorithm in key view

This makes it consistent with the key list entry layout and it also
makes more sense, as it belongs to key identification.
---
 .../src/main/res/layout/view_key_main_fragment.xml | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'OpenPGP-Keychain/src/main')

diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
index 6ef3f3072..adbdb98dd 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
@@ -130,19 +130,23 @@
                     android:text="" />
             </TableRow>
 
-            <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_creation" />
+                    android:text="@string/label_fingerprint" />
 
                 <TextView
-                    android:id="@+id/creation"
+                    android:id="@+id/fingerprint"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:typeface="monospace" />
             </TableRow>
 
             <TableRow>
@@ -152,31 +156,27 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:paddingRight="10dip"
-                    android:text="@string/label_expiry" />
+                    android:text="@string/label_creation" />
 
                 <TextView
-                    android:id="@+id/expiry"
+                    android:id="@+id/creation"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </TableRow>
 
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:id="@+id/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_fingerprint" />
+                    android:text="@string/label_expiry" />
 
                 <TextView
-                    android:id="@+id/fingerprint"
+                    android:id="@+id/expiry"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:typeface="monospace" />
+                    android:layout_height="wrap_content" />
             </TableRow>
 
             <TableRow>
@@ -264,4 +264,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
-- 
cgit v1.2.3