jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-25 14:50:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated message colors

Browse Source
This commit is contained in:
Mark Qvist 2022-10-03 01:36:21 +02:00
parent 25878a7405
commit c4f863d8ca
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbapp/ui/layouts.py
View File

@ -988,7 +988,7 @@ MDNavigationLayout:
on_release: root.ids.screen_manager.app.quit_action(self) on_release: root.ids.screen_manager.app.quit_action(self)
<ListLXMessageCard>: <ListLXMessageCard>:
style: "elevated" style: "filled"
elevation: 2 elevation: 2
padding: dp(8) padding: dp(8)
radius: [dp(4), dp(4), dp(4), dp(4)] radius: [dp(4), dp(4), dp(4), dp(4)]
@ -1003,8 +1003,8 @@ MDNavigationLayout:
MDIconButton: MDIconButton:
id: msg_submenu id: msg_submenu
icon: "dots-vertical" icon: "dots-vertical"
theme_text_color: 'Custom' # theme_text_color: 'Custom'
text_color: rgba(255,255,255,230) # text_color: rgba(255,255,255,216)
pos: pos:
root.width - (self.width + root.padding[0] + dp(4)), root.height - (self.height + root.padding[0] + dp(4)) root.width - (self.width + root.padding[0] + dp(4)), root.height - (self.height + root.padding[0] + dp(4))
@ -1013,8 +1013,8 @@ MDNavigationLayout:
markup: True markup: True
text: root.heading text: root.heading
adaptive_size: True adaptive_size: True
theme_text_color: 'Custom' # theme_text_color: 'Custom'
text_color: rgba(255,255,255,230) # text_color: rgba(255,255,255,100)
pos: 0, root.height - (self.height + root.padding[0] + dp(8)) pos: 0, root.height - (self.height + root.padding[0] + dp(8))
MDLabel: MDLabel:
@ -1023,8 +1023,8 @@ MDNavigationLayout:
# adaptive_size: True # adaptive_size: True
size_hint_y: None size_hint_y: None
text_size: self.width, None text_size: self.width, None
theme_text_color: 'Custom' # theme_text_color: 'Custom'
text_color: rgba(255,255,255,230) # text_color: rgba(255,255,255,216)
height: self.texture_size[1] height: self.texture_size[1]
<MsgSync> <MsgSync>

14
sbapp/ui/messages.py
View File

@ -6,7 +6,8 @@ from kivy.metrics import dp
from kivy.core.clipboard import Clipboard from kivy.core.clipboard import Clipboard
from kivymd.uix.card import MDCard from kivymd.uix.card import MDCard
from kivymd.uix.menu import MDDropdownMenu from kivymd.uix.menu import MDDropdownMenu
from kivymd.uix.behaviors import CommonElevationBehavior from kivymd.uix.behaviors import RoundedRectangularElevationBehavior, FakeRectangularElevationBehavior
# from kivymd.uix.behaviors import CommonElevationBehavior
from kivy.properties import StringProperty, BooleanProperty from kivy.properties import StringProperty, BooleanProperty
from kivy.uix.gridlayout import GridLayout from kivy.uix.gridlayout import GridLayout
from kivy.uix.boxlayout import BoxLayout from kivy.uix.boxlayout import BoxLayout
@ -21,7 +22,8 @@ else:
from .helpers import ts_format, mdc from .helpers import ts_format, mdc
from .helpers import color_received, color_delivered, color_propagated, color_failed, color_unknown, intensity_msgs_dark, intensity_msgs_light from .helpers import color_received, color_delivered, color_propagated, color_failed, color_unknown, intensity_msgs_dark, intensity_msgs_light
class ListLXMessageCard(MDCard, CommonElevationBehavior): # class ListLXMessageCard(MDCard, CommonElevationBehavior):
class ListLXMessageCard(MDCard, FakeRectangularElevationBehavior):
text = StringProperty() text = StringProperty()
heading = StringProperty() heading = StringProperty()
@ -98,8 +100,10 @@ class Messages():
def update_widget(self): def update_widget(self):
if self.app.sideband.config["dark_ui"]: if self.app.sideband.config["dark_ui"]:
intensity_msgs = intensity_msgs_dark intensity_msgs = intensity_msgs_dark
mt_color = [1.0, 1.0, 1.0, 0.8]
else: else:
intensity_msgs = intensity_msgs_light intensity_msgs = intensity_msgs_light
mt_color = [1.0, 1.0, 1.0, 0.95]
for m in self.messages: for m in self.messages:
if not m["hash"] in self.added_item_hashes: if not m["hash"] in self.added_item_hashes:
@ -142,6 +146,12 @@ class Messages():
) )
item.sb_uid = m["hash"] item.sb_uid = m["hash"]
item.m = m item.m = m
item.ids.heading_text.theme_text_color = "Custom"
item.ids.heading_text.text_color = mt_color
item.ids.content_text.theme_text_color = "Custom"
item.ids.content_text.text_color = mt_color
item.ids.msg_submenu.theme_text_color = "Custom"
item.ids.msg_submenu.text_color = mt_color
def gen_del(mhash, item): def gen_del(mhash, item):
def x(): def x():