fix: using normal status to signal unread messages in order to avoid BT overlap bug

This commit is contained in:
Simone Margaritelli 2019-10-23 15:14:55 +02:00
parent 7779ebc983
commit 23ef17d4c7
3 changed files with 11 additions and 12 deletions

View File

@ -66,18 +66,8 @@ def is_excluded(what):
def on_ui_update(ui): def on_ui_update(ui):
new_value = ' %d (%d)' % (UNREAD_MESSAGES, TOTAL_MESSAGES) if UNREAD_MESSAGES > 0:
if not ui.has_element('mailbox') and UNREAD_MESSAGES > 0: ui.on_unread_messages(UNREAD_MESSAGES, TOTAL_MESSAGES)
if ui.is_inky():
pos = (80, 0)
else:
pos = (100, 0)
ui.add_element('mailbox',
LabeledValue(color=BLACK, label='MSG', value=new_value,
position=pos,
label_font=fonts.Bold,
text_font=fonts.Medium))
ui.set('mailbox', new_value)
def set_reported(reported, net_id): def set_reported(reported, net_id):

View File

@ -300,6 +300,11 @@ class View(object):
self.set('status', self._voice.on_handshakes(new_shakes)) self.set('status', self._voice.on_handshakes(new_shakes))
self.update() self.update()
def on_unread_messages(self, count, total):
self.set('face', faces.EXCITED)
self.set('status', self._voice.on_unread_messages(count, total))
self.update()
def on_rebooting(self): def on_rebooting(self):
self.set('face', faces.BROKEN) self.set('face', faces.BROKEN)
self.set('status', self._voice.on_rebooting()) self.set('status', self._voice.on_rebooting())

View File

@ -129,6 +129,10 @@ class Voice:
s = 's' if new_shakes > 1 else '' s = 's' if new_shakes > 1 else ''
return self._('Cool, we got {num} new handshake{plural}!').format(num=new_shakes, plural=s) return self._('Cool, we got {num} new handshake{plural}!').format(num=new_shakes, plural=s)
def on_unread_messages(self, count, total):
s = 's' if count > 1 else ''
return self._('You have {count} new message{plural}!').format(num=count, plural=s)
def on_rebooting(self): def on_rebooting(self):
return self._("Ops, something went wrong ... Rebooting ...") return self._("Ops, something went wrong ... Rebooting ...")