From 04a2c03c280c3ca39f7eb23090bfa8644346f309 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Fri, 5 Feb 2016 21:07:48 +0100
Subject: [PATCH] kivy: improve 'receive' layout

---
 gui/kivy/main.kv                   |  2 +-
 gui/kivy/uix/ui_screens/receive.kv | 23 ++++++++++++++++-------
 gui/kivy/uix/ui_screens/send.kv    |  1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
index 634783e2a..986113a52 100644
--- a/gui/kivy/main.kv
+++ b/gui/kivy/main.kv
@@ -75,7 +75,7 @@
         Color:
             rgba: .238, .585, .878, 1
         BorderImage:
-            border: 9, 9, 9, 9
+            #border: 9, 9, 9, 9
             source: 'atlas://gui/kivy/theming/light/card_bottom'
             size: self.size
             pos: self.pos
diff --git a/gui/kivy/uix/ui_screens/receive.kv b/gui/kivy/uix/ui_screens/receive.kv
index efce9e3c8..c6e18e06b 100644
--- a/gui/kivy/uix/ui_screens/receive.kv
+++ b/gui/kivy/uix/ui_screens/receive.kv
@@ -37,18 +37,27 @@ ReceiveScreen:
                 on_touch_down:
                     self.shaded = not self.shaded
                     self.foreground_color = (0, 0, 0, 0.5) if self.shaded else (0, 0, 0, 0)
-        Label:
-            id: address_label
-            size_hint: 1, None
-            height: '48dp'
-            opacity: 0.5 if qr.shaded else 1
-            text: _('Bitcoin Address') + ': ' + s.address
-            text_size: self.width, None
 
         SendReceiveBlueBottom:
             id: blue_bottom
             size_hint: 1, None
             height: self.minimum_height
+            BoxLayout:
+                size_hint: 1, None
+                height: blue_bottom.item_height
+                spacing: '5dp'
+                Image:
+                    source: 'atlas://gui/kivy/theming/light/contact'
+                    size_hint: None, None
+                    size: '22dp', '22dp'
+                    pos_hint: {'center_y': .5}
+                BlueButton:
+                    id: address_label
+                    text: s.address if s.address else _('Bitcoin Address')
+                    shorten: True
+            CardSeparator:
+                opacity: message_selection.opacity
+                color: blue_bottom.foreground_color
             BoxLayout:
                 size_hint: 1, None
                 height: blue_bottom.item_height
diff --git a/gui/kivy/uix/ui_screens/send.kv b/gui/kivy/uix/ui_screens/send.kv
index 492c9f4ae..490d69bd4 100644
--- a/gui/kivy/uix/ui_screens/send.kv
+++ b/gui/kivy/uix/ui_screens/send.kv
@@ -35,6 +35,7 @@ SendScreen:
                     id: payto_e
                     text: s.address if s.address else _('Recipient')
                     on_release: app.address_dialog(s)
+                    shorten: True
             CardSeparator:
                 opacity: message_selection.opacity
                 color: blue_bottom.foreground_color