Temporarily backport app updates from apps repo

This commit is contained in:
Willy-JL
2023-11-12 11:06:02 +00:00
parent 79e7f491fe
commit e309fa8a88
1498 changed files with 1325977 additions and 20227 deletions

View File

@@ -8,7 +8,6 @@
#include "tamalib/tamalib.h"
#include "tama.h"
#include "compiled/assets_icons.h"
#include <assets_icons.h>
TamaApp* g_ctx;
FuriMutex* g_state_mutex;
@@ -837,9 +836,9 @@ int32_t tama_p1_app(void* p) {
btn_state_t tama_btn_state = 0; // BTN_STATE_RELEASED is 0
if(in_menu) {
// if(menu_cursor == 2 &&
// (event.input.key == InputKeyUp || event.input.key == InputKeyDown)) {
// tama_btn_state = BTN_STATE_RELEASED;
// if(menu_cursor >= 2 &&
// (event.input.key == InputKeyUp || event.input.key == InputKeyDown)) {
// tama_btn_state = BTN_STATE_RELEASED;
// }
if(event.input.key == InputKeyBack) {
tama_btn_state = BTN_STATE_RELEASED;
@@ -1135,7 +1134,7 @@ int32_t tama_p1_app(void* p) {
break;
}
}
} else { // out of menu // TODO: clean up code -.-
} else { // out of menu
if(event.input.key == InputKeyBack && event.input.type == InputTypeLong) {
if(speed != 1) {
speed = 1;