From 1e1caf602d70019b67aa215ab0a95c97e641ba93 Mon Sep 17 00:00:00 2001
From: Vivek Teega <vivek.teega@gmail.com>
Date: Sat, 26 Jan 2019 13:04:01 +0530
Subject: [PATCH] Send tab GUI change

---
 electrum/gui/kivy/main.kv                     |  33 +++++++++++++++
 electrum/gui/kivy/theming/light/flodata.png   | Bin 0 -> 2079 bytes
 .../gui/kivy/uix/dialogs/flodata_dialog.py    |  12 +++++-
 electrum/gui/kivy/uix/ui_screens/history.kv   |   6 +--
 electrum/gui/kivy/uix/ui_screens/send.kv      |  39 +++++++++---------
 5 files changed, 67 insertions(+), 23 deletions(-)
 create mode 100644 electrum/gui/kivy/theming/light/flodata.png

diff --git a/electrum/gui/kivy/main.kv b/electrum/gui/kivy/main.kv
index 77435d02..e2054308 100644
--- a/electrum/gui/kivy/main.kv
+++ b/electrum/gui/kivy/main.kv
@@ -207,6 +207,19 @@
             size: self.size
             pos: self.pos
 
+<FLODataBlueBottom@GridLayout>
+    item_height: dp(100)
+    foreground_color: .843, .914, .972, 1
+    cols: 1
+    padding: '12dp', 0
+    canvas.before:
+        Color:
+            rgba: 0.192, .498, 0.745, 1
+        BorderImage:
+            source: 'atlas://electrum/gui/kivy/theming/light/card_bottom'
+            size: self.size
+            pos: self.pos
+
 
 <AddressFilter@GridLayout>
 	item_height: dp(42)
@@ -261,6 +274,26 @@
             size: self.size
             pos: self.pos
 
+<FLODataButton@Button>:
+    background_color: 1, .585, .878, 0
+    halign: 'left'
+    text_size: (self.width-10, None)
+    size_hint: 0.5, None
+    default_text: ''
+    text: self.default_text
+    padding: '5dp', '5dp'
+    height: '100dp'
+    text_color: self.foreground_color
+    disabled_color: 1, 1, 1, 1
+    foreground_color: 1, 1, 1, 1
+    canvas.before:
+        Color:
+            rgba: (0.9, .498, 0.745, 1) if self.state == 'down' else self.background_color
+        Rectangle:
+            size: self.size
+            pos: self.pos
+
+
 <BlueButton@Button>:
     background_color: 1, .585, .878, 0
     halign: 'left'
diff --git a/electrum/gui/kivy/theming/light/flodata.png b/electrum/gui/kivy/theming/light/flodata.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ce57592d515b42cc9bc20c58b81aa72db2b8e01
GIT binary patch
literal 2079
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
JPDHLkV1lFa^J4%2

literal 0
HcmV?d00001

diff --git a/electrum/gui/kivy/uix/dialogs/flodata_dialog.py b/electrum/gui/kivy/uix/dialogs/flodata_dialog.py
index caef67bf..da92db73 100644
--- a/electrum/gui/kivy/uix/dialogs/flodata_dialog.py
+++ b/electrum/gui/kivy/uix/dialogs/flodata_dialog.py
@@ -2,6 +2,8 @@ from kivy.app import App
 from kivy.factory import Factory
 from kivy.properties import ObjectProperty
 from kivy.lang import Builder
+from kivy.uix.textinput import TextInput
+from kivy.properties import NumericProperty
 
 Builder.load_string('''
 <FLODataDialog@Popup>
@@ -13,11 +15,12 @@ Builder.load_string('''
         orientation: 'vertical'
         Widget:
             size_hint: 1, 0.4
-        TextInput:
+        LimitedInput:
             id:input
             padding: '5dp'
             size_hint: 1, 1
             height: '27dp'
+            max_characters: 527
             pos_hint: {'center_y':.5}
             text:''
             multiline: True
@@ -46,6 +49,13 @@ Builder.load_string('''
                     popup.dismiss()
 ''')
 
+class LimitedInput(TextInput):
+    max_characters = NumericProperty(0)
+    def insert_text(self, substring, from_undo=False):
+        if len(self.text) > self.max_characters and self.max_characters > 0:
+            substring = ""
+        TextInput.insert_text(self, substring, from_undo)
+
 class FLODataDialog(Factory.Popup):
 
     def __init__(self, title, text, callback):
diff --git a/electrum/gui/kivy/uix/ui_screens/history.kv b/electrum/gui/kivy/uix/ui_screens/history.kv
index 55e9c31a..17fc211e 100644
--- a/electrum/gui/kivy/uix/ui_screens/history.kv
+++ b/electrum/gui/kivy/uix/ui_screens/history.kv
@@ -48,16 +48,16 @@
             shorten: True
             text: root.date + '   ' + root.message
         CardLabel:
-            color: .699, .699, .699, 1
+            color: .799, .799, .799, 1
             font_size: '14sp'
             shorten: True
-            text: root.flodata
+            text: root.flodata if root.flodata else ''
         Widget
 
 <HistoryRecycleView>:
     viewclass: 'HistoryItem'
     RecycleBoxLayout:
-        default_size: None, dp(56)
+        default_size: None, dp(70)
         default_size_hint: 1, None
         size_hint: 1, None
         height: self.minimum_height
diff --git a/electrum/gui/kivy/uix/ui_screens/send.kv b/electrum/gui/kivy/uix/ui_screens/send.kv
index 81ef6d8f..b015630a 100644
--- a/electrum/gui/kivy/uix/ui_screens/send.kv
+++ b/electrum/gui/kivy/uix/ui_screens/send.kv
@@ -20,7 +20,7 @@ SendScreen:
         SendReceiveBlueBottom:
             id: blue_bottom
             size_hint: 1, None
-            height: self.minimum_height
+            height: self.minimum_height +5
             BoxLayout:
                 size_hint: 1, None
                 height: blue_bottom.item_height
@@ -39,24 +39,6 @@ SendScreen:
             CardSeparator:
                 opacity: int(not root.is_pr)
                 color: blue_bottom.foreground_color
-            BoxLayout:
-                id: flodata_selection
-                size_hint: 1, None
-                height: blue_bottom.item_height
-                spacing: '5dp'
-                Image:
-                    source: 'atlas://electrum/gui/kivy/theming/light/pen'
-                    size_hint: None, None
-                    size: '22dp', '22dp'
-                    pos_hint: {'center_y': .5}
-                BlueButton:
-                    id: flodata
-                    text: s.flodata if s.flodata else (_('No FLO data') if root.is_pr else _('FLO data'))
-                    disabled: root.is_pr
-                    on_release: Clock.schedule_once(lambda dt: app.flodata_dialog(s))
-            CardSeparator:
-                opacity: int(not root.is_pr)
-                color: blue_bottom.foreground_color
             BoxLayout:
                 size_hint: 1, None
                 height: blue_bottom.item_height
@@ -109,6 +91,25 @@ SendScreen:
                     default_text: _('Fee')
                     text: app.fee_status
                     on_release: Clock.schedule_once(lambda dt: app.fee_dialog(s, True))
+        FLODataBlueBottom:
+            id: flodata_blue_bottom
+            size_hint: 1, None
+            height: self.minimum_height +5
+            BoxLayout:
+                size_hint: 1, None
+                height: flodata_blue_bottom.item_height
+                spacing: '5dp'
+                Image:
+                    source: 'atlas://electrum/gui/kivy/theming/light/pen'
+                    opacity: 0.7
+                    size_hint: None, None
+                    size: '22dp', '22dp'
+                    pos_hint: {'center_y': .5}
+                FLODataButton:
+                    id: flodata
+                    text: s.flodata if s.flodata else (_('No FLO data') if root.is_pr else _('FLO data'))
+                    disabled: root.is_pr
+                    on_release: Clock.schedule_once(lambda dt: app.flodata_dialog(s))
         BoxLayout:
             size_hint: 1, None
             height: '48dp'