From ef5681ec0b8874a79866f6872aa75bddfa258e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Mon, 20 Jan 2020 18:01:48 +0100 Subject: [PATCH] [escher] Remove BurgerMenuView --- escher/Makefile | 1 - escher/include/escher.h | 1 - escher/include/escher/burger_menu_view.h | 17 ------- escher/src/burger_menu_view.cpp | 60 ------------------------ 4 files changed, 79 deletions(-) delete mode 100644 escher/include/escher/burger_menu_view.h delete mode 100644 escher/src/burger_menu_view.cpp diff --git a/escher/Makefile b/escher/Makefile index f68cbc8df..d62b0e732 100644 --- a/escher/Makefile +++ b/escher/Makefile @@ -6,7 +6,6 @@ escher_src += $(addprefix escher/src/,\ bank_view_controller.cpp \ bordered.cpp \ buffer_text_view.cpp \ - burger_menu_view.cpp \ button.cpp \ button_row_controller.cpp \ chevron_view.cpp \ diff --git a/escher/include/escher.h b/escher/include/escher.h index 485614614..e07ce1abb 100644 --- a/escher/include/escher.h +++ b/escher/include/escher.h @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include diff --git a/escher/include/escher/burger_menu_view.h b/escher/include/escher/burger_menu_view.h deleted file mode 100644 index df457f2ea..000000000 --- a/escher/include/escher/burger_menu_view.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef ESCHER_BURGER_MENU_VIEW_H -#define ESCHER_BURGER_MENU_VIEW_H - -#include - -class BurgerMenuView : public View { -public: - BurgerMenuView() : m_backgroundColor(KDColorWhite) {} - void drawRect(KDContext * ctx, KDRect rect) const override; - KDSize minimalSizeForOptimalDisplay() const override; - void setBackgroundColor(KDColor color); - constexpr static KDCoordinate k_burgerSize = 13; -private: - KDColor m_backgroundColor; -}; - -#endif diff --git a/escher/src/burger_menu_view.cpp b/escher/src/burger_menu_view.cpp deleted file mode 100644 index 6e2754332..000000000 --- a/escher/src/burger_menu_view.cpp +++ /dev/null @@ -1,60 +0,0 @@ -#include -#include - -const uint8_t sBurgerMask[BurgerMenuView::k_burgerSize][BurgerMenuView::k_burgerSize] = { - {0xFF, 0xFF, 0xFF, 0xE0, 0xA5, 0x83, 0x76, 0x83, 0xA5, 0xE0, 0xFF, 0xFF, 0xFF}, - {0xFF, 0xFD, 0xAF, 0x84, 0xC8, 0xF0, 0xFC, 0xF0, 0xC8, 0x84, 0xAF, 0xFC, 0xFF}, - {0xFF, 0xAC, 0x9C, 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x9C, 0xAC, 0xFF}, - {0xE1, 0x86, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x86, 0xE1}, - {0xA6, 0xC8, 0xFF, 0xFF, 0x73, 0x73, 0x73, 0x73, 0x73, 0xFF, 0xFF, 0xC8, 0xA5}, - {0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x82}, - {0x73, 0xFC, 0xFF, 0xFF, 0x73, 0x73, 0x73, 0x73, 0x73, 0xFF, 0xFF, 0xFC, 0x76}, - {0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x82}, - {0xA5, 0xC8, 0xFF, 0xFF, 0x73, 0x73, 0x73, 0x73, 0x73, 0xFF, 0xFF, 0xC8, 0xA5}, - {0xE0, 0x87, 0xF9, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x86, 0xE0}, - {0xFF, 0xB0, 0x9D, 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x9D, 0xB0, 0xFF}, - {0xFF, 0xFC, 0xAF, 0x85, 0xC8, 0xF0, 0xFC, 0xF0, 0xC8, 0x85, 0xAF, 0xFC, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xE0, 0xA5, 0x82, 0x76, 0x82, 0xA5, 0xE0, 0xFF, 0xFF, 0xFF} -}; - -const uint8_t sCircleMask[BurgerMenuView::k_burgerSize][BurgerMenuView::k_burgerSize] = { - {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE}, - {0xFF, 0xFF, 0xFF, 0xDF, 0x67, 0x1D, 0x06, 0x1D, 0x67, 0xDF, 0xFF, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xB9, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0xFF, 0xFF}, - {0xFF, 0xDF, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xDF, 0xFF}, - {0xFF, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0xFF}, - {0xFF, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xFF}, - {0xFF, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xFF}, - {0xFF, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xFF}, - {0xFF, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0xFF}, - {0xFF, 0xDF, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDF, 0xFF}, - {0xFF, 0xFF, 0xB9, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xDF, 0x67, 0x1D, 0x06, 0x1D, 0x67, 0xDF, 0x94, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF} -}; - -KDColor sBurgerWorkingBuffer[BurgerMenuView::k_burgerSize*BurgerMenuView::k_burgerSize]; - -void BurgerMenuView::drawRect(KDContext * ctx, KDRect rect) const { - /* Draw the burger vertically and horizontally centered in the view. */ - KDCoordinate widthCenter = bounds().width()/2; - KDCoordinate heightCenter = bounds().height()/2; - KDCoordinate burgerHalfSize = k_burgerSize/2; - KDRect frame(widthCenter - burgerHalfSize, heightCenter - burgerHalfSize, k_burgerSize, k_burgerSize); - // Reinitialize the color of the rectangle to avoid corruptions after successive drawings of burger view - KDColor sample = ctx->getPixel(KDPointZero); - ctx->fillRect(bounds(), sample); - // Draw the circle - ctx->blendRectWithMask(frame, m_backgroundColor, (const uint8_t *)sCircleMask, sBurgerWorkingBuffer); - // Draw the burger - ctx->blendRectWithMask(frame, KDColorBlack, (const uint8_t *)sBurgerMask, sBurgerWorkingBuffer); -} - -KDSize BurgerMenuView::minimalSizeForOptimalDisplay() const { - return KDSize(k_burgerSize, k_burgerSize); -} - -void BurgerMenuView::setBackgroundColor(KDColor color) { - m_backgroundColor = color; - markRectAsDirty(bounds()); -}