Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add extended latin (polish) and cyrillic font glyphs #13

Merged
merged 18 commits into from
Nov 8, 2024
Merged

feat: Add extended latin (polish) and cyrillic font glyphs #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3beeb76
added extended latin (polish) and cyrillic
mverch67 Oct 17, 2024
a208d6b
update traceRoute request
mverch67 Oct 18, 2024
c635257
revert commit (should have gone into master)
mverch67 Oct 18, 2024
9939a95
update fonts
mverch67 Oct 18, 2024
e47e674
Add initial Russian language translation
droberin Oct 20, 2024
590638b
Add initial Russian language translation
droberin Oct 20, 2024
9898e46
Add Russian translation (fixed pre-shared key)
droberin Oct 21, 2024
e797e12
Add theme names translation
droberin Oct 21, 2024
2046f62
Merge pull request #14 from droberin/feature/i18n-russian
mverch67 Oct 21, 2024
8182ea9
update fonts (recent ones got overwritten)
mverch67 Oct 26, 2024
c5bd0f5
Merge branch 'master' into cyrillic
mverch67 Nov 4, 2024
e7dc200
Merge branch 'master' into cyrillic
mverch67 Nov 7, 2024
d0dbb3d
fix trunk fmt
mverch67 Nov 7, 2024
08da515
eez font generation & updates
mverch67 Nov 8, 2024
3125f23
add new strings to ru.xml
mverch67 Nov 8, 2024
f02825c
trunk fmt
mverch67 Nov 8, 2024
1e495b9
fix trunk
mverch67 Nov 8, 2024
634f253
update translation
mverch67 Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion generated/ui_320x240/fonts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@

#include "lvgl.h"

extern const lv_font_t ui_font_montserrat_14;
extern const lv_font_t ui_font_montserrat_20;
extern const lv_font_t ui_font_montserrat_16;
extern const lv_font_t ui_font_montserrat_14;
extern const lv_font_t ui_font_montserrat_12;


Expand Down
43 changes: 33 additions & 10 deletions generated/ui_320x240/screens.c
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions generated/ui_320x240/styles.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ void init_style_panel_style_MAIN_DEFAULT(lv_style_t *style) {
lv_style_set_bg_color(style, lv_color_hex(0xfff4f4f0));
lv_style_set_shadow_color(style, lv_color_hex(0xffe0e0e0));
lv_style_set_radius(style, 0);
lv_style_set_text_font(style, &ui_font_montserrat_14);
};

lv_style_t *get_style_panel_style_MAIN_DEFAULT() {
Expand Down Expand Up @@ -543,12 +544,28 @@ lv_style_t *get_style_main_screen_style_MAIN_DEFAULT() {
return style;
};

void init_style_main_screen_style_MAIN_PRESSED(lv_style_t *style) {
lv_style_set_text_font(style, &ui_font_montserrat_14);
};

lv_style_t *get_style_main_screen_style_MAIN_PRESSED() {
static lv_style_t *style;
if (!style) {
style = lv_malloc(sizeof(lv_style_t));
lv_style_init(style);
init_style_main_screen_style_MAIN_PRESSED(style);
}
return style;
};

void add_style_main_screen_style(lv_obj_t *obj) {
lv_obj_add_style(obj, get_style_main_screen_style_MAIN_DEFAULT(), LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_add_style(obj, get_style_main_screen_style_MAIN_PRESSED(), LV_PART_MAIN | LV_STATE_PRESSED);
};

void remove_style_main_screen_style(lv_obj_t *obj) {
lv_obj_remove_style(obj, get_style_main_screen_style_MAIN_DEFAULT(), LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_remove_style(obj, get_style_main_screen_style_MAIN_PRESSED(), LV_PART_MAIN | LV_STATE_PRESSED);
};

//
Expand Down
Loading