Mirrors
/
Sideband
mirror of https://github.com/markqvist/Sideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated message colors

This commit is contained in:
Mark Qvist 2024-12-09 20:25:50 +01:00
parent 1989330d21
commit 79ad4bb353
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbapp/ui/helpers.py
View File

@ -29,12 +29,12 @@ intensity_play_light = "300"
intensity_msgs_dark_alt = "800" intensity_msgs_dark_alt = "800"
intensity_msgs_light_alt = "400" intensity_msgs_light_alt = "400"
intensity_delivered_alt_dark = "800"
color_received_alt = "BlueGray" color_received_alt = "BlueGray"
color_received_alt_light = "BlueGray" color_received_alt_light = "BlueGray"
color_delivered_alt = "LightBlue" color_delivered_alt = "Indigo"
color_delivered_alt = "Blue" color_propagated_alt = "DeepPurple"
color_propagated_alt = "Indigo" color_paper_alt = "DeepPurple"
color_paper_alt = "Indigo"
color_playing_alt = "Amber" color_playing_alt = "Amber"
color_failed_alt = "Red" color_failed_alt = "Red"
color_unknown_alt = "Gray" color_unknown_alt = "Gray"

16
sbapp/ui/messages.py
View File

@ -35,13 +35,13 @@ if RNS.vendor.platformutils.get_platform() == "android":
from sideband.sense import Telemeter, Commands from sideband.sense import Telemeter, Commands
from ui.helpers import ts_format, file_ts_format, mdc from ui.helpers import ts_format, file_ts_format, mdc
from ui.helpers import color_playing, color_received, color_delivered, color_propagated, color_paper, color_failed, color_unknown, intensity_msgs_dark, intensity_msgs_light, intensity_play_dark, intensity_play_light from ui.helpers import color_playing, color_received, color_delivered, color_propagated, color_paper, color_failed, color_unknown, intensity_msgs_dark, intensity_msgs_light, intensity_play_dark, intensity_play_light
from ui.helpers import color_received_alt, color_received_alt_light, color_delivered_alt, color_propagated_alt, color_paper_alt, color_failed_alt, color_unknown_alt, color_playing_alt, intensity_msgs_dark_alt, intensity_msgs_light_alt from ui.helpers import color_received_alt, color_received_alt_light, color_delivered_alt, color_propagated_alt, color_paper_alt, color_failed_alt, color_unknown_alt, color_playing_alt, intensity_msgs_dark_alt, intensity_msgs_light_alt, intensity_delivered_alt_dark
else: else:
import sbapp.plyer as plyer import sbapp.plyer as plyer
from sbapp.sideband.sense import Telemeter, Commands from sbapp.sideband.sense import Telemeter, Commands
from .helpers import ts_format, file_ts_format, mdc from .helpers import ts_format, file_ts_format, mdc
from .helpers import color_playing, color_received, color_delivered, color_propagated, color_paper, color_failed, color_unknown, intensity_msgs_dark, intensity_msgs_light, intensity_play_dark, intensity_play_light from .helpers import color_playing, color_received, color_delivered, color_propagated, color_paper, color_failed, color_unknown, intensity_msgs_dark, intensity_msgs_light, intensity_play_dark, intensity_play_light
from .helpers import color_received_alt, color_received_alt_light, color_delivered_alt, color_propagated_alt, color_paper_alt, color_failed_alt, color_unknown_alt, color_playing_alt, intensity_msgs_dark_alt, intensity_msgs_light_alt from .helpers import color_received_alt, color_received_alt_light, color_delivered_alt, color_propagated_alt, color_paper_alt, color_failed_alt, color_unknown_alt, color_playing_alt, intensity_msgs_dark_alt, intensity_msgs_light_alt, intensity_delivered_alt_dark
if RNS.vendor.platformutils.is_darwin(): if RNS.vendor.platformutils.is_darwin():
from PIL import Image as PilImage from PIL import Image as PilImage
@ -264,16 +264,20 @@ class Messages():
if self.app.sideband.config["dark_ui"]: if self.app.sideband.config["dark_ui"]:
intensity_msgs = intensity_msgs_dark intensity_msgs = intensity_msgs_dark
intensity_play = intensity_play_dark intensity_play = intensity_play_dark
intensity_delivered = intensity_msgs
else: else:
intensity_msgs = intensity_msgs_light intensity_msgs = intensity_msgs_light
intensity_play = intensity_play_light intensity_play = intensity_play_light
intensity_delivered = intensity_msgs
else: else:
if self.app.sideband.config["dark_ui"]: if self.app.sideband.config["dark_ui"]:
intensity_msgs = intensity_msgs_dark_alt intensity_msgs = intensity_msgs_dark_alt
intensity_play = intensity_play_dark intensity_play = intensity_play_dark
intensity_delivered = intensity_delivered_alt_dark
else: else:
intensity_msgs = intensity_msgs_light_alt intensity_msgs = intensity_msgs_light_alt
intensity_play = intensity_play_light intensity_play = intensity_play_light
intensity_delivered = intensity_msgs
for w in self.widgets: for w in self.widgets:
m = w.m m = w.m
@ -332,7 +336,7 @@ class Messages():
if msg["state"] == LXMF.LXMessage.DELIVERED: if msg["state"] == LXMF.LXMessage.DELIVERED:
w.md_bg_color = msg_color = mdc(c_delivered, intensity_msgs) w.md_bg_color = msg_color = mdc(c_delivered, intensity_delivered)
txstr = time.strftime(ts_format, time.localtime(msg["sent"])) txstr = time.strftime(ts_format, time.localtime(msg["sent"]))
titlestr = "" titlestr = ""
if msg["title"]: if msg["title"]:
@ -393,19 +397,23 @@ class Messages():
if self.app.sideband.config["dark_ui"]: if self.app.sideband.config["dark_ui"]:
intensity_msgs = intensity_msgs_dark intensity_msgs = intensity_msgs_dark
intensity_play = intensity_play_dark intensity_play = intensity_play_dark
intensity_delivered = intensity_msgs
mt_color = [1.0, 1.0, 1.0, 0.8] mt_color = [1.0, 1.0, 1.0, 0.8]
else: else:
intensity_msgs = intensity_msgs_light intensity_msgs = intensity_msgs_light
intensity_play = intensity_play_light intensity_play = intensity_play_light
intensity_delivered = intensity_msgs
mt_color = [1.0, 1.0, 1.0, 0.95] mt_color = [1.0, 1.0, 1.0, 0.95]
else: else:
if self.app.sideband.config["dark_ui"]: if self.app.sideband.config["dark_ui"]:
intensity_msgs = intensity_msgs_dark_alt intensity_msgs = intensity_msgs_dark_alt
intensity_play = intensity_play_dark intensity_play = intensity_play_dark
intensity_delivered = intensity_delivered_alt_dark
mt_color = [1.0, 1.0, 1.0, 0.8] mt_color = [1.0, 1.0, 1.0, 0.8]
else: else:
intensity_msgs = intensity_msgs_light_alt intensity_msgs = intensity_msgs_light_alt
intensity_play = intensity_play_light intensity_play = intensity_play_light
intensity_delivered = intensity_msgs
mt_color = [1.0, 1.0, 1.0, 0.95] mt_color = [1.0, 1.0, 1.0, 0.95]
if not self.app.sideband.config["classic_message_colors"]: if not self.app.sideband.config["classic_message_colors"]:
@ -582,7 +590,7 @@ class Messages():
if m["source"] == self.app.sideband.lxmf_destination.hash: if m["source"] == self.app.sideband.lxmf_destination.hash:
if m["state"] == LXMF.LXMessage.DELIVERED: if m["state"] == LXMF.LXMessage.DELIVERED:
msg_color = mdc(c_delivered, intensity_msgs) msg_color = mdc(c_delivered, intensity_delivered)
heading_str = titlestr+"[b]Sent[/b] "+txstr+delivery_syms+"\n[b]State[/b] Delivered" heading_str = titlestr+"[b]Sent[/b] "+txstr+delivery_syms+"\n[b]State[/b] Delivered"
elif m["method"] == LXMF.LXMessage.PROPAGATED and m["state"] == LXMF.LXMessage.SENT: elif m["method"] == LXMF.LXMessage.PROPAGATED and m["state"] == LXMF.LXMessage.SENT: