FLO data input widget behavior
This commit is contained in:
parent
94b7eb3015
commit
501371c001
@ -207,10 +207,9 @@
|
|||||||
size: self.size
|
size: self.size
|
||||||
pos: self.pos
|
pos: self.pos
|
||||||
|
|
||||||
<FLODataBlueBottom@GridLayout>
|
<FLODataBlueBottom@BoxLayout>
|
||||||
item_height: dp(100)
|
item_height: dp(60)
|
||||||
foreground_color: .843, .914, .972, 1
|
foreground_color: .843, .914, .972, 1
|
||||||
cols: 1
|
|
||||||
padding: '12dp', 0
|
padding: '12dp', 0
|
||||||
canvas.before:
|
canvas.before:
|
||||||
Color:
|
Color:
|
||||||
@ -278,11 +277,9 @@
|
|||||||
background_color: 1, .585, .878, 0
|
background_color: 1, .585, .878, 0
|
||||||
halign: 'left'
|
halign: 'left'
|
||||||
text_size: (self.width-10, None)
|
text_size: (self.width-10, None)
|
||||||
size_hint: 0.5, None
|
size_hint: 1, 1
|
||||||
default_text: ''
|
default_text: ''
|
||||||
text: self.default_text
|
text: self.default_text
|
||||||
padding: '5dp', '5dp'
|
|
||||||
height: '100dp'
|
|
||||||
text_color: self.foreground_color
|
text_color: self.foreground_color
|
||||||
disabled_color: 1, 1, 1, 1
|
disabled_color: 1, 1, 1, 1
|
||||||
foreground_color: 1, 1, 1, 1
|
foreground_color: 1, 1, 1, 1
|
||||||
@ -293,6 +290,8 @@
|
|||||||
size: self.size
|
size: self.size
|
||||||
pos: self.pos
|
pos: self.pos
|
||||||
|
|
||||||
|
<ClickableLabel@ButtonBehavior+Label>:
|
||||||
|
|
||||||
|
|
||||||
<BlueButton@Button>:
|
<BlueButton@Button>:
|
||||||
background_color: 1, .585, .878, 0
|
background_color: 1, .585, .878, 0
|
||||||
@ -313,6 +312,17 @@
|
|||||||
size: self.size
|
size: self.size
|
||||||
pos: self.pos
|
pos: self.pos
|
||||||
|
|
||||||
|
<ClickableInput@ButtonBehavior+TextInput>:
|
||||||
|
readonly: True
|
||||||
|
keyboard_mode: 'managed'
|
||||||
|
canvas:
|
||||||
|
Color:
|
||||||
|
rgba: 1, 0, 0, .3
|
||||||
|
Rectangle:
|
||||||
|
size: self.size
|
||||||
|
pos: self.pos
|
||||||
|
|
||||||
|
|
||||||
<AddressButton@Button>:
|
<AddressButton@Button>:
|
||||||
background_color: 1, .585, .878, 0
|
background_color: 1, .585, .878, 0
|
||||||
halign: 'center'
|
halign: 'center'
|
||||||
@ -496,6 +506,7 @@ BoxLayout:
|
|||||||
ActionOvrButton:
|
ActionOvrButton:
|
||||||
name: 'network'
|
name: 'network'
|
||||||
text: _('Network')
|
text: _('Network')
|
||||||
|
text: _('Network')
|
||||||
ActionOvrButton:
|
ActionOvrButton:
|
||||||
name: 'settings'
|
name: 'settings'
|
||||||
text: _('Settings')
|
text: _('Settings')
|
||||||
|
|||||||
@ -160,7 +160,7 @@ class ElectrumWindow(App):
|
|||||||
self.send_screen.set_URI(uri)
|
self.send_screen.set_URI(uri)
|
||||||
|
|
||||||
def on_new_intent(self, intent):
|
def on_new_intent(self, intent):
|
||||||
if intent.getScheme() != 'bitcoin':
|
if intent.getScheme() != 'flo':
|
||||||
return
|
return
|
||||||
uri = intent.getDataString()
|
uri = intent.getDataString()
|
||||||
self.set_URI(uri)
|
self.set_URI(uri)
|
||||||
|
|||||||
@ -69,15 +69,24 @@ HistoryScreen:
|
|||||||
content: history_container
|
content: history_container
|
||||||
BoxLayout:
|
BoxLayout:
|
||||||
orientation: 'vertical'
|
orientation: 'vertical'
|
||||||
Button:
|
RelativeLayout:
|
||||||
background_color: 0, 0, 0, 0
|
|
||||||
text: app.fiat_balance if app.is_fiat else app.balance
|
|
||||||
markup: True
|
|
||||||
color: .9, .9, .9, 1
|
|
||||||
font_size: '30dp'
|
|
||||||
bold: True
|
|
||||||
size_hint: 1, 0.25
|
size_hint: 1, 0.25
|
||||||
on_release: app.is_fiat = not app.is_fiat if app.fx.is_enabled() else False
|
Button:
|
||||||
|
pos_hint: {'center_x': 0.5, 'center_y': 0.5}
|
||||||
|
background_color: 0, 0, 0, 0
|
||||||
|
text: app.fiat_balance if app.is_fiat else app.balance
|
||||||
|
markup: True
|
||||||
|
color: .9, .9, .9, 1
|
||||||
|
font_size: '30dp'
|
||||||
|
bold: True
|
||||||
|
on_release: app.is_fiat = not app.is_fiat if app.fx.is_enabled() else False
|
||||||
|
Label:
|
||||||
|
pos_hint: {'center_x': 0.5, 'center_y': 0.17}
|
||||||
|
background_color: 0, 0, 0, 0
|
||||||
|
markup: True
|
||||||
|
color: .5, .5, .5, 1
|
||||||
|
font_size: '14dp'
|
||||||
|
text: "Blocks : %d" % app.num_blocks
|
||||||
HistoryRecycleView:
|
HistoryRecycleView:
|
||||||
id: history_container
|
id: history_container
|
||||||
scroll_type: ['bars', 'content']
|
scroll_type: ['bars', 'content']
|
||||||
|
|||||||
@ -20,7 +20,7 @@ SendScreen:
|
|||||||
SendReceiveBlueBottom:
|
SendReceiveBlueBottom:
|
||||||
id: blue_bottom
|
id: blue_bottom
|
||||||
size_hint: 1, None
|
size_hint: 1, None
|
||||||
height: self.minimum_height +5
|
height: self.minimum_height
|
||||||
BoxLayout:
|
BoxLayout:
|
||||||
size_hint: 1, None
|
size_hint: 1, None
|
||||||
height: blue_bottom.item_height
|
height: blue_bottom.item_height
|
||||||
@ -92,24 +92,23 @@ SendScreen:
|
|||||||
text: app.fee_status
|
text: app.fee_status
|
||||||
on_release: Clock.schedule_once(lambda dt: app.fee_dialog(s, True))
|
on_release: Clock.schedule_once(lambda dt: app.fee_dialog(s, True))
|
||||||
FLODataBlueBottom:
|
FLODataBlueBottom:
|
||||||
id: flodata_blue_bottom
|
size_hint: 1, 1
|
||||||
size_hint: 1, None
|
spacing: '5dp'
|
||||||
height: self.minimum_height +5
|
Image:
|
||||||
BoxLayout:
|
source: 'atlas://electrum/gui/kivy/theming/light/star_big_inactive'
|
||||||
size_hint: 1, None
|
opacity: 0.7
|
||||||
height: flodata_blue_bottom.item_height
|
size_hint: None, None
|
||||||
spacing: '5dp'
|
size: '22dp', '22dp'
|
||||||
Image:
|
pos_hint: {'center_y': .5}
|
||||||
source: 'atlas://electrum/gui/kivy/theming/light/pen'
|
ScrollView:
|
||||||
opacity: 0.7
|
id: scrlv
|
||||||
size_hint: None, None
|
ClickableLabel:
|
||||||
size: '22dp', '22dp'
|
size_hint_y: None
|
||||||
pos_hint: {'center_y': .5}
|
text_size: self.width, None
|
||||||
FLODataButton:
|
height: self.height
|
||||||
id: flodata
|
text: s.flodata if s.flodata else (_('No FLO data') if root.is_pr else _('FLO data\n'))
|
||||||
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))
|
on_release: Clock.schedule_once(lambda dt: app.flodata_dialog(s))
|
||||||
|
|
||||||
BoxLayout:
|
BoxLayout:
|
||||||
size_hint: 1, None
|
size_hint: 1, None
|
||||||
height: '48dp'
|
height: '48dp'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user