commit fb641b5bf13c8640f49b026b03cfcea00109829c
parent d60be8e19c622926aa3c8c7bb8eb0ba4bce8e076
Author: ThomasV <thomasv@electrum.org>
Date: Wed, 2 Dec 2015 18:02:11 +0100
kivy updates
Diffstat:
7 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
@@ -192,6 +192,19 @@
values: [] #app.wallet.addresses() if app.wallet else []
text: _("Select Your address")
+<AmountButton@Button>:
+ background_color: .238, .585, .878, 0
+ halign: 'left'
+ text_size: (self.width-15, None)
+ size_hint: 0.5, None
+ default_text: 'Amount'
+ text: self.default_text
+ padding: '5dp', '5db'
+ height: '40dp'
+ text_color: self.foreground_color
+ foreground_color: 1, 0, 0, 1
+
+
<TextInputBlue@TextInput>
padding: '5dp'
size_hint: 1, None
@@ -199,8 +212,8 @@
pos_hint: {'center_y':.5}
multiline: False
hint_text_color: self.foreground_color
- foreground_color: .843, .914, .972, 1
- background_color: 1, 1, 1, 1
+ foreground_color: 1, 1, 1, 1
+ font_size: '16dp'
background_normal: 'atlas://gui/kivy/theming/light/tab_btn'
background_active: 'atlas://gui/kivy/theming/light/textinput_active'
diff --git a/gui/kivy/theming/splash.png b/gui/kivy/theming/splash.png
Binary files differ.
diff --git a/gui/kivy/tools/buildozer.spec b/gui/kivy/tools/buildozer.spec
@@ -36,10 +36,12 @@ version.filename = %(source.dir)s/lib/version.py
requirements = openssl, pil, plyer==master, kivy==master
# (str) Presplash of the application
-presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png
+#presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png
+presplash.filename = %(source.dir)s/icons/electrum.png
# (str) Icon of the application
-icon.filename = %(source.dir)s/icons/electrum_android_launcher_icon.png
+#icon.filename = %(source.dir)s/icons/electrum_android_launcher_icon.png
+icon.filename = %(source.dir)s/icons/electrum_launcher.png
# (str) Supported orientation (one of landscape, portrait or all)
orientation = portrait
diff --git a/gui/kivy/uix/ui_screens/amount.kv b/gui/kivy/uix/ui_screens/amount.kv
@@ -25,7 +25,7 @@ Popup:
id: button_fiat
size_hint: 1, None
height: '48dp'
- text: '<->'
+ text: '/'
on_release: a.is_fiat = not a.is_fiat
Widget:
@@ -78,14 +78,22 @@ Popup:
text: 'Max'
on_release: a.amount = app.get_max_amount()
+ Widget:
+ size_hint: 1, None
+
BoxLayout:
size_hint: 1, None
height: '48dp'
+ Button:
+ size_hint: 1, None
+ height: '48dp'
+ text: 'Clear'
+ on_release: a.amount = ''
Widget:
- size_hint: 0.7, None
+ size_hint: 1, None
height: '48dp'
Button:
- size_hint: 0.3, None
+ size_hint: 1, None
height: '48dp'
text: _('OK')
on_release: popup.dismiss()
diff --git a/gui/kivy/uix/ui_screens/receive.kv b/gui/kivy/uix/ui_screens/receive.kv
@@ -40,20 +40,13 @@ ReceiveScreen:
size_hint: 1, None
height: blue_bottom.item_height
Image:
- source: 'atlas://gui/kivy/theming/light/bit_logo'
+ source: 'atlas://gui/kivy/theming/light/globe'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
- Button:
+ AmountButton:
id: amount
- default_text: 'Amount (optional)'
- text: self.default_text
- text_size: (amount.width-15, None)
- halign: 'left'
- size_hint: 0.5, None
- height: '48dp'
on_release: app.amount_dialog(amount, receive_screen.parent.update_qr, False)
- background_color: 0, 0, 0, 0
CardSeparator:
opacity: message_selection.opacity
color: blue_bottom.foreground_color
@@ -70,7 +63,7 @@ ReceiveScreen:
pos_hint: {'center_y': .5}
TextInputBlue:
id: message
- hint_text: 'Description (optional)'
+ hint_text: 'Description'
on_text_validate: receive_screen.parent.update_qr()
BoxLayout:
diff --git a/gui/kivy/uix/ui_screens/send.kv b/gui/kivy/uix/ui_screens/send.kv
@@ -64,20 +64,15 @@ SendScreen:
size_hint: 1, None
height: blue_bottom.item_height
Image:
- source: 'atlas://gui/kivy/theming/light/bit_logo'
+ source: 'atlas://gui/kivy/theming/light/globe'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
- Button:
+ AmountButton:
id: amount_e
- default_text: 'Amount'
- text: self.default_text
- text_size: (self.width-15, None)
- halign: 'left'
- size_hint: 0.5, None
- height: '48dp'
on_release: app.amount_dialog(self, None, True)
- background_color: .238, .585, .878, 0
+
+
CardSeparator:
opacity: message_selection.opacity
color: blue_bottom.foreground_color
@@ -94,7 +89,7 @@ SendScreen:
pos_hint: {'center_y': .5}
TextInputBlue:
id: message_e
- hint_text: 'Description (optional)'
+ hint_text: 'Description'
BoxLayout:
size_hint: 1, None
height: '48dp'
diff --git a/icons/electrum_launcher.png b/icons/electrum_launcher.png
Binary files differ.
