diff options
| author | DrZlo13 <who.just.the.doctor@gmail.com> | 2021-02-05 02:35:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-05 02:35:06 +0300 |
| commit | 4341da90dc7d063be6bdf832e681dc73d46532fe (patch) | |
| tree | ce625178f9e620af8cabe75c444fcc8f68923828 /applications/applications.mk | |
| parent | 9642f0d5299738311b6b08228ef7d82c4746bfbf (diff) | |
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* gui test app
* aligned string draw functions
* add canvas_invert_color, canvas_draw_button_left, canvas_draw_button_right
* use new str and button fns in dialog
* real dialog mockup
* add new gui test app recipe
* submenu module init
* delete unused variable
* move buttons to element, add canvas_string_width fn, new center button element
* button icons
* submenu module
* use submenu module, switch views
* keyboard buttons img
* new font for keyboard
* text input (keyboard) module
* add text input to gui test app
* add gui tesst app to release build, fix flags
* handle transition from start and end position, fix input switch
* add long text support to text input
* canvas_string_width and the underlying u8g2_GetStrWidth now return uint16_t
* remove deprecated libs and apps
* canvas_font_max_height fn
* new element, aligned multiline text
* use multiline text instead of plain string
* fix second keyboard row, rename uppercase fn
* qwerty-like keyboard layout
* new icons for iButton app
* better dialog text position and events handling
* remove confusing comment
* new extended dialog module
* extended dialog module usage
* update docs
* new gui module, popup with timeout
* popup usage
* canvas, remove outdated canvas_font_max_height, use canvas_current_font_height
* use furi check
* use new view_enter and view_exit callback for timers
* add DrZlo to gui tester codeowner
Co-authored-by: aanper <mail@s3f.ru>
Diffstat (limited to 'applications/applications.mk')
| -rw-r--r-- | applications/applications.mk | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/applications/applications.mk b/applications/applications.mk index 63487ef8..9214f94a 100644 --- a/applications/applications.mk +++ b/applications/applications.mk @@ -29,6 +29,7 @@ BUILD_GPIO_DEMO = 1 BUILD_MUSIC_PLAYER = 1 BUILD_FLOOPPER_BLOOPPER = 1 BUILD_IBUTTON = 1 +BUILD_GUI_TEST = 1 endif APP_NFC ?= 0 @@ -144,15 +145,6 @@ ifeq ($(BUILD_EXAMPLE_QRCODE), 1) CFLAGS += -DBUILD_EXAMPLE_QRCODE C_SOURCES += $(APP_DIR)/examples/u8g2_qrcode.c C_SOURCES += $(LIB_DIR)/qrcode/qrcode.c -APP_DISPLAY = 1 -endif - -# deprecated -APP_EXAMPLE_DISPLAY ?= 0 -ifeq ($(APP_EXAMPLE_DISPLAY), 1) -CFLAGS += -DAPP_EXAMPLE_DISPLAY -C_SOURCES += $(APP_DIR)/examples/u8g2_example.c -APP_DISPLAY = 1 endif APP_EXAMPLE_FATFS ?= 0 @@ -165,7 +157,6 @@ ifeq ($(BUILD_EXAMPLE_FATFS), 1) CFLAGS += -DBUILD_EXAMPLE_FATFS C_SOURCES += $(APP_DIR)/examples/fatfs_list.c APP_INPUT = 1 -APP_DISPLAY = 1 endif APP_CC1101 ?= 0 @@ -289,6 +280,17 @@ CFLAGS += -DBUILD_IBUTTON CPP_SOURCES += $(wildcard $(APP_DIR)/ibutton/*.cpp) endif +APP_GUI_TEST ?= 0 +ifeq ($(APP_GUI_TEST), 1) +CFLAGS += -DAPP_GUI_TEST +BUILD_GUI_TEST = 1 +endif +BUILD_GUI_TEST ?= 0 +ifeq ($(BUILD_GUI_TEST), 1) +CFLAGS += -DBUILD_GUI_TEST +C_SOURCES += $(wildcard $(APP_DIR)/gui-test/*.c) +endif + APP_SDNFC ?= 0 ifeq ($(APP_SDNFC), 1) CFLAGS += -DAPP_SDNFC @@ -315,12 +317,6 @@ CFLAGS += -DAPP_SD_FILESYSTEM C_SOURCES += $(wildcard $(APP_DIR)/sd-filesystem/*.c) endif -# deprecated -ifeq ($(APP_DISPLAY), 1) -CFLAGS += -DAPP_DISPLAY -C_SOURCES += $(APP_DIR)/display-u8g2/display-u8g2.c -endif - APP_INPUT ?= 0 ifeq ($(APP_INPUT), 1) CFLAGS += -DAPP_INPUT |