From 9a4b48d1ec964bdce2a3c5f8242a01c0fa4a70e0 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Fri, 3 Oct 2014 15:55:06 +0200
Subject: let's own otr-fingerprint copy to clipboard.

---
 res/layout/activity_edit_account.xml | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

(limited to 'res/layout/activity_edit_account.xml')

diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml
index 04f63795..0f4bae97 100644
--- a/res/layout/activity_edit_account.xml
+++ b/res/layout/activity_edit_account.xml
@@ -180,13 +180,35 @@
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold" />
 
-                <TextView
-                    android:id="@+id/otr_fingerprint"
+                <RelativeLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:textSize="?attr/TextSizeBody"
-                    android:typeface="monospace" />
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="8dp">
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_toLeftOf="@+id/action_copy_to_clipboard"
+                        android:orientation="vertical" >
+
+                        <TextView
+                            android:id="@+id/otr_fingerprint"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="?attr/TextSizeBody"
+                            android:typeface="monospace" />
+                    </LinearLayout>
+
+                    <ImageButton
+                        android:id="@+id/action_copy_to_clipboard"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?android:selectableItemBackground"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_action_copy"
+                        android:visibility="invisible" />
+                </RelativeLayout>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
@@ -226,4 +248,4 @@
             android:textColor="@color/secondarytext" />
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
-- 
cgit v1.2.3


From 131f2aad76a968814fe10c06a055d6526b30e70f Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 3 Oct 2014 16:33:45 +0200
Subject: minor graphic tweaks in copy otr fingerprint to clipboard

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

(limited to 'res/layout/activity_edit_account.xml')

diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml
index 0f4bae97..04e176c0 100644
--- a/res/layout/activity_edit_account.xml
+++ b/res/layout/activity_edit_account.xml
@@ -189,7 +189,8 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentLeft="true"
                         android:layout_toLeftOf="@+id/action_copy_to_clipboard"
-                        android:orientation="vertical" >
+                        android:orientation="vertical"
+                        android:layout_centerVertical="true">
 
                         <TextView
                             android:id="@+id/otr_fingerprint"
@@ -206,6 +207,7 @@
                         android:background="?android:selectableItemBackground"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:padding="8dp"
                         android:src="@drawable/ic_action_copy"
                         android:visibility="invisible" />
                 </RelativeLayout>
-- 
cgit v1.2.3


From 0929621b570e4867bb9f7094422fc57f77afb2f8 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 4 Oct 2014 14:31:44 +0200
Subject: minor ui tweak

---
 res/layout/activity_edit_account.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'res/layout/activity_edit_account.xml')

diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml
index 04e176c0..91bda7b1 100644
--- a/res/layout/activity_edit_account.xml
+++ b/res/layout/activity_edit_account.xml
@@ -202,12 +202,13 @@
 
                     <ImageButton
                         android:id="@+id/action_copy_to_clipboard"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
                         android:background="?android:selectableItemBackground"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
-                        android:padding="8dp"
+                        android:padding="4dp"
+                        android:scaleType="fitXY"
                         android:src="@drawable/ic_action_copy"
                         android:visibility="invisible" />
                 </RelativeLayout>
-- 
cgit v1.2.3