kivy updates
This commit is contained in:
parent
d60be8e19c
commit
fb641b5bf1
|
@ -192,6 +192,19 @@
|
||||||
values: [] #app.wallet.addresses() if app.wallet else []
|
values: [] #app.wallet.addresses() if app.wallet else []
|
||||||
text: _("Select Your address")
|
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>
|
<TextInputBlue@TextInput>
|
||||||
padding: '5dp'
|
padding: '5dp'
|
||||||
size_hint: 1, None
|
size_hint: 1, None
|
||||||
|
@ -199,8 +212,8 @@
|
||||||
pos_hint: {'center_y':.5}
|
pos_hint: {'center_y':.5}
|
||||||
multiline: False
|
multiline: False
|
||||||
hint_text_color: self.foreground_color
|
hint_text_color: self.foreground_color
|
||||||
foreground_color: .843, .914, .972, 1
|
foreground_color: 1, 1, 1, 1
|
||||||
background_color: 1, 1, 1, 1
|
font_size: '16dp'
|
||||||
background_normal: 'atlas://gui/kivy/theming/light/tab_btn'
|
background_normal: 'atlas://gui/kivy/theming/light/tab_btn'
|
||||||
background_active: 'atlas://gui/kivy/theming/light/textinput_active'
|
background_active: 'atlas://gui/kivy/theming/light/textinput_active'
|
||||||
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 73 KiB |
|
@ -36,10 +36,12 @@ version.filename = %(source.dir)s/lib/version.py
|
||||||
requirements = openssl, pil, plyer==master, kivy==master
|
requirements = openssl, pil, plyer==master, kivy==master
|
||||||
|
|
||||||
# (str) Presplash of the application
|
# (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
|
# (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)
|
# (str) Supported orientation (one of landscape, portrait or all)
|
||||||
orientation = portrait
|
orientation = portrait
|
||||||
|
|
|
@ -25,7 +25,7 @@ Popup:
|
||||||
id: button_fiat
|
id: button_fiat
|
||||||
size_hint: 1, None
|
size_hint: 1, None
|
||||||
height: '48dp'
|
height: '48dp'
|
||||||
text: '<->'
|
text: '/'
|
||||||
on_release: a.is_fiat = not a.is_fiat
|
on_release: a.is_fiat = not a.is_fiat
|
||||||
|
|
||||||
Widget:
|
Widget:
|
||||||
|
@ -78,14 +78,22 @@ Popup:
|
||||||
text: 'Max'
|
text: 'Max'
|
||||||
on_release: a.amount = app.get_max_amount()
|
on_release: a.amount = app.get_max_amount()
|
||||||
|
|
||||||
|
Widget:
|
||||||
|
size_hint: 1, None
|
||||||
|
|
||||||
BoxLayout:
|
BoxLayout:
|
||||||
size_hint: 1, None
|
size_hint: 1, None
|
||||||
height: '48dp'
|
height: '48dp'
|
||||||
|
Button:
|
||||||
|
size_hint: 1, None
|
||||||
|
height: '48dp'
|
||||||
|
text: 'Clear'
|
||||||
|
on_release: a.amount = ''
|
||||||
Widget:
|
Widget:
|
||||||
size_hint: 0.7, None
|
size_hint: 1, None
|
||||||
height: '48dp'
|
height: '48dp'
|
||||||
Button:
|
Button:
|
||||||
size_hint: 0.3, None
|
size_hint: 1, None
|
||||||
height: '48dp'
|
height: '48dp'
|
||||||
text: _('OK')
|
text: _('OK')
|
||||||
on_release: popup.dismiss()
|
on_release: popup.dismiss()
|
||||||
|
|
|
@ -40,20 +40,13 @@ ReceiveScreen:
|
||||||
size_hint: 1, None
|
size_hint: 1, None
|
||||||
height: blue_bottom.item_height
|
height: blue_bottom.item_height
|
||||||
Image:
|
Image:
|
||||||
source: 'atlas://gui/kivy/theming/light/bit_logo'
|
source: 'atlas://gui/kivy/theming/light/globe'
|
||||||
size_hint: None, None
|
size_hint: None, None
|
||||||
size: '22dp', '22dp'
|
size: '22dp', '22dp'
|
||||||
pos_hint: {'center_y': .5}
|
pos_hint: {'center_y': .5}
|
||||||
Button:
|
AmountButton:
|
||||||
id: amount
|
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)
|
on_release: app.amount_dialog(amount, receive_screen.parent.update_qr, False)
|
||||||
background_color: 0, 0, 0, 0
|
|
||||||
CardSeparator:
|
CardSeparator:
|
||||||
opacity: message_selection.opacity
|
opacity: message_selection.opacity
|
||||||
color: blue_bottom.foreground_color
|
color: blue_bottom.foreground_color
|
||||||
|
@ -70,7 +63,7 @@ ReceiveScreen:
|
||||||
pos_hint: {'center_y': .5}
|
pos_hint: {'center_y': .5}
|
||||||
TextInputBlue:
|
TextInputBlue:
|
||||||
id: message
|
id: message
|
||||||
hint_text: 'Description (optional)'
|
hint_text: 'Description'
|
||||||
on_text_validate: receive_screen.parent.update_qr()
|
on_text_validate: receive_screen.parent.update_qr()
|
||||||
|
|
||||||
BoxLayout:
|
BoxLayout:
|
||||||
|
|
|
@ -64,20 +64,15 @@ SendScreen:
|
||||||
size_hint: 1, None
|
size_hint: 1, None
|
||||||
height: blue_bottom.item_height
|
height: blue_bottom.item_height
|
||||||
Image:
|
Image:
|
||||||
source: 'atlas://gui/kivy/theming/light/bit_logo'
|
source: 'atlas://gui/kivy/theming/light/globe'
|
||||||
size_hint: None, None
|
size_hint: None, None
|
||||||
size: '22dp', '22dp'
|
size: '22dp', '22dp'
|
||||||
pos_hint: {'center_y': .5}
|
pos_hint: {'center_y': .5}
|
||||||
Button:
|
AmountButton:
|
||||||
id: amount_e
|
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)
|
on_release: app.amount_dialog(self, None, True)
|
||||||
background_color: .238, .585, .878, 0
|
|
||||||
|
|
||||||
CardSeparator:
|
CardSeparator:
|
||||||
opacity: message_selection.opacity
|
opacity: message_selection.opacity
|
||||||
color: blue_bottom.foreground_color
|
color: blue_bottom.foreground_color
|
||||||
|
@ -94,7 +89,7 @@ SendScreen:
|
||||||
pos_hint: {'center_y': .5}
|
pos_hint: {'center_y': .5}
|
||||||
TextInputBlue:
|
TextInputBlue:
|
||||||
id: message_e
|
id: message_e
|
||||||
hint_text: 'Description (optional)'
|
hint_text: 'Description'
|
||||||
BoxLayout:
|
BoxLayout:
|
||||||
size_hint: 1, None
|
size_hint: 1, None
|
||||||
height: '48dp'
|
height: '48dp'
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
Loading…
Reference in New Issue