diff --git a/apps/apps_container.h b/apps/apps_container.h index cda82c429..5f23fbd1a 100644 --- a/apps/apps_container.h +++ b/apps/apps_container.h @@ -16,11 +16,6 @@ #include "backlight_dimming_timer.h" #include "shared/global_context.h" -#define USE_PIC_VIEW_APP 0 -#if USE_PIC_VIEW_APP -#include "picview/picview_app.h" -#endif - #ifdef EPSILON_BOOT_PROMPT #include "on_boarding/pop_up_controller.h" #endif @@ -70,9 +65,6 @@ private: AppsWindow m_window; EmptyBatteryWindow m_emptyBatteryWindow; -#if USE_PIC_VIEW_APP - PicViewApp m_picViewApp; -#endif Shared::GlobalContext m_globalContext; MathToolbox m_mathToolbox; VariableBoxController m_variableBoxController; diff --git a/apps/picview/Makefile b/apps/picview/Makefile deleted file mode 100644 index f08668d38..000000000 --- a/apps/picview/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -app_objs += $(addprefix apps/picview/,\ - pic_view.o\ - picview_app.o\ - picview_controller.o\ -) - -apps/picview/pic_view.cpp: apps/picview/image.c - -apps/picview/image.c: apps/picview/image.raw - @echo "RAW2C $@" - @echo "const /* Needed otherwise the image will eat up all RAM */" > $@ - @xxd -i $^ >> $@ - -apps/picview/image.raw: apps/picview/image.png - @echo "PNG2RAW $@" - @ffmpeg -loglevel panic -vcodec png -i $^ -vcodec rawvideo -f rawvideo -pix_fmt rgb565 $@ - -products += $(addprefix apps/picview/, image.raw image.c) diff --git a/apps/picview/pic_view.cpp b/apps/picview/pic_view.cpp deleted file mode 100644 index a12779f97..000000000 --- a/apps/picview/pic_view.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "pic_view.h" -#include - -PicView::PicView() : - View() { -} - -#include "image.c" - -void PicView::drawRect(KDContext * ctx, KDRect rect) const { - KDColor * pixels = (KDColor *)apps_picview_image_raw; - assert(apps_picview_image_raw_len == bounds().width() * bounds().height() * sizeof(KDColor)); - ctx->fillRectWithPixels(bounds(), pixels, nullptr); -} diff --git a/apps/picview/pic_view.h b/apps/picview/pic_view.h deleted file mode 100644 index 2beb68f96..000000000 --- a/apps/picview/pic_view.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef PICVIEW_PIC_VIEW_H -#define PICVIEW_PIC_VIEW_H - -#include - -class PicView : public View { -public: - PicView(); - void drawRect(KDContext * ctx, KDRect rect) const override; -}; - -#endif diff --git a/apps/picview/picview_app.cpp b/apps/picview/picview_app.cpp deleted file mode 100644 index 09e94215a..000000000 --- a/apps/picview/picview_app.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "picview_app.h" - -PicViewApp::PicViewApp(Container * container) : - ::App(container, &m_picViewController), - m_picViewController(PicViewController(&m_modalViewController)) -{ -} diff --git a/apps/picview/picview_app.h b/apps/picview/picview_app.h deleted file mode 100644 index 8040b0f25..000000000 --- a/apps/picview/picview_app.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef PICVIEW_PICVIEW_APP_H -#define PICVIEW_PICVIEW_APP_H - -#include -#include "picview_controller.h" - -class PicViewApp : public App { -public: - PicViewApp(Container * container); -private: - PicViewController m_picViewController; -}; - -#endif diff --git a/apps/picview/picview_controller.cpp b/apps/picview/picview_controller.cpp deleted file mode 100644 index b4c6610ea..000000000 --- a/apps/picview/picview_controller.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "picview_controller.h" - -PicViewController::PicViewController(Responder * parentResponder) : - ViewController(parentResponder), - m_view(PicView()) -{ -} - -View * PicViewController::view() { - return &m_view; -} - -/* - -const char * PicViewController::title() { - return "PicView"; -} -*/ diff --git a/apps/picview/picview_controller.h b/apps/picview/picview_controller.h deleted file mode 100644 index 846596aa2..000000000 --- a/apps/picview/picview_controller.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef PICVIEW_PICVIEW_CONTROLLER_H -#define PICVIEW_PICVIEW_CONTROLLER_H - -#include -#include "pic_view.h" - -class PicViewController : public ViewController { -public: - PicViewController(Responder * parentResponder); - View * view() override; -private: - PicView m_view; -}; - -#endif