diff --git a/project/app.h b/project/backend/app.h similarity index 63% rename from project/app.h rename to project/backend/app.h index 83c8b23..341329d 100644 --- a/project/app.h +++ b/project/backend/app.h @@ -4,5 +4,6 @@ // Constants #define TAG "FlippyPass" +#define PATH "/ext/apps_assets/flippypass/user.dat" #endif \ No newline at end of file diff --git a/project/backend/pass.c b/project/backend/pass.c new file mode 100644 index 0000000..95120f5 --- /dev/null +++ b/project/backend/pass.c @@ -0,0 +1,32 @@ +// Header +#include "pass.h" + +// Constructors +password* pass_create(char* name, char* user, char* phrase, int folder) { + // Creating a new instance of a password + password* result = malloc(sizeof(password)); + + // Setting data + result->name = name; + result->user = user; + result->phrase = phrase; + result->folder = folder; + + // Returning result + return result; +} +password* pass_load(char* path) { + // Creating a new instance of a password + password* result = malloc(sizeof(password)); + + // Not using path right now + UNUSED(path); + + // Return Result + return result; +} + +// Functions +void pass_delete(password* pass){ + free(pass); +} \ No newline at end of file diff --git a/project/backend/pass.h b/project/backend/pass.h new file mode 100644 index 0000000..391edf6 --- /dev/null +++ b/project/backend/pass.h @@ -0,0 +1,24 @@ +// Define Once +#ifndef H_PASS +#define H_PASS + +// Libraries +#include + +// Structures +typedef struct { + char* name; + char* user; + char* phrase; + + int folder; +} password; + +// Constructors +password* pass_create(char* name, char* user, char* phrase, int folder); +password* pass_load(char* path); + +// Functions +void pass_delete(password* pass); + +#endif \ No newline at end of file diff --git a/project/ui.c b/project/backend/ui.c similarity index 79% rename from project/ui.c rename to project/backend/ui.c index 653c005..24e82fc 100644 --- a/project/ui.c +++ b/project/backend/ui.c @@ -76,6 +76,9 @@ void ui_draw(Canvas* canvas, void* ctx) { case 1: // About Me ui_p_about(canvas); break; + case 2: // Create Password + ui_p_view(canvas, manager); + break; } } void ui_p_mainmenu(Canvas* canvas, uiManager* manager) { @@ -111,6 +114,9 @@ void ui_p_mainmenu(Canvas* canvas, uiManager* manager) { case Ok: switch(manager->selection) { + case 0: // View Passwords + manager->page = 2; + break; case 3: // About Me manager->page = 1; break; @@ -144,6 +150,40 @@ void ui_p_about(Canvas* canvas) { canvas_set_font(canvas, FontSecondary); canvas_draw_str(canvas, 3, 32, "Manager for the Flipper-Zero."); } +void ui_p_view(Canvas* canvas, uiManager* manager){ + canvas_set_font(canvas, FontPrimary); + canvas_draw_str(canvas, 2, 11, "FlippyPass"); + + /* canvas_set_font(canvas, FontSecondary); + canvas_draw_str(canvas, 15, 23, "Apple"); + + canvas_set_font(canvas, FontSecondary); + canvas_draw_str(canvas, 15, 33, "Microsoft"); + + canvas_set_font(canvas, FontSecondary); + canvas_draw_str(canvas, 15, 43, "Google"); + + canvas_set_font(canvas, FontSecondary); + canvas_draw_str(canvas, 15, 53, "Facebook"); */ + + if (manager->press_used) { + manager->press_used = false; + + switch (manager->input) { + case Up: + break; + case Down: + break; + case Ok: + break; + default: + break; + } + } + + canvas_set_font(canvas, FontSecondary); + canvas_draw_str(canvas, 106, 62, "1/1"); +} void ui_delete(uiManager* manager) { view_port_enabled_set(manager->canvas, false); diff --git a/project/ui.h b/project/backend/ui.h similarity index 90% rename from project/ui.h rename to project/backend/ui.h index 203dfcd..aaa10df 100644 --- a/project/ui.h +++ b/project/backend/ui.h @@ -8,6 +8,7 @@ #include #include "app.h" +#include "pass.h" // Structures typedef struct { @@ -40,6 +41,7 @@ void ui_input(InputEvent* event, void* ctx); void ui_draw(Canvas* canvas, void* ctx); void ui_p_mainmenu(Canvas* canvas, uiManager* manager); void ui_p_about(Canvas* canvas); +void ui_p_view(Canvas* canvas, uiManager* manager); void ui_delete(uiManager* manager); diff --git a/project/flippypass.c b/project/flippypass.c index c0a13de..c7cdaf9 100644 --- a/project/flippypass.c +++ b/project/flippypass.c @@ -1,7 +1,7 @@ // Libraries #include -#include "ui.h" +#include "backend/ui.h" // Entry Point int32_t flippypass_app(void* p) {