adolforeyna/tactility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

App improvements (#103)

Browse Source
This commit is contained in:
Ken Van Hoeylandt
2024-12-03 23:13:59 +01:00
committed by GitHub
parent c7314546fe
commit f31c7f00ae
23 changed files with 246 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactility/Source/app/files/Files.cpp
+38 -37
View File
@@ -23,7 +23,7 @@ namespace tt::app::files {
* @param extension the extension to look for, including the period symbol, in lower case
* @return true on match
*/
static bool has_file_extension(const char* path, const char* extension) {
static bool hasFileExtension(const char* path, const char* extension) {
size_t postfix_len = strlen(extension);
size_t base_len = strlen(path);
if (base_len < postfix_len) {
@@ -39,27 +39,27 @@ static bool has_file_extension(const char* path, const char* extension) {
return true;
}
static bool is_supported_image_file(const char* filename) {
static bool isSupportedImageFile(const char* filename) {
// Currently only the PNG library is built into Tactility
return has_file_extension(filename, ".png");
return hasFileExtension(filename, ".png");
}
static bool is_supported_text_file(const char* filename) {
return has_file_extension(filename, ".txt") ||
has_file_extension(filename, ".ini") ||
has_file_extension(filename, ".json") ||
has_file_extension(filename, ".yaml") ||
has_file_extension(filename, ".yml") ||
has_file_extension(filename, ".lua") ||
has_file_extension(filename, ".js") ||
has_file_extension(filename, ".properties");
static bool isSupportedTextFile(const char* filename) {
return hasFileExtension(filename, ".txt") ||
hasFileExtension(filename, ".ini") ||
hasFileExtension(filename, ".json") ||
hasFileExtension(filename, ".yaml") ||
hasFileExtension(filename, ".yml") ||
hasFileExtension(filename, ".lua") ||
hasFileExtension(filename, ".js") ||
hasFileExtension(filename, ".properties");
}
// region Views
static void update_views(Data* data);
static void updateViews(Data* data);
static void on_navigate_up_pressed(lv_event_t* event) {
static void onNavigateUpPressed(lv_event_t* event) {
auto* files_data = (Data*)lv_event_get_user_data(event);
if (strcmp(files_data->current_path, "/") != 0) {
TT_LOG_I(TAG, "Navigating upwards");
@@ -68,14 +68,14 @@ static void on_navigate_up_pressed(lv_event_t* event) {
data_set_entries_for_path(files_data, new_absolute_path);
}
}
update_views(files_data);
updateViews(files_data);
}
static void on_exit_app_pressed(TT_UNUSED lv_event_t* event) {
static void onExitAppPressed(TT_UNUSED lv_event_t* event) {
service::loader::stopApp();
}
static void view_file(const char* path, const char* filename) {
static void viewFile(const char* path, const char* filename) {
size_t path_len = strlen(path);
size_t filename_len = strlen(filename);
char* filepath = static_cast<char*>(malloc(path_len + filename_len + 2));
@@ -102,11 +102,11 @@ static void view_file(const char* path, const char* filename) {
TT_LOG_I(TAG, "Clicked %s", filepath);
if (is_supported_image_file(filename)) {
if (isSupportedImageFile(filename)) {
Bundle bundle;
bundle.putString(IMAGE_VIEWER_FILE_ARGUMENT, processed_filepath);
service::loader::startApp("ImageViewer", false, bundle);
} else if (is_supported_text_file(filename)) {
} else if (isSupportedTextFile(filename)) {
Bundle bundle;
if (get_platform() == PlatformEsp) {
bundle.putString(TEXT_VIEWER_FILE_ARGUMENT, processed_filepath);
@@ -122,7 +122,7 @@ static void view_file(const char* path, const char* filename) {
free(filepath);
}
static void on_file_pressed(lv_event_t* event) {
static void onFilePressed(lv_event_t* event) {
lv_event_code_t code = lv_event_get_code(event);
if (code == LV_EVENT_CLICKED) {
lv_obj_t* button = lv_event_get_current_target_obj(event);
@@ -134,30 +134,30 @@ static void on_file_pressed(lv_event_t* event) {
switch (dir_entry->d_type) {
case TT_DT_DIR:
data_set_entries_for_child_path(files_data, dir_entry->d_name);
update_views(files_data);
updateViews(files_data);
break;
case TT_DT_LNK:
TT_LOG_W(TAG, "opening links is not supported");
break;
case TT_DT_REG:
view_file(files_data->current_path, dir_entry->d_name);
viewFile(files_data->current_path, dir_entry->d_name);
break;
default:
// Assume it's a file
// TODO: Find a better way to identify a file
view_file(files_data->current_path, dir_entry->d_name);
viewFile(files_data->current_path, dir_entry->d_name);
break;
}
}
}
static void create_file_widget(Data* files_data, lv_obj_t* parent, struct dirent* dir_entry) {
static void createFileWidget(Data* files_data, lv_obj_t* parent, struct dirent* dir_entry) {
tt_check(parent);
auto* list = (lv_obj_t*)parent;
const char* symbol;
if (dir_entry->d_type == TT_DT_DIR) {
symbol = LV_SYMBOL_DIRECTORY;
} else if (is_supported_image_file(dir_entry->d_name)) {
} else if (isSupportedImageFile(dir_entry->d_name)) {
symbol = LV_SYMBOL_IMAGE;
} else if (dir_entry->d_type == TT_DT_LNK) {
symbol = LV_SYMBOL_LOOP;
@@ -166,13 +166,14 @@ static void create_file_widget(Data* files_data, lv_obj_t* parent, struct dirent
}
lv_obj_t* button = lv_list_add_button(list, symbol, dir_entry->d_name);
lv_obj_set_user_data(button, files_data);
lv_obj_add_event_cb(button, &on_file_pressed, LV_EVENT_CLICKED, (void*)dir_entry);
lv_obj_add_event_cb(button, &onFilePressed, LV_EVENT_CLICKED, (void*)dir_entry);
}
static void update_views(Data* data) {
static void updateViews(Data* data) {
lv_obj_clean(data->list);
for (int i = 0; i < data->dir_entries_count; ++i) {
create_file_widget(data, data->list, data->dir_entries[i]);
TT_LOG_I(TAG, "Entry: %s %d", data->dir_entries[i]->d_name, data->dir_entries[i]->d_type);
createFileWidget(data, data->list, data->dir_entries[i]);
}
}
@@ -180,23 +181,23 @@ static void update_views(Data* data) {
// region Lifecycle
static void on_show(App& app, lv_obj_t* parent) {
static void onShow(App& app, lv_obj_t* parent) {
auto* data = static_cast<Data*>(app.getData());
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
lv_obj_t* toolbar = lvgl::toolbar_create(parent, "Files");
lvgl::toolbar_set_nav_action(toolbar, LV_SYMBOL_CLOSE, &on_exit_app_pressed, nullptr);
lvgl::toolbar_add_action(toolbar, LV_SYMBOL_UP, &on_navigate_up_pressed, data);
lvgl::toolbar_set_nav_action(toolbar, LV_SYMBOL_CLOSE, &onExitAppPressed, nullptr);
lvgl::toolbar_add_action(toolbar, LV_SYMBOL_UP, &onNavigateUpPressed, data);
data->list = lv_list_create(parent);
lv_obj_set_width(data->list, LV_PCT(100));
lv_obj_set_flex_grow(data->list, 1);
update_views(data);
updateViews(data);
}
static void on_start(App& app) {
static void onStart(App& app) {
auto* data = data_alloc();
// PC platform is bound to current work directory because of the LVGL file system mapping
if (get_platform() == PlatformSimulator) {
@@ -214,7 +215,7 @@ static void on_start(App& app) {
app.setData(data);
}
static void on_stop(App& app) {
static void onStop(App& app) {
auto* data = static_cast<Data*>(app.getData());
data_free(data);
}
@@ -226,9 +227,9 @@ extern const Manifest manifest = {
.name = "Files",
.icon = TT_ASSETS_APP_ICON_FILES,
.type = TypeSystem,
.onStart = &on_start,
.onStop = &on_stop,
.onShow = &on_show,
.onStart = onStart,
.onStop = onStop,
.onShow = onShow,
};
} // namespace