diff --git a/Data/system/app/Launcher/icon_apps.png b/Data/system/app/Launcher/icon_apps.png
index 9381aaa4..d7500276 100644
Binary files a/Data/system/app/Launcher/icon_apps.png and b/Data/system/app/Launcher/icon_apps.png differ
diff --git a/Data/system/app/Launcher/icon_files.png b/Data/system/app/Launcher/icon_files.png
index 8e6c6055..e0919072 100644
Binary files a/Data/system/app/Launcher/icon_files.png and b/Data/system/app/Launcher/icon_files.png differ
diff --git a/Data/system/app/Launcher/icon_settings.png b/Data/system/app/Launcher/icon_settings.png
index cdb52d7b..ba33da9f 100644
Binary files a/Data/system/app/Launcher/icon_settings.png and b/Data/system/app/Launcher/icon_settings.png differ
diff --git a/Data/system_sources/app/Desktop/apps.svg b/Data/system_sources/app/Desktop/apps.svg
deleted file mode 100644
index bb14bc03..00000000
--- a/Data/system_sources/app/Desktop/apps.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/Data/system_sources/app/Desktop/folder.svg b/Data/system_sources/app/Desktop/folder.svg
deleted file mode 100644
index 021db149..00000000
--- a/Data/system_sources/app/Desktop/folder.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/Data/system_sources/app/Desktop/settings.svg b/Data/system_sources/app/Desktop/settings.svg
deleted file mode 100644
index 63cebb1c..00000000
--- a/Data/system_sources/app/Desktop/settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/Data/system_sources/app/Launcher/apps.svg b/Data/system_sources/app/Launcher/apps.svg
new file mode 100644
index 00000000..4ec70006
--- /dev/null
+++ b/Data/system_sources/app/Launcher/apps.svg
@@ -0,0 +1,42 @@
+
+
diff --git a/Data/system_sources/app/Launcher/folder.svg b/Data/system_sources/app/Launcher/folder.svg
new file mode 100644
index 00000000..167f0acc
--- /dev/null
+++ b/Data/system_sources/app/Launcher/folder.svg
@@ -0,0 +1,42 @@
+
+
diff --git a/Data/system_sources/app/Launcher/settings.svg b/Data/system_sources/app/Launcher/settings.svg
new file mode 100644
index 00000000..c442c05f
--- /dev/null
+++ b/Data/system_sources/app/Launcher/settings.svg
@@ -0,0 +1,42 @@
+
+
diff --git a/Documentation/ideas.md b/Documentation/ideas.md
index 15188b10..b46f8e6b 100644
--- a/Documentation/ideas.md
+++ b/Documentation/ideas.md
@@ -65,6 +65,5 @@
- GPS app
- Investigate CSI https://stevenmhernandez.github.io/ESP32-CSI-Tool/
- Compile unix tools to ELF apps?
-- Text editor
- Todo list
- Calendar
diff --git a/Tactility/Source/app/launcher/Launcher.cpp b/Tactility/Source/app/launcher/Launcher.cpp
index 4fd4be01..a61a89ae 100644
--- a/Tactility/Source/app/launcher/Launcher.cpp
+++ b/Tactility/Source/app/launcher/Launcher.cpp
@@ -27,33 +27,37 @@ static lv_obj_t* createAppButton(lv_obj_t* parent, const char* title, const char
auto* apps_button = lv_button_create(wrapper);
lv_obj_set_style_pad_hor(apps_button, 0, 0);
lv_obj_set_style_pad_top(apps_button, 0, 0);
- lv_obj_set_style_pad_bottom(apps_button, 16, 0);
+ lv_obj_set_style_pad_bottom(apps_button, 8, 0);
lv_obj_set_style_shadow_width(apps_button, 0, 0);
lv_obj_set_style_border_width(apps_button, 0, 0);
lv_obj_set_style_bg_opa(apps_button, 0, LV_PART_MAIN);
auto* button_image = lv_image_create(apps_button);
lv_image_set_src(button_image, imageFile);
- lv_obj_add_event_cb(apps_button, onAppPressed, LV_EVENT_SHORT_CLICKED, (void*)appId);
- lv_obj_set_style_image_recolor(button_image, lv_theme_get_color_primary(parent), 0);
- lv_obj_set_style_image_recolor_opa(button_image, LV_OPA_COVER, 0);
+ lv_obj_set_style_image_recolor(button_image, lv_theme_get_color_primary(parent), LV_STATE_DEFAULT);
+ lv_obj_set_style_image_recolor_opa(button_image, LV_OPA_COVER, LV_STATE_DEFAULT);
// Ensure buttons are still tappable when asset fails to load
+ // Icon images are 40x40, so we get some extra padding too
lv_obj_set_size(button_image, 64, 64);
auto* label = lv_label_create(wrapper);
lv_label_set_text(label, title);
lv_obj_align(label, LV_ALIGN_BOTTOM_MID, 0, 0);
+ lv_obj_add_event_cb(wrapper, onAppPressed, LV_EVENT_SHORT_CLICKED, (void*)appId);
+ lv_obj_add_event_cb(apps_button, onAppPressed, LV_EVENT_SHORT_CLICKED, (void*)appId);
+ lv_obj_add_event_cb(label, onAppPressed, LV_EVENT_SHORT_CLICKED, (void*)appId);
+
return wrapper;
}
class LauncherApp : public App {
void onCreate(TT_UNUSED AppContext& app) override {
- auto* config = tt::getConfiguration();
+ auto* config = getConfiguration();
if (!config->autoStartAppId.empty()) {
TT_LOG_I(TAG, "auto-starting %s", config->autoStartAppId.c_str());
- tt::service::loader::startApp(config->autoStartAppId);
+ service::loader::startApp(config->autoStartAppId);
}
}