kivy: improve amount dialog

This commit is contained in:
ThomasV 2016-01-30 13:24:54 +01:00
parent 28b0ff85f2
commit 0f184db534
1 changed files with 12 additions and 8 deletions

View File

@ -15,17 +15,21 @@ Builder.load_string('''
orientation: 'vertical' orientation: 'vertical'
size_hint: 0.8, 1 size_hint: 0.8, 1
BoxLayout: BoxLayout:
size_hint: 1, 1 size_hint: 1, None
height: '48dp' height: '80dp'
Label: Label:
id: a id: a
btc_text: (kb.amount + ' ' + app.base_unit) if kb.amount else '' btc_text: (kb.amount + ' ' + app.base_unit) if kb.amount else ''
fiat_text: (kb.fiat_amount + ' ' + app.fiat_unit) if kb.fiat_amount else '' fiat_text: (kb.fiat_amount + ' ' + app.fiat_unit) if kb.fiat_amount else ''
text: ((self.fiat_text + ' / ' + self.btc_text if kb.is_fiat else self.btc_text + ' / ' + self.fiat_text) if app.fiat_unit else self.btc_text) if self.btc_text else '' text1: ((self.fiat_text if kb.is_fiat else self.btc_text) if app.fiat_unit else self.btc_text) if self.btc_text else ''
size_hint: 1, 1 text2: ((self.btc_text if kb.is_fiat else self.fiat_text) if app.fiat_unit else '') if self.btc_text else ''
text: self.text1 + "\\n" + "[color=#8888ff]" + self.text2 + "[/color]"
text_align: 'right'
size_hint: 1, None
font_size: '22dp' font_size: '22dp'
height: '80dp'
Widget: Widget:
size_hint: 1, 1 size_hint: 1, 0.2
GridLayout: GridLayout:
id: kb id: kb
amount: '' amount: ''
@ -75,9 +79,9 @@ Builder.load_string('''
id: button_fiat id: button_fiat
size_hint: 1, None size_hint: 1, None
height: '48dp' height: '48dp'
text: (app.fiat_unit if kb.is_fiat else app.base_unit) if app.fiat_unit else '' text: (app.base_unit if kb.is_fiat else app.fiat_unit) if app.fiat_unit else ''
on_release: on_release:
popup.toggle_fiat(kb) if app.fiat_unit: popup.toggle_fiat(kb)
Button: Button:
size_hint: 1, None size_hint: 1, None
height: '48dp' height: '48dp'
@ -86,7 +90,7 @@ Builder.load_string('''
kb.amount = '' kb.amount = ''
kb.fiat_amount = '' kb.fiat_amount = ''
Widget: Widget:
size_hint: 1, None size_hint: 1, 0.2
BoxLayout: BoxLayout:
size_hint: 1, None size_hint: 1, None
height: '48dp' height: '48dp'