From 6f91fa42f07adf944692206c8c68639893086f92 Mon Sep 17 00:00:00 2001 From: DerSkythe Date: Sun, 25 Sep 2022 18:26:10 +0400 Subject: [PATCH] Added additional graphic decorations --- .../subbrute/views/subbrute_attack_view.c | 64 +++++++++++++------ .../subbrute/views/subbrute_main_view.c | 40 +++++++++--- 2 files changed, 75 insertions(+), 29 deletions(-) diff --git a/applications/plugins/subbrute/views/subbrute_attack_view.c b/applications/plugins/subbrute/views/subbrute_attack_view.c index 395e4b06e..ca5f6981d 100644 --- a/applications/plugins/subbrute/views/subbrute_attack_view.c +++ b/applications/plugins/subbrute/views/subbrute_attack_view.c @@ -6,6 +6,7 @@ #include #include #include +#include #define TAG "SubBruteAttackView" @@ -21,6 +22,7 @@ typedef struct { uint64_t max_value; uint64_t current_step; bool is_attacking; + IconAnimation* icon; } SubBruteAttackViewModel; void subbrute_attack_view_set_callback( @@ -75,6 +77,8 @@ bool subbrute_attack_view_input(InputEvent* event, void* context) { with_view_model( instance->view, (SubBruteAttackViewModel * model) { model->is_attacking = true; + icon_animation_stop(model->icon); + icon_animation_start(model->icon); return true; }); instance->callback(SubBruteCustomEventTypeTransmitStarted, instance->context); @@ -135,6 +139,8 @@ bool subbrute_attack_view_input(InputEvent* event, void* context) { with_view_model( instance->view, (SubBruteAttackViewModel * model) { model->is_attacking = false; + icon_animation_stop(model->icon); + icon_animation_start(model->icon); return true; }); instance->callback(SubBruteCustomEventTypeTransmitNotStarted, instance->context); @@ -150,6 +156,14 @@ SubBruteAttackView* subbrute_attack_view_alloc() { instance->view = view_alloc(); view_allocate_model(instance->view, ViewModelTypeLocking, sizeof(SubBruteAttackViewModel)); view_set_context(instance->view, instance); + + with_view_model( + instance->view, (SubBruteAttackViewModel * model) { + model->icon = icon_animation_alloc(&A_Sub1ghz_14); + view_tie_icon_animation(instance->view, model->icon); + return false; + }); + view_set_draw_callback(instance->view, (ViewDrawCallback)subbrute_attack_view_draw); view_set_input_callback(instance->view, subbrute_attack_view_input); view_set_enter_callback(instance->view, subbrute_attack_view_enter); @@ -176,6 +190,12 @@ void subbrute_attack_view_free(SubBruteAttackView* instance) { #endif subbrute_worker_free(instance->worker); + with_view_model( + instance->view, (SubBruteAttackViewModel * model) { + icon_animation_free(model->icon); + return false; + }); + view_free(instance->view); free(instance); } @@ -228,6 +248,11 @@ void subbrute_attack_view_init_values( model->index = index; model->current_step = current_step; model->is_attacking = is_attacking; + if(is_attacking) { + icon_animation_start(model->icon); + } else { + icon_animation_stop(model->icon); + } return true; }); } @@ -282,6 +307,12 @@ void subbrute_attack_view_exit(void* context) { #ifdef FURI_DEBUG FURI_LOG_D(TAG, "subbrute_attack_view_exit"); #endif + with_view_model( + instance->view, (SubBruteAttackViewModel * model) { + icon_animation_stop(model->icon); + return false; + }); + // Just stop, make free in free method subbrute_worker_stop(instance->worker); } @@ -371,35 +402,30 @@ void subbrute_attack_view_draw(Canvas* canvas, void* context) { canvas_draw_str_aligned(canvas, 64, 17, AlignCenter, AlignTop, buffer); canvas_set_font(canvas, FontSecondary); - // Progress bar - // Resolution: 128x64 px - if (model->is_attacking) { - float progress_value = (float)model->current_step / model->max_value; - elements_progress_bar(canvas, 8, 37, 110, progress_value > 1 ? 1 : progress_value); - } else { + if(!model->is_attacking) { canvas_set_color(canvas, ColorBlack); canvas_set_font(canvas, FontSecondary); canvas_draw_str_aligned(canvas, 64, 44, AlignCenter, AlignBottom, attack_name); - } - // Selected attack type - // const char* attack_name = NULL; - // attack_name = subbrute_get_menu_name(model->index); - // - // canvas_set_font(canvas, FontSecondary); - // if(attack_name) { - // snprintf(buffer, sizeof(buffer), "%s", attack_name); - // } else { - // snprintf(buffer, sizeof(buffer), "%s", "Unknown"; - // } - // canvas_draw_str(canvas, 9, 42, buffer); - if(!model->is_attacking) { elements_button_left(canvas, "-1"); elements_button_right(canvas, "+1"); elements_button_center(canvas, "Start"); elements_button_top_left(canvas, "Save"); elements_button_top_right(canvas, "Resend"); } else { + // canvas_draw_icon_animation + const uint8_t icon_h_offset = 0; + const uint8_t icon_width_with_offset = model->icon->icon->width + icon_h_offset; + const uint8_t icon_v_offset = model->icon->icon->height; // + vertical_offset; + const uint8_t x = canvas_width(canvas); + const uint8_t y = canvas_height(canvas); + canvas_draw_icon_animation( + canvas, x - icon_width_with_offset, y - icon_v_offset, model->icon); + // Progress bar + // Resolution: 128x64 px + float progress_value = (float)model->current_step / model->max_value; + elements_progress_bar(canvas, 8, 37, 110, progress_value > 1 ? 1 : progress_value); + elements_button_center(canvas, "Stop"); } } diff --git a/applications/plugins/subbrute/views/subbrute_main_view.c b/applications/plugins/subbrute/views/subbrute_main_view.c index e1fc1a91b..968ec0733 100644 --- a/applications/plugins/subbrute/views/subbrute_main_view.c +++ b/applications/plugins/subbrute/views/subbrute_main_view.c @@ -3,6 +3,7 @@ #include #include +#include "assets_icons.h" #include #define STATUS_BAR_Y_SHIFT 14 @@ -35,7 +36,10 @@ void subbrute_main_view_draw(Canvas* canvas, SubBruteMainViewModel* model) { // Title canvas_set_font(canvas, FontPrimary); + canvas_draw_box(canvas, 0, 0, canvas_width(canvas), STATUS_BAR_Y_SHIFT); + canvas_invert_color(canvas); canvas_draw_str_aligned(canvas, 64, 2, AlignCenter, AlignTop, "Sub-GHz Bruteforcer"); + canvas_invert_color(canvas); // Menu canvas_set_color(canvas, ColorBlack); @@ -53,14 +57,33 @@ void subbrute_main_view_draw(Canvas* canvas, SubBruteMainViewModel* model) { const char* str = subbrute_get_menu_name(position); if(m->index == position) { canvas_draw_str_aligned( - canvas, 64, 9 + (item_position * item_height) + STATUS_BAR_Y_SHIFT, AlignCenter, AlignCenter, str); - elements_frame(canvas, 1, 2 + (item_position * item_height) + STATUS_BAR_Y_SHIFT, 125, 15); + canvas, + 64, + 9 + (item_position * item_height) + STATUS_BAR_Y_SHIFT, + AlignCenter, + AlignCenter, + str); + elements_frame( + canvas, 1, 1 + (item_position * item_height) + STATUS_BAR_Y_SHIFT, 125, 15); } else { canvas_draw_str_aligned( - canvas, 64, 9 + (item_position * item_height) + STATUS_BAR_Y_SHIFT, AlignCenter, AlignCenter, str); + canvas, + 64, + 9 + (item_position * item_height) + STATUS_BAR_Y_SHIFT, + AlignCenter, + AlignCenter, + str); } } } + + elements_scrollbar_pos( + canvas, + canvas_width(canvas), + STATUS_BAR_Y_SHIFT + 2, + canvas_height(canvas) - STATUS_BAR_Y_SHIFT, + m->index, + SubBruteAttackTotalCount); } bool subbrute_main_view_input(InputEvent* event, void* context) { @@ -102,7 +125,7 @@ bool subbrute_main_view_input(InputEvent* event, void* context) { ret = true; consumed = true; } - if (ret) { + if(ret) { model->window_position = model->index; if(model->window_position > 0) { model->window_position -= 1; @@ -113,8 +136,7 @@ bool subbrute_main_view_input(InputEvent* event, void* context) { } else { if(model->window_position >= (SubBruteAttackTotalCount - items_on_screen)) { - model->window_position = - (SubBruteAttackTotalCount - items_on_screen); + model->window_position = (SubBruteAttackTotalCount - items_on_screen); } } } @@ -212,10 +234,8 @@ void subbrute_main_view_set_index(SubBruteMainView* instance, uint8_t idx) { if(SubBruteAttackTotalCount <= items_on_screen) { model->window_position = 0; } else { - if(model->window_position >= - (SubBruteAttackTotalCount - items_on_screen)) { - model->window_position = - (SubBruteAttackTotalCount - items_on_screen); + if(model->window_position >= (SubBruteAttackTotalCount - items_on_screen)) { + model->window_position = (SubBruteAttackTotalCount - items_on_screen); } }