Keyboard improvements (#240)

- Renamed various keyboard functions so it's easier to differentiate hardware versus software keyboard functionality
- Created `Tactility/lvgl/Keyboard.h` as a proxy  for the internal `Gui` service.
- Implemented `tt_lvgl_keyboard.h` in `TactilityC`.

Tactility/Source/lvgl/Init.cpp

@@ -1,5 +1,5 @@
 #include "Tactility/app/display/DisplaySettings.h"
-#include "Tactility/lvgl/LvglKeypad.h"
+#include "Tactility/lvgl/Keyboard.h"
 
 #include "Tactility/hal/display/DisplayDevice.h"
 #include "Tactility/hal/touch/TouchDevice.h"
@@ -68,7 +68,7 @@ static bool initKeyboard(const std::shared_ptr<hal::display::DisplayDevice>& dis
         if (keyboard->start(display->getLvglDisplay())) {
             lv_indev_t* keyboard_indev = keyboard->getLvglIndev();
             lv_indev_set_user_data(keyboard_indev, keyboard.get());
-            tt::lvgl::keypad_set_indev(keyboard_indev);
+            tt::lvgl::hardware_keyboard_set_indev(keyboard_indev);
             TT_LOG_I(TAG, "Keyboard started");
             return true;
         } else {

Tactility/Source/lvgl/Keyboard.cpp

@@ -0,0 +1,44 @@
+#include "Tactility/lvgl/Keyboard.h"
+#include "Tactility/service/gui/Gui.h"
+
+namespace tt::lvgl {
+
+static lv_indev_t* keyboard_device = nullptr;
+
+void software_keyboard_show(lv_obj_t* textarea) {
+    service::gui::softwareKeyboardShow(textarea);
+}
+
+void software_keyboard_hide() {
+    service::gui::softwareKeyboardHide();
+}
+
+bool software_keyboard_is_enabled() {
+    return service::gui::softwareKeyboardIsEnabled();
+}
+
+void software_keyboard_activate(lv_group_t* group) {
+    if (keyboard_device != nullptr) {
+        lv_indev_set_group(keyboard_device, group);
+    }
+}
+
+void software_keyboard_deactivate() {
+    if (keyboard_device != nullptr) {
+        lv_indev_set_group(keyboard_device, nullptr);
+    }
+}
+
+bool hardware_keyboard_is_available() {
+    return keyboard_device != nullptr;
+}
+
+void hardware_keyboard_set_indev(lv_indev_t* device) {
+    keyboard_device = device;
+}
+
+void keyboard_add_textarea(lv_obj_t* textarea) {
+    service::gui::keyboardAddTextArea(textarea);
+}
+
+}

Tactility/Source/lvgl/LvglKeypad.cpp

@@ -1,27 +0,0 @@
-#include "Tactility/lvgl/LvglKeypad.h"
-
-namespace tt::lvgl {
-
-static lv_indev_t* keyboard_device = nullptr;
-
-bool keypad_is_available() {
-    return keyboard_device != nullptr;
-}
-
-void keypad_set_indev(lv_indev_t* device) {
-    keyboard_device = device;
-}
-
-void keypad_activate(lv_group_t* group) {
-    if (keyboard_device != nullptr) {
-        lv_indev_set_group(keyboard_device, group);
-    }
-}
-
-void keypad_deactivate() {
-    if (keyboard_device != nullptr) {
-        lv_indev_set_group(keyboard_device, nullptr);
-    }
-}
-
-} // namespace

Tactility/Source/service/gui/Gui.cpp

@@ -1,8 +1,8 @@
-#include "Tactility/service/gui/Gui_i.h"
-#include "Tactility/service/loader/Loader_i.h"
+#include "Tactility/service/gui/Gui.h"
 #include "Tactility/lvgl/LvglSync.h"
-#include "Tactility/lvgl/Style.h"
 #include "Tactility/lvgl/Statusbar.h"
+#include "Tactility/lvgl/Style.h"
+#include "Tactility/service/loader/Loader_i.h"
 
 #include <Tactility/Tactility.h>
 #include <Tactility/RtosCompat.h>

Tactility/Source/service/gui/GuiDraw.cpp

@@ -1,6 +1,7 @@
-#include "Tactility/service/gui/Gui_i.h"
+#include "Tactility/service/gui/Gui.h"
+
+#include "Tactility/app/AppInstance.h"
 #include "Tactility/lvgl/LvglSync.h"
-#include "Tactility/lvgl/Statusbar.h"
 #include "Tactility/lvgl/Style.h"
 
 #include <Tactility/Check.h>
@@ -17,7 +18,7 @@ static lv_obj_t* createAppViews(Gui* gui, lv_obj_t* parent) {
     lv_obj_set_width(child_container, LV_PCT(100));
     lv_obj_set_flex_grow(child_container, 1);
 
-    if (keyboardIsEnabled()) {
+    if (softwareKeyboardIsEnabled()) {
         gui->keyboard = lv_keyboard_create(parent);
         lv_obj_add_flag(gui->keyboard, LV_OBJ_FLAG_HIDDEN);
     } else {

Tactility/Source/service/gui/Keyboard.cpp

@@ -1,7 +1,7 @@
+#include "Tactility/lvgl/Keyboard.h"
 #include "Tactility/Check.h"
-#include "Tactility/service/gui/Gui_i.h"
-#include "Tactility/lvgl/LvglKeypad.h"
 #include "Tactility/lvgl/LvglSync.h"
+#include "Tactility/service/gui/Gui.h"
 
 #include <Tactility/TactilityConfig.h>
 
@@ -11,19 +11,19 @@ extern Gui* gui;
 
 static void show_keyboard(lv_event_t* event) {
     lv_obj_t* target = lv_event_get_current_target_obj(event);
-    keyboardShow(target);
+    softwareKeyboardShow(target);
     lv_obj_scroll_to_view(target, LV_ANIM_ON);
 }
 
 static void hide_keyboard(TT_UNUSED lv_event_t* event) {
-    keyboardHide();
+    softwareKeyboardHide();
 }
 
-bool keyboardIsEnabled() {
-    return !lvgl::keypad_is_available() || TT_CONFIG_FORCE_ONSCREEN_KEYBOARD;
+bool softwareKeyboardIsEnabled() {
+    return !lvgl::hardware_keyboard_is_available() || TT_CONFIG_FORCE_ONSCREEN_KEYBOARD;
 }
 
-void keyboardShow(lv_obj_t* textarea) {
+void softwareKeyboardShow(lv_obj_t* textarea) {
     lock();
 
     if (gui->keyboard) {
@@ -34,7 +34,7 @@ void keyboardShow(lv_obj_t* textarea) {
     unlock();
 }
 
-void keyboardHide() {
+void softwareKeyboardHide() {
     lock();
 
     if (gui->keyboard) {
@@ -48,7 +48,7 @@ void keyboardAddTextArea(lv_obj_t* textarea) {
     lock();
     tt_check(lvgl::lock(0), "lvgl should already be locked before calling this method");
 
-    if (keyboardIsEnabled()) {
+    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);
@@ -57,7 +57,7 @@ void keyboardAddTextArea(lv_obj_t* textarea) {
     // lv_obj_t auto-remove themselves from the group when they are destroyed (last checked in LVGL 8.3)
     lv_group_add_obj(gui->keyboardGroup, textarea);
 
-    lvgl::keypad_activate(gui->keyboardGroup);
+    lvgl::software_keyboard_activate(gui->keyboardGroup);
 
     lvgl::unlock();
     unlock();