Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-05-31 20:44:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Text entry should be more stable

Browse source 
Text entry now allows for strings greater than 28 chars
Frequency manager save with name bugfix
This commit is contained in:
furrtek 2017-06-11 02:53:06 +01:00
parent b3aa4bf0b9
commit 042d271a9f
15 changed files with 116 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

19
firmware/application/ui_alphanum.hpp
View file

@ -34,21 +34,18 @@ namespace ui {
class AlphanumView : public View {
public:
std::function<void(std::string)> on_changed { };
std::function<void(std::string*)> on_changed { };
AlphanumView(NavigationView& nav, std::string& txt, size_t max_length);
AlphanumView(NavigationView& nav, std::string * str, size_t max_length);
AlphanumView(const AlphanumView&) = delete;
AlphanumView(AlphanumView&&) = delete;
AlphanumView& operator=(const AlphanumView&) = delete;
AlphanumView& operator=(AlphanumView&&) = delete;
void paint(Painter& painter) override;
void focus() override;
std::string value();
std::string title() const override { return "Text entry"; };
private:
@ -56,26 +53,26 @@ private:
const char * const keys_lower = "abcdefghijklmnopqrstuvwxyz' .<";
const char * const keys_digit = "0123456789!\"#'()*+-/:;=>?@[\\]<";
const std::pair<std::string, const char *> pages[3] = {
const std::pair<std::string, const char *> key_sets[3] = {
{ "Upper", keys_upper },
{ "Lower", keys_lower },
{ "Digit", keys_digit }
};
size_t _max_length { };
uint32_t txtidx { 0 };
uint32_t mode = 0; // Upper
std::string txtinput { "" }; // 28 chars max
uint32_t cursor_pos { 0 };
uint32_t mode = 0; // Uppercase
std::string * _str { };
void char_add(const char c);
void char_delete();
void set_mode(const uint32_t new_mode);
void move_cursor();
void draw_cursor();
void on_button(Button& button);
void update_text();
Text text_input {
{ 8, 0, 232, 16 }
{ 0, 0, 240, 16 }
};
std::array<Button, 30> buttons { };