Skip to content

Various UI/UX changes #4331

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

Open
xMasterX wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Various UI/UX changes #4331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions applications/main/nfc/helpers/protocol_support/felica/felica.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@ static void nfc_scene_read_success_on_enter_felica(NfcApp* instance) {
if(data->workflow_type == FelicaLite) {
bool all_unlocked = data->blocks_read == data->blocks_total;
furi_string_cat_printf(
temp_str,
"\e#%s\n",
all_unlocked ? "All Blocks Are Unlocked" : "Some Blocks Are Locked");
temp_str, "\e#%s\n", all_unlocked ? "All Blocks Unlocked" : "Some Blocks Locked");
nfc_render_felica_idm(data, NfcProtocolFormatTypeShort, temp_str);
uint8_t* ck_data = instance->felica_auth->card_key.data;
furi_string_cat_printf(temp_str, "Key:");
Expand Down
5 changes: 5 additions & 0 deletions applications/main/nfc/scenes/nfc_scene_slix_unlock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ void nfc_scene_slix_unlock_on_enter(void* context) {
instance->popup, "Hold card next\nto Flipper's back", 94, 27, AlignCenter, AlignTop);
view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewPopup);

notification_message(instance->notifications, &sequence_blink_start_yellow);

instance->poller = nfc_poller_alloc(instance->nfc, NfcProtocolSlix);
nfc_poller_start(instance->poller, nfc_scene_slix_unlock_worker_callback, instance);
}
Expand Down Expand Up @@ -67,4 +69,7 @@ void nfc_scene_slix_unlock_on_exit(void* context) {
nfc_poller_free(instance->poller);

popup_reset(instance->popup);

// Stop notifications
nfc_blink_stop(instance);
}
2 changes: 1 addition & 1 deletion applications/main/subghz/subghz_history.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ FlipperFormat* subghz_history_get_raw_data(SubGhzHistory* instance, uint16_t idx
bool subghz_history_get_text_space_left(SubGhzHistory* instance, FuriString* output) {
furi_assert(instance);
if(memmgr_get_free_heap() < SUBGHZ_HISTORY_FREE_HEAP) {
if(output != NULL) furi_string_printf(output, " Free heap LOW");
if(output != NULL) furi_string_printf(output, " RAM almost FULL");
return true;
}
if(instance->last_index_write == SUBGHZ_HISTORY_MAX) {
Expand Down
6 changes: 3 additions & 3 deletions applications/services/gui/elements.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ void elements_multiline_text_aligned(
furi_check(text);

size_t lines_count = 0;
size_t font_height = canvas_current_font_height(canvas);
size_t font_height = canvas_current_font_height(canvas) - 1;
FuriString* line;

/* go through text line by line and count lines */
Expand Down Expand Up @@ -384,7 +384,7 @@ void elements_multiline_text(Canvas* canvas, int32_t x, int32_t y, const char* t
furi_check(canvas);
furi_check(text);

size_t font_height = canvas_current_font_height(canvas);
size_t font_height = canvas_current_font_height(canvas) - 1;
FuriString* str;
str = furi_string_alloc();
const char* start = text;
Expand All @@ -407,7 +407,7 @@ void elements_multiline_text_framed(Canvas* canvas, int32_t x, int32_t y, const
furi_check(canvas);
furi_check(text);

size_t font_height = canvas_current_font_height(canvas);
size_t font_height = canvas_current_font_height(canvas) - 1;
size_t str_width = canvas_string_width(canvas, text);

// count \n's
Expand Down
2 changes: 1 addition & 1 deletion applications/services/gui/modules/widget_elements/widget_element_text_scroll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static void widget_element_text_scroll_draw(Canvas* canvas, WidgetElement* eleme
}
canvas_draw_str_aligned(
canvas, x, y, line->horizontal, AlignTop, furi_string_get_cstr(line->text));
y += params->leading_default;
y += params->leading_default - 1;
}
// Draw scroll bar
if(model->scroll_pos_total > 1) {
Expand Down