diff --git a/applications/external/barcode_gen/application.fam b/applications/external/barcode_gen/application.fam index 371e52c04..0564b785a 100644 --- a/applications/external/barcode_gen/application.fam +++ b/applications/external/barcode_gen/application.fam @@ -8,9 +8,9 @@ App( fap_category="Tools", fap_icon="images/barcode_10.png", fap_icon_assets="images", - fap_icon_assets_symbol="barcode_app", + fap_file_assets="barcode_encoding_files", fap_author="@Kingal1337", fap_weburl="https://github.com/Kingal1337/flipper-barcode-generator", - fap_version="1.0", + fap_version="1.1", fap_description="App allows you to display various barcodes on flipper screen", ) diff --git a/applications/external/barcode_gen/barcode_app.h b/applications/external/barcode_gen/barcode_app.h index 3150bff1f..bddc82235 100644 --- a/applications/external/barcode_gen/barcode_app.h +++ b/applications/external/barcode_gen/barcode_app.h @@ -23,20 +23,17 @@ #define BARCODE_HEIGHT 50 #define BARCODE_Y_START 3 -//the folder where the encodings are located -#define BARCODE_DATA_FILE_DIR_PATH EXT_PATH("apps_data/barcode_data") - //the folder where the codabar encoding table is located -#define CODABAR_DICT_FILE_PATH BARCODE_DATA_FILE_DIR_PATH "/codabar_encodings.txt" +#define CODABAR_DICT_FILE_PATH APP_ASSETS_PATH("codabar_encodings.txt") //the folder where the code 39 encoding table is located -#define CODE39_DICT_FILE_PATH BARCODE_DATA_FILE_DIR_PATH "/code39_encodings.txt" +#define CODE39_DICT_FILE_PATH APP_ASSETS_PATH("code39_encodings.txt") //the folder where the code 128 encoding table is located -#define CODE128_DICT_FILE_PATH BARCODE_DATA_FILE_DIR_PATH "/code128_encodings.txt" +#define CODE128_DICT_FILE_PATH APP_ASSETS_PATH("code128_encodings.txt") //the folder where the code 128 C encoding table is located -#define CODE128C_DICT_FILE_PATH BARCODE_DATA_FILE_DIR_PATH "/code128c_encodings.txt" +#define CODE128C_DICT_FILE_PATH APP_ASSETS_PATH("code128c_encodings.txt") //the folder where the user stores their barcodes #define DEFAULT_USER_BARCODES EXT_PATH("apps_data/barcodes") diff --git a/assets/resources/apps_data/barcode_data/codabar_encodings.txt b/applications/external/barcode_gen/barcode_encoding_files/codabar_encodings.txt similarity index 100% rename from assets/resources/apps_data/barcode_data/codabar_encodings.txt rename to applications/external/barcode_gen/barcode_encoding_files/codabar_encodings.txt diff --git a/assets/resources/apps_data/barcode_data/code128_encodings.txt b/applications/external/barcode_gen/barcode_encoding_files/code128_encodings.txt similarity index 100% rename from assets/resources/apps_data/barcode_data/code128_encodings.txt rename to applications/external/barcode_gen/barcode_encoding_files/code128_encodings.txt diff --git a/assets/resources/apps_data/barcode_data/code128c_encodings.txt b/applications/external/barcode_gen/barcode_encoding_files/code128c_encodings.txt similarity index 100% rename from assets/resources/apps_data/barcode_data/code128c_encodings.txt rename to applications/external/barcode_gen/barcode_encoding_files/code128c_encodings.txt diff --git a/assets/resources/apps_data/barcode_data/code39_encodings.txt b/applications/external/barcode_gen/barcode_encoding_files/code39_encodings.txt similarity index 100% rename from assets/resources/apps_data/barcode_data/code39_encodings.txt rename to applications/external/barcode_gen/barcode_encoding_files/code39_encodings.txt