upd counter

Author: xMasterX

apps_source_code/counter/application.fam

@@ -11,6 +11,6 @@ App(
     fap_icon_assets="icons",
     fap_author="@Krulknul",
     fap_weburl="https://github.com/Krulknul/dolphin-counter",
-    fap_version="1.2",
+    fap_version="1.3",
     fap_description="Simple counter",
 )

apps_source_code/counter/counter.c

@@ -3,23 +3,30 @@
 #include <input/input.h>
 #include <stdlib.h>
 #include <counter_icons.h>
+#include <notification/notification.h>
+#include <notification/notification_messages.h>
 
-#define MAX_COUNT 99
+#define MAX_COUNT 99999
+#define NUM_WIDTH 12
 #define BOXTIME 2
-#define BOXWIDTH 30
-#define MIDDLE_X 64 - BOXWIDTH / 2
-#define MIDDLE_Y 32 - BOXWIDTH / 2
+#define MIN_BOXWIDTH 30
+#define BOXHEIGHT 30
+#define MIDDLE_Y 32 - BOXHEIGHT / 2
+#define OFFSET_X 8
 #define OFFSET_Y 9
+#define VIBRO_TIME_MS 20
 
 typedef struct {
     FuriMessageQueue* input_queue;
     ViewPort* view_port;
     Gui* gui;
     FuriMutex** mutex;
+    NotificationApp* notifications;
 
     int count;
     bool pressed;
     int boxtimer;
+    bool vibro;
 } Counter;
 
 void state_free(Counter* c) {
@@ -33,7 +40,7 @@ void state_free(Counter* c) {
 
 static void input_callback(InputEvent* input_event, void* ctx) {
     Counter* c = ctx;
-    if(input_event->type == InputTypeShort) {
+    if(input_event->type == InputTypeShort || input_event->type == InputTypeLong) {
         furi_message_queue_put(c->input_queue, input_event, 0);
     }
 }
@@ -47,19 +54,25 @@ static void render_callback(Canvas* canvas, void* ctx) {
     canvas_draw_str_aligned(canvas, 64, 10, AlignCenter, AlignCenter, "Counter :)");
     canvas_set_font(canvas, FontBigNumbers);
 
-    char scount[5];
+    char scount[8];
+    snprintf(scount, sizeof(scount), "%d", c->count);
+    size_t cntr_len = strlen(scount);
+    size_t boxwidth = cntr_len * NUM_WIDTH + OFFSET_X;
+    if (boxwidth < MIN_BOXWIDTH) {
+        boxwidth = MIN_BOXWIDTH;
+    }
+    size_t middle_x = 64 - boxwidth / 2;
     if(c->pressed == true || c->boxtimer > 0) {
-        canvas_draw_rframe(canvas, MIDDLE_X, MIDDLE_Y + OFFSET_Y, BOXWIDTH, BOXWIDTH, 5);
+        canvas_draw_rframe(canvas, middle_x, MIDDLE_Y + OFFSET_Y, boxwidth, BOXHEIGHT, 5);
         canvas_draw_rframe(
-            canvas, MIDDLE_X - 1, MIDDLE_Y + OFFSET_Y - 1, BOXWIDTH + 2, BOXWIDTH + 2, 5);
+            canvas, middle_x - 1, MIDDLE_Y + OFFSET_Y - 1, boxwidth + 2, BOXHEIGHT + 2, 5);
         canvas_draw_rframe(
-            canvas, MIDDLE_X - 2, MIDDLE_Y + OFFSET_Y - 2, BOXWIDTH + 4, BOXWIDTH + 4, 5);
+            canvas, middle_x - 2, MIDDLE_Y + OFFSET_Y - 2, boxwidth + 4, BOXHEIGHT + 4, 5);
         c->pressed = false;
         c->boxtimer--;
     } else {
-        canvas_draw_rframe(canvas, MIDDLE_X, MIDDLE_Y + OFFSET_Y, BOXWIDTH, BOXWIDTH, 5);
+        canvas_draw_rframe(canvas, middle_x, MIDDLE_Y + OFFSET_Y, boxwidth, BOXHEIGHT, 5);
     }
-    snprintf(scount, sizeof(scount), "%d", c->count);
     canvas_draw_str_aligned(canvas, 64, 32 + OFFSET_Y, AlignCenter, AlignCenter, scount);
     furi_mutex_release(c->mutex);
 }
@@ -70,8 +83,10 @@ Counter* state_init() {
     c->view_port = view_port_alloc();
     c->gui = furi_record_open(RECORD_GUI);
     c->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+    c->notifications = furi_record_open(RECORD_NOTIFICATION);
     c->count = 0;
     c->boxtimer = 0;
+    c->vibro = false;
     view_port_input_callback_set(c->view_port, input_callback, c);
     view_port_draw_callback_set(c->view_port, render_callback, c);
     gui_add_view_port(c->gui, c->view_port, GuiLayerFullscreen);
@@ -81,25 +96,55 @@ Counter* state_init() {
 int32_t counterapp(void) {
     Counter* c = state_init();
 
-    while(1) {
-        InputEvent input;
+    InputEvent input;
+    for(bool processing = true; processing;) {
         while(furi_message_queue_get(c->input_queue, &input, FuriWaitForever) == FuriStatusOk) {
             furi_check(furi_mutex_acquire(c->mutex, FuriWaitForever) == FuriStatusOk);
 
-            if(input.key == InputKeyBack) {
-                furi_mutex_release(c->mutex);
-                state_free(c);
-                return 0;
-            } else if((input.key == InputKeyUp || input.key == InputKeyOk) && c->count < MAX_COUNT) {
-                c->pressed = true;
-                c->boxtimer = BOXTIME;
-                c->count++;
-            } else if(input.key == InputKeyDown && c->count != 0) {
-                c->pressed = true;
-                c->boxtimer = BOXTIME;
-                c->count--;
+            if(input.type == InputTypeShort) {
+                switch(input.key) {
+                    case InputKeyBack:
+                        processing = false;
+                        break;
+                    case InputKeyUp:
+                    case InputKeyOk:
+                        if (c->count < MAX_COUNT) {
+                            c->pressed = true;
+                            c->boxtimer = BOXTIME;
+                            c->count++;
+                            if (c->vibro) {
+                                notification_message(c->notifications, &sequence_set_vibro_on);
+                                furi_delay_ms(VIBRO_TIME_MS);
+                                notification_message(c->notifications, &sequence_reset_vibro);
+                            }
+                        }
+                        break;
+                    case InputKeyDown:
+                        if (c->count > 0) {
+                            c->pressed = true;
+                            c->boxtimer = BOXTIME;
+                            c->count--;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            } else if(input.type == InputTypeLong) {
+                switch(input.key) {
+                    case InputKeyBack:
+                        c->count = 0;
+                        break;
+                    case InputKeyOk:
+                        c->vibro = !c->vibro;
+                        break;
+                    default:
+                        break;
+                }
             }
             furi_mutex_release(c->mutex);
+            if(!processing) {
+                break;
+            }
             view_port_update(c->view_port);
         }
     }