Closing #165 (#166)

Author: akopachov

application.fam

@@ -15,7 +15,7 @@ App(
     ],
     stack_size=2 * 1024,
     order=20,
-    fap_version="2.23",
+    fap_version="2.3",
     fap_author="Alexander Kopachov (@akopachov)",
     fap_description="Software-based TOTP authenticator for Flipper Zero device",
     fap_weburl="https://github.com/akopachov/flipper-zero_authenticator",
@@ -38,5 +38,8 @@ App(
         Lib(
             name="roll_value",
         ),
+        Lib(
+            name="fonts",
+        ),
     ],
 )

features_config.h

@@ -34,22 +34,3 @@
 #ifndef TOTP_TARGET_FIRMWARE
 #define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_OFFICIAL_STABLE
 #endif
-
-// List of available font for TOTP code
-#define TOTP_FONT_MODENINE (1)
-#define TOTP_FONT_REDHATMONO (2)
-#define TOTP_FONT_BEDSTEAD (3)
-#define TOTP_FONT_ZECTOR (4)
-#define TOTP_FONT_712SERIF (5)
-#define TOTP_FONT_GRAPH35PIX (6)
-#define TOTP_FONT_KARMAFUTURE (7)
-#define TOTP_FONT_FUNCLIMBING (8)
-#define TOTP_FONT_DPCOMIC (9)
-#define TOTP_FONT_PIXELFLAG (10)
-
-// End of list
-
-// Active font for TOTP codes
-#ifndef TOTP_FONT
-#define TOTP_FONT TOTP_FONT_MODENINE
-#endif

ui/fonts/712serif/712serif.c lib/fonts/712serif/712serif.cui/fonts/712serif/712serif.c renamed to lib/fonts/712serif/712serif.c

@@ -931,6 +931,7 @@ const FONT_CHAR_INFO _712Serif_24ptDescriptors[] = {
 
 /* Font information for 7:12 Serif 24pt */
 const FONT_INFO _712Serif_24ptFontInfo = {
+    "712 Serif",
     14, /*  Character height */
     '-', /*  Start character */
     'Y', /*  End character */

ui/fonts/712serif/712serif.h lib/fonts/712serif/712serif.hui/fonts/712serif/712serif.h renamed to lib/fonts/712serif/712serif.h

@@ -0,0 +1,23 @@
+#include "available_fonts.h"
+#include "712serif/712serif.h"
+#include "bedstead/bedstead.h"
+#include "dpcomic/dpcomic.h"
+#include "funclimbing/funclimbing.h"
+#include "graph35pix/graph35pix.h"
+#include "karma_future/karma_future.h"
+#include "mode_nine/mode_nine.h"
+#include "pixelflag/pixelflag.h"
+#include "redhat_mono/redhat_mono.h"
+#include "zector/zector.h"
+
+const FONT_INFO* const available_fonts[AVAILABLE_FONTS_COUNT] = {
+    &modeNine_15ptFontInfo,
+    &_712Serif_24ptFontInfo,
+    &bedstead_17ptFontInfo,
+    &dPComic_18ptFontInfo,
+    &funclimbingDemo_18ptFontInfo,
+    &graph35pix_12ptFontInfo,
+    &karmaFuture_14ptFontInfo,
+    &pixelFlag_18ptFontInfo,
+    &redHatMono_16ptFontInfo,
+    &zector_18ptFontInfo};

lib/fonts/available_fonts.c

@@ -0,0 +1,7 @@
+#pragma once
+
+#include "font_info.h"
+
+#define AVAILABLE_FONTS_COUNT (10)
+
+extern const FONT_INFO* const available_fonts[AVAILABLE_FONTS_COUNT];

lib/fonts/available_fonts.h

@@ -1047,6 +1047,7 @@ const FONT_CHAR_INFO bedstead_17ptDescriptors[] = {
 
 /* Font information for Bedstead 17pt */
 const FONT_INFO bedstead_17ptFontInfo = {
+    "Bedstead",
     16, /*  Character height */
     '-', /*  Start character */
     'Y', /*  End character */

ui/fonts/bedstead/bedstead.c lib/fonts/bedstead/bedstead.cui/fonts/bedstead/bedstead.c renamed to lib/fonts/bedstead/bedstead.c

@@ -1105,6 +1105,7 @@ const FONT_CHAR_INFO dPComic_18ptDescriptors[] = {
 
 /* Font information for DPComic 18pt */
 const FONT_INFO dPComic_18ptFontInfo = {
+    "DP Comic",
     17, /*  Character height */
     '-', /*  Start character */
     'Y', /*  End character */