50bd6e8bf6
* SdCard HAL refactored (#135) - Refactor SdCard HAL - introduce Lockable * Screenshot and FatFS improvements (#136) - Fix screenshots on ESP32 - Improve Screenshot service - Convert Screenshot app to class-based instead of structs - Screenshot app now automatically updates when task is finished - Enable FatFS long filename support * Re-use common log messages (#138) For consistency and binary size reduction * Toolbar spinner should get margin to the right * More TactilityC features (#139) * Rewrote Loader - Simplified Loader by removing custom threa - Created DispatcherThread - Move auto-starting apps to Boot app - Fixed Dispatcher bug where it could get stuck not processing new messages * Hide AP settings if the AP is not saved * Missing from previous commit * Replace LV_EVENT_CLICKED with LV_EVENT_SHORT_CLICKED * Refactored files app and created InputDialog (#140) - Changed Files app so that it has a View and State - Files app now allows for long-pressing on files to perform actions - Files app now has rename and delete actions - Created InputDialog app - Improved AlertDialog app layout
121 lines
4.1 KiB
C++
121 lines
4.1 KiB
C++
#include "InputDialog.h"
|
|
#include "lvgl.h"
|
|
#include "lvgl/Toolbar.h"
|
|
#include "service/loader/Loader.h"
|
|
#include "service/gui/Gui.h"
|
|
#include <StringUtils.h>
|
|
#include <TactilityCore.h>
|
|
|
|
namespace tt::app::inputdialog {
|
|
|
|
#define PARAMETER_BUNDLE_KEY_TITLE "title"
|
|
#define PARAMETER_BUNDLE_KEY_MESSAGE "message"
|
|
#define PARAMETER_BUNDLE_KEY_PREFILLED "prefilled"
|
|
#define RESULT_BUNDLE_KEY_RESULT "result"
|
|
|
|
#define DEFAULT_TITLE "Input"
|
|
|
|
#define TAG "input_dialog"
|
|
|
|
extern const AppManifest manifest;
|
|
|
|
void start(const std::string& title, const std::string& message, const std::string& prefilled) {
|
|
auto bundle = std::make_shared<Bundle>();
|
|
bundle->putString(PARAMETER_BUNDLE_KEY_TITLE, title);
|
|
bundle->putString(PARAMETER_BUNDLE_KEY_MESSAGE, message);
|
|
bundle->putString(PARAMETER_BUNDLE_KEY_PREFILLED, prefilled);
|
|
service::loader::startApp(manifest.id, false, bundle);
|
|
}
|
|
|
|
std::string getResult(const Bundle& bundle) {
|
|
std::string result;
|
|
bundle.optString(RESULT_BUNDLE_KEY_RESULT, result);
|
|
return result;
|
|
}
|
|
|
|
void setResult(const std::shared_ptr<Bundle>& bundle, const std::string& result) {
|
|
bundle->putString(RESULT_BUNDLE_KEY_RESULT, result);
|
|
}
|
|
|
|
static std::string getTitleParameter(const std::shared_ptr<const Bundle>& bundle) {
|
|
std::string result;
|
|
if (bundle->optString(PARAMETER_BUNDLE_KEY_TITLE, result)) {
|
|
return result;
|
|
} else {
|
|
return DEFAULT_TITLE;
|
|
}
|
|
}
|
|
|
|
static void onButtonClicked(lv_event_t* e) {
|
|
auto user_data = lv_event_get_user_data(e);
|
|
int index = (user_data != 0) ? 0 : 1;
|
|
TT_LOG_I(TAG, "Selected item at index %d", index);
|
|
tt::app::AppContext* app = service::loader::getCurrentApp();
|
|
auto bundle = std::make_shared<Bundle>();
|
|
if (index == 0) {
|
|
const char* text = lv_textarea_get_text((lv_obj_t*)user_data);
|
|
setResult(bundle, text);
|
|
app->setResult(app::ResultOk, bundle);
|
|
} else {
|
|
app->setResult(app::ResultCancelled, bundle);
|
|
|
|
}
|
|
service::loader::stopApp();
|
|
}
|
|
|
|
static void createButton(lv_obj_t* parent, const std::string& text, void* callbackContext) {
|
|
lv_obj_t* button = lv_button_create(parent);
|
|
lv_obj_t* button_label = lv_label_create(button);
|
|
lv_obj_align(button_label, LV_ALIGN_CENTER, 0, 0);
|
|
lv_label_set_text(button_label, text.c_str());
|
|
lv_obj_add_event_cb(button, &onButtonClicked, LV_EVENT_SHORT_CLICKED, callbackContext);
|
|
}
|
|
|
|
static void onShow(AppContext& app, lv_obj_t* parent) {
|
|
auto parameters = app.getParameters();
|
|
tt_check(parameters != nullptr, "Parameters missing");
|
|
|
|
std::string title = getTitleParameter(app.getParameters());
|
|
auto* toolbar = lvgl::toolbar_create(parent, title);
|
|
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
|
|
|
auto* message_label = lv_label_create(parent);
|
|
lv_obj_align(message_label, LV_ALIGN_CENTER, 0, -20);
|
|
lv_obj_set_width(message_label, LV_PCT(80));
|
|
|
|
std::string message;
|
|
if (parameters->optString(PARAMETER_BUNDLE_KEY_MESSAGE, message)) {
|
|
lv_label_set_text(message_label, message.c_str());
|
|
lv_label_set_long_mode(message_label, LV_LABEL_LONG_WRAP);
|
|
}
|
|
|
|
auto* textarea = lv_textarea_create(parent);
|
|
lv_obj_align_to(textarea, message_label, LV_ALIGN_OUT_BOTTOM_MID, 0, 4);
|
|
lv_textarea_set_one_line(textarea, true);
|
|
std::string prefilled;
|
|
if (parameters->optString(PARAMETER_BUNDLE_KEY_PREFILLED, prefilled)) {
|
|
lv_textarea_set_text(textarea, prefilled.c_str());
|
|
}
|
|
service::gui::keyboardAddTextArea(textarea);
|
|
|
|
auto* button_wrapper = lv_obj_create(parent);
|
|
lv_obj_set_flex_flow(button_wrapper, LV_FLEX_FLOW_ROW);
|
|
lv_obj_set_size(button_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
|
lv_obj_set_style_pad_all(button_wrapper, 0, 0);
|
|
lv_obj_set_flex_align(button_wrapper, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
|
lv_obj_set_style_border_width(button_wrapper, 0, 0);
|
|
lv_obj_align(button_wrapper, LV_ALIGN_BOTTOM_MID, 0, -4);
|
|
|
|
createButton(button_wrapper, "OK", textarea);
|
|
createButton(button_wrapper, "Cancel", nullptr);
|
|
}
|
|
|
|
extern const AppManifest manifest = {
|
|
.id = "InputDialog",
|
|
.name = "Input Dialog",
|
|
.type = TypeHidden,
|
|
.onShow = onShow
|
|
};
|
|
|
|
}
|