Software keyboard refactored (#594)

Removed software keyboard in Tactility subproject (GuiService, Lvgl.cpp) and re-implemented it in TactilityKernel.

Tactility/Source/service/gui/GuiService.cpp

@@ -1,4 +1,7 @@
 #include <Tactility/service/gui/GuiService.h>
+
+#include "lvgl/devices/keyboard.h"
+
 #include <Tactility/LogMessages.h>
 #include <Tactility/Tactility.h>
 #include <Tactility/app/AppInstance.h>
@@ -113,7 +116,6 @@ int32_t GuiService::guiMain() {
         return 0;
     }
 
-    service->keyboardGroup = lv_group_create();
     lv_obj_set_style_border_width(screen_root, 0, LV_STATE_DEFAULT);
     lv_obj_set_style_pad_all(screen_root, 0, LV_STATE_DEFAULT);
 
@@ -157,11 +159,12 @@ lv_obj_t* GuiService::createAppViews(lv_obj_t* parent) {
     lv_obj_set_style_border_width(child_container, 0, LV_STATE_DEFAULT);
     lv_obj_set_flex_grow(child_container, 1);
 
-    if (softwareKeyboardIsEnabled()) {
-        keyboard = lv_keyboard_create(parent);
-        lv_obj_add_flag(keyboard, LV_OBJ_FLAG_HIDDEN);
+    if (lvgl_software_keyboard_is_enabled()) {
+        lvgl_software_keyboard_construct(&software_keyboard, parent);
     } else {
-        keyboard = nullptr;
+        software_keyboard = {
+            nullptr
+        };
     }
 
     return child_container;
@@ -281,9 +284,8 @@ void GuiService::onStop(ServiceContext& service) {
     thread->join();
 
     lvgl_lock();
-    if (keyboardGroup != nullptr) {
-        lv_group_delete(keyboardGroup);
-        keyboardGroup = nullptr;
+    if (software_keyboard.object != nullptr) {
+        lvgl_software_keyboard_destruct(&software_keyboard);
     }
 
     auto* default_group = lv_group_get_default();

Tactility/Source/service/gui/Keyboard.cpp

@@ -1,76 +0,0 @@
-#include <Tactility/lvgl/Keyboard.h>
-#include <Tactility/service/gui/GuiService.h>
-#include <Tactility/TactilityConfig.h>
-#include <Tactility/service/espnow/EspNowService.h>
-
-#include <tactility/check.h>
-
-#include <lvgl/lvgl.h>
-
-namespace tt::service::gui {
-
-static void show_keyboard(lv_event_t* event) {
-    auto service = findService();
-    if (service != nullptr) {
-        lv_obj_t* target = lv_event_get_current_target_obj(event);
-        service->softwareKeyboardShow(target);
-        lv_obj_scroll_to_view(target, LV_ANIM_ON);
-    }
-}
-
-static void hide_keyboard(lv_event_t* event) {
-    auto service = findService();
-    if (service != nullptr) {
-        service->softwareKeyboardHide();
-    }
-}
-
-bool GuiService::softwareKeyboardIsEnabled() {
-    return !lvgl::hardware_keyboard_is_available() || TT_CONFIG_FORCE_ONSCREEN_KEYBOARD;
-}
-
-void GuiService::softwareKeyboardShow(lv_obj_t* textarea) {
-    lock();
-
-    if (isStarted && keyboard != nullptr) {
-        lv_obj_clear_flag(keyboard, LV_OBJ_FLAG_HIDDEN);
-        lv_keyboard_set_textarea(keyboard, textarea);
-    }
-
-    unlock();
-}
-
-void GuiService::softwareKeyboardHide() {
-    lock();
-
-    if (isStarted && keyboard != nullptr) {
-        lv_obj_add_flag(keyboard, LV_OBJ_FLAG_HIDDEN);
-    }
-
-    unlock();
-}
-
-void GuiService::keyboardAddTextArea(lv_obj_t* textarea) {
-    lock();
-
-    if (isStarted) {
-        check(lvgl_try_lock(0), "lvgl should already be locked before calling this method");
-
-        if (softwareKeyboardIsEnabled()) {
-            lv_obj_add_event_cb(textarea, show_keyboard, LV_EVENT_FOCUSED, nullptr);
-            lv_obj_add_event_cb(textarea, hide_keyboard, LV_EVENT_DEFOCUSED, nullptr);
-            lv_obj_add_event_cb(textarea, hide_keyboard, LV_EVENT_READY, nullptr);
-
-            // lv_obj_t auto-remove themselves from the group when they are destroyed (last checked in LVGL 8.3)
-            lv_group_add_obj(keyboardGroup, textarea);
-
-            lvgl::software_keyboard_activate(keyboardGroup);
-        }
-
-        lvgl_unlock();
-    }
-
-    unlock();
-}
-
-} // namespace