* Updated to FuriString

* Build for Unleashed and Official firmware

Author: akopachov

application.fam

@@ -8,13 +8,15 @@ App(
         "gui",
         "cli",
         "dialogs",
-        "storage"
+        "storage",
+        "input", 
+        "notification"
     ],
     provides=["totp_start"],
     stack_size=2 * 1024,
     order=20,
     fap_category="Misc",
-    fap_icon="totp_10px.png",
+    fap_icon="totp_10px.png"
 )
 
 App(

scenes/add_new_token/totp_input_text.h

@@ -1,5 +1,4 @@
-#ifndef _TOTP_INPUT_TEXT_H_
-#define _TOTP_INPUT_TEXT_H_
+#pragma once
 
 #include <gui/gui.h>
 #include <gui/view.h>
@@ -37,5 +36,3 @@ InputTextSceneState* totp_input_text_activate(InputTextSceneContext* context);
 void totp_input_text_render(Canvas* const canvas, InputTextSceneState* text_input_state);
 bool totp_input_text_handle_event(PluginEvent* const event, InputTextSceneState* text_input_state);
 void totp_input_text_free(InputTextSceneState* state);
-
-#endif

scenes/add_new_token/totp_scene_add_new_token.c

@@ -1,13 +1,13 @@
 #include "totp_scene_add_new_token.h"
 #include "../../types/common.h"
-#include "../../lib/ui/constants.h"
+#include "../../services/ui/constants.h"
 #include "../scene_director.h"
 #include "totp_input_text.h"
 #include "../../types/token_info.h"
-#include "../../lib/list/list.h"
-#include "../../lib/base32/base32.h"
-#include "../../lib/config/config.h"
-#include "../../lib/ui/ui_controls.h"
+#include "../../services/list/list.h"
+#include "../../services/base32/base32.h"
+#include "../../services/config/config.h"
+#include "../../services/ui/ui_controls.h"
 #include "../generate_token/totp_scene_generate_token.h"
 
 #define TOKEN_ALGO_LIST_LENGTH 3

scenes/add_new_token/totp_scene_add_new_token.h

@@ -1,5 +1,4 @@
-#ifndef _TOTP_SCENE_ADD_NEW_TOKEN_H_
-#define _TOTP_SCENE_ADD_NEW_TOKEN_H_
+#pragma once
 
 #include <gui/gui.h>
 #include <furi.h>
@@ -17,5 +16,3 @@ void totp_scene_add_new_token_render(Canvas* const canvas, PluginState* plugin_s
 bool totp_scene_add_new_token_handle_event(PluginEvent* const event, PluginState* plugin_state);
 void totp_scene_add_new_token_deactivate(PluginState* plugin_state);
 void totp_scene_add_new_token_free(PluginState* plugin_state);
-
-#endif

scenes/authenticate/totp_scene_authenticate.c

@@ -1,9 +1,9 @@
 #include "totp_scene_authenticate.h"
 #include <dialogs/dialogs.h>
 #include "../../types/common.h"
-#include "../../lib/ui/icons.h"
-#include "../../lib/ui/constants.h"
-#include "../../lib/config/config.h"
+#include "../../services/ui/icons.h"
+#include "../../services/ui/constants.h"
+#include "../../services/config/config.h"
 #include "../scene_director.h"
 #include "../totp_scenes_enum.h"
 

scenes/authenticate/totp_scene_authenticate.h

@@ -1,5 +1,4 @@
-#ifndef _TOTP_SCENE_AUTHENTICATE_H_
-#define _TOTP_SCENE_AUTHENTICATE_H_
+#pragma once
 
 #include <gui/gui.h>
 #include <furi.h>
@@ -13,5 +12,3 @@ void totp_scene_authenticate_render(Canvas* const canvas, PluginState* plugin_st
 bool totp_scene_authenticate_handle_event(PluginEvent* const event, PluginState* plugin_state);
 void totp_scene_authenticate_deactivate(PluginState* plugin_state);
 void totp_scene_authenticate_free(PluginState* plugin_state);
-
-#endif

scenes/generate_token/totp_scene_generate_token.c

@@ -4,10 +4,10 @@
 #include "totp_scene_generate_token.h"
 #include "../../types/token_info.h"
 #include "../../types/common.h"
-#include "../../lib/ui/icons.h"
-#include "../../lib/ui/constants.h"
-#include "../../lib/totp/totp.h"
-#include "../../lib/config/config.h"
+#include "../../services/ui/icons.h"
+#include "../../services/ui/constants.h"
+#include "../../services/totp/totp.h"
+#include "../../services/config/config.h"
 #include "../scene_director.h"
 #include "../token_menu/totp_scene_token_menu.h"
 

scenes/generate_token/totp_scene_generate_token.h

@@ -1,5 +1,4 @@
-#ifndef _TOTP_SCENE_GENERATE_TOKEN_H_
-#define _TOTP_SCENE_GENERATE_TOKEN_H_
+#pragma once
 
 #include <gui/gui.h>
 #include <furi.h>
@@ -17,5 +16,3 @@ void totp_scene_generate_token_render(Canvas* const canvas, PluginState* plugin_
 bool totp_scene_generate_token_handle_event(PluginEvent* const event, PluginState* plugin_state);
 void totp_scene_generate_token_deactivate(PluginState* plugin_state);
 void totp_scene_generate_token_free(PluginState* plugin_state);
-
-#endif

scenes/scene_director.h

@@ -1,5 +1,4 @@
-#ifndef _SCENE_DIRECTOR_H_
-#define _SCENE_DIRECTOR_H_
+#pragma once
 
 #include <gui/gui.h>
 #include "../types/plugin_state.h"
@@ -12,5 +11,3 @@ void totp_scene_director_init_scenes(PluginState* const plugin_state);
 void totp_scene_director_render(Canvas* const canvas, PluginState* const plugin_state);
 void totp_scene_director_dispose(PluginState* const plugin_state);
 bool totp_scene_director_handle_event(PluginEvent* const event, PluginState* const plugin_state);
-
-#endif

scenes/token_menu/totp_scene_token_menu.c

@@ -1,11 +1,11 @@
 #include "totp_scene_token_menu.h"
 #include <gui/gui.h>
 #include <dialogs/dialogs.h>
-#include "../../lib/ui/ui_controls.h"
-#include "../../lib/ui/constants.h"
+#include "../../services/ui/ui_controls.h"
+#include "../../services/ui/constants.h"
 #include "../scene_director.h"
-#include "../../lib/config/config.h"
-#include "../../lib/list/list.h"
+#include "../../services/config/config.h"
+#include "../../services/list/list.h"
 #include "../../types/token_info.h"
 #include "../generate_token/totp_scene_generate_token.h"
 #include "../add_new_token/totp_scene_add_new_token.h"