diff --git a/mydevoirs/constants.py b/mydevoirs/constants.py index abf0042..9a7e0ff 100644 --- a/mydevoirs/constants.py +++ b/mydevoirs/constants.py @@ -40,7 +40,19 @@ "titre_jour": [0.2, 0.4, 0, 1], "progression": [0.92, 0.008, 0.008, 1], "spinner_text_color": [0, 0, 0, 1], + "police": str(BASE_DIR / "data" / "fonts" / "Verdana.ttf") }, + "standard-dys": { + "fond": [130 / 255, 134 / 255, 138 / 255, 1], + "card": [98 / 255, 105 / 255, 114 / 236, 1], + "card_entete": [83 / 255, 93 / 255, 105 / 236, 1], + "card_texte_entete": [0, 0, 0, 1], + "card_texte_size": "16sp", + "titre_jour": [0.2, 0.4, 0, 1], + "progression": [0.92, 0.008, 0.008, 1], + "spinner_text_color": [0, 0, 0, 1], + "police": str(BASE_DIR / "data" / "fonts" / "OpenDyslexic-Regular.ttf") + }, "contrast": { "fond": [130 / 255, 134 / 255, 138 / 255, 1], "card": [98 / 255, 105 / 255, 114 / 236, 1], @@ -50,5 +62,17 @@ "titre_jour": [0.2, 0.4, 0, 1], "progression": [1, 1, 1, 1], "spinner_text_color": [0, 0, 0, 1], + "police": str(BASE_DIR / "data" / "fonts" / "Verdana.ttf") + }, + "contrast-dys": { + "fond": [130 / 255, 134 / 255, 138 / 255, 1], + "card": [98 / 255, 105 / 255, 114 / 236, 1], + "card_texte_entete": [1, 1, 1, 1], + "card_entete": [0, 0, 0, 1], + "card_texte_size": "18sp", + "titre_jour": [0.2, 0.4, 0, 1], + "progression": [1, 1, 1, 1], + "spinner_text_color": [0, 0, 0, 1], + "police": str(BASE_DIR / "data" / "fonts" / "OpenDyslexic-Regular.ttf") }, } diff --git a/mydevoirs/data/fonts/OpenDyslexic-Regular.ttf b/mydevoirs/data/fonts/OpenDyslexic-Regular.ttf new file mode 100644 index 0000000..e784934 Binary files /dev/null and b/mydevoirs/data/fonts/OpenDyslexic-Regular.ttf differ diff --git a/mydevoirs/datas.py b/mydevoirs/datas.py index ad3e363..c3c351c 100644 --- a/mydevoirs/datas.py +++ b/mydevoirs/datas.py @@ -27,10 +27,8 @@ "icon_aide": "qmark.png", "icon_colorchooser": "colorchooser.png", "icon_arrowmove": "arrowmove.png", - "font_base": "Verdana.ttf", } - def get_datas(): res = {} for k, v in DATAS.items(): diff --git a/mydevoirs/itemwidget.kv b/mydevoirs/itemwidget.kv index 5437edf..dfe953f 100644 --- a/mydevoirs/itemwidget.kv +++ b/mydevoirs/itemwidget.kv @@ -20,7 +20,7 @@ size_hint_x: 0.4 # pragma: no cover text_size: (self.width, self.height) font_size: sp(14) - font_name: datas['font_base'] + font_name: app.theme['police'] valign: 'middle' # pragma: no cover halign: 'center' # pragma: no cover shorten: True @@ -34,7 +34,7 @@ valign: 'top' # pragma: no cover multiline: True write_tab: False - font_name: datas['font_base'] + font_name: app.theme['police'] font_size: sp(14) # height: root.height * (len(self._lines)+1) @@ -70,6 +70,7 @@ #background_color: root.color background_normal: '' # pragma: no cover color: (0,0,0) # pragma: no cover + font_name: app.theme['police'] : auto_width: False diff --git a/mydevoirs/mydevoirs.kv b/mydevoirs/mydevoirs.kv index ac9b11b..75eff38 100644 --- a/mydevoirs/mydevoirs.kv +++ b/mydevoirs/mydevoirs.kv @@ -77,13 +77,13 @@ Label: id: titre_jour text: root.nice_date - font_name: datas['font_base'] + font_name: app.theme['police'] font_size: app.theme['card_texte_size'] color: app.theme['card_texte_entete'] Label: text: root.progression - font_name: datas['font_base'] + font_name: app.theme['police'] font_size: app.theme['card_texte_size'] size_hint_x: 0.3 # pragma: no cover color: app.theme['fond'] if root.progression[0] == root.progression[2] else app.theme['progression'] @@ -116,7 +116,7 @@ size_hint_y: None height: dp(30) spacing: dp(5) - font_name: datas['font_base'] + font_name: app.theme['police'] font_size: sp(16) canvas.before: Color: