TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-14 05:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Binder helper methods (#1465)

Browse Source 
* Add binder, fix focus on remote btn delete
* Use binder for freqman edit
This commit is contained in:
Kyle Reed
2023-09-29 09:55:27 -07:00
committed by GitHub
parent fb00bfac3f
commit 951890eaff
4 changed files with 133 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
firmware/application/apps/ui_freqman.cpp
View File

@@ -23,6 +23,7 @@
#include "ui_freqman.hpp"
#include "binder.hpp"
#include "event_m0.hpp"
#include "portapack.hpp"
#include "rtc_time.hpp"
@@ -376,69 +377,26 @@ FrequencyEditView::FrequencyEditView(
field_step.options().insert(
field_step.options().begin(), {"None", -1});
field_type.set_by_value((int32_t)entry_.type);
field_type.on_change = [this](size_t, auto value) {
entry_.type = static_cast<freqman_type>(value);
bind(field_type, entry_.type, [this](auto) {
refresh_ui();
};
});
// TODO: this pattern should be able to be wrapped up.
field_freq_a.set_value(entry_.frequency_a);
field_freq_a.on_change = [this](rf::Frequency f) {
entry_.frequency_a = f;
bind(field_freq_a, entry_.frequency_a, nav, [this](auto) {
refresh_ui();
};
field_freq_a.on_edit = [this]() {
auto freq_view = nav_.push<FrequencyKeypadView>(field_freq_a.value());
freq_view->on_changed = [this](rf::Frequency f) {
field_freq_a.set_value(f);
};
};
});
field_freq_b.set_value(entry_.frequency_b);
field_freq_b.on_change = [this](rf::Frequency f) {
entry_.frequency_b = f;
bind(field_freq_b, entry_.frequency_b, nav, [this](auto) {
refresh_ui();
};
field_freq_b.on_edit = [this]() {
auto freq_view = nav_.push<FrequencyKeypadView>(field_freq_b.value());
freq_view->on_changed = [this](rf::Frequency f) {
field_freq_b.set_value(f);
};
};
});
field_modulation.set_by_value((int32_t)entry_.modulation);
field_modulation.on_change = [this](size_t, auto value) {
entry_.modulation = static_cast<freqman_index_t>(value);
bind(field_modulation, entry_.modulation, [this](auto) {
populate_bandwidth_options();
};
});
field_bandwidth.set_by_value((int32_t)entry_.bandwidth);
field_bandwidth.on_change = [this](size_t, auto value) {
entry_.bandwidth = static_cast<freqman_index_t>(value);
};
field_step.set_by_value((int32_t)entry_.step);
field_step.on_change = [this](size_t, auto value) {
entry_.step = static_cast<freqman_index_t>(value);
};
field_tone.set_by_value((int32_t)entry_.tone);
field_tone.on_change = [this](size_t, auto value) {
entry_.tone = static_cast<freqman_index_t>(value);
};
field_description.set_text(entry_.description);
field_description.on_change = [this](TextField& tf) {
entry_.description = tf.get_text();
};
field_description.on_select = [this](TextField& tf) {
temp_buffer_ = tf.get_text();
text_prompt(nav_, temp_buffer_, FreqManBaseView::desc_edit_max,
[this, &tf](std::string& new_desc) {
tf.set_text(new_desc);
});
};
bind(field_bandwidth, entry_.bandwidth);
bind(field_step, entry_.step);
bind(field_tone, entry_.tone);
bind(field_description, entry_.description, nav_);
button_save.on_select = [this](Button&) {
if (on_save)

47
firmware/application/apps/ui_remote.cpp
View File

@@ -21,6 +21,7 @@
#include "ui_remote.hpp"
#include "binder.hpp"
#include "convert.hpp"
#include "file_reader.hpp"
#include "io_convert.hpp"
@@ -239,19 +240,9 @@ RemoteEntryEditView::RemoteEntryEditView(
&button_done,
});
// TODO: It's time to make field bindings and clean this mess up.
field_name.on_change = [this](TextField& tf) {
entry_.name = tf.get_text();
button_preview.set_text(entry_.name);
};
field_name.on_select = [this, &nav](TextField& tf) {
temp_buffer_ = tf.get_text();
text_prompt(nav, temp_buffer_, text_edit_max,
[this, &tf](std::string& str) {
tf.set_text(str);
});
};
field_name.set_text(entry_.name);
bind(field_name, entry_.name, nav, [this](auto& v) {
button_preview.set_text(v);
});
field_path.on_select = [this, &nav](TextField&) {
auto open_view = nav.push<FileLoadView>(".C*");
@@ -262,31 +253,16 @@ RemoteEntryEditView::RemoteEntryEditView(
};
};
field_freq.on_edit = [this, &nav]() {
auto freq_view = nav.push<FrequencyKeypadView>(entry_.metadata.center_frequency);
freq_view->on_changed = [this](rf::Frequency f) {
entry_.metadata.center_frequency = f;
field_freq.set_value(f);
};
};
field_icon_index.on_change = [this](int32_t v) {
entry_.icon = v;
bind(field_freq, entry_.metadata.center_frequency, nav);
bind(field_icon_index, entry_.icon, [this](auto v) {
button_preview.set_bitmap(RemoteIcons::get(v));
};
field_icon_index.set_value(entry.icon);
field_fg_color_index.on_change = [this](int32_t v) {
entry_.fg_color = v;
});
bind(field_fg_color_index, entry_.fg_color, [this](auto v) {
button_preview.set_color(RemoteColors::get(v));
};
field_fg_color_index.set_value(entry_.fg_color);
field_bg_color_index.on_change = [this](int32_t v) {
entry_.bg_color = v;
});
bind(field_bg_color_index, entry_.bg_color, [this](auto) {
button_preview.set_dirty();
};
field_bg_color_index.set_value(entry_.bg_color);
});
button_delete.on_select = [this, &nav]() {
nav.display_modal(
@@ -485,6 +461,7 @@ void RemoteView::edit_button(RemoteButton& btn) {
nav_.set_on_pop([this]() {
refresh_ui();
set_needs_save();
focus(); // Need to refocus after refreshing the buttons.
});
edit_view->on_delete = [this](RemoteEntryModel& to_delete) {

1
firmware/application/apps/ui_remote.hpp
View File

@@ -195,7 +195,6 @@ class RemoteEntryEditView : public View {
private:
RemoteEntryModel& entry_;
std::string temp_buffer_{};
void refresh_ui();
void load_path(std::filesystem::path&& path);