diff --git a/escher/Makefile b/escher/Makefile index b4b5d300b..8e6b0ff6c 100644 --- a/escher/Makefile +++ b/escher/Makefile @@ -10,7 +10,6 @@ objs += $(addprefix escher/src/,\ chevron_view.o\ clipboard.o\ container.o\ - dynamic_view_controller.o\ editable_text_cell.o\ ellipsis_view.o\ expression_field.o\ diff --git a/escher/include/escher.h b/escher/include/escher.h index c9660364a..1aa2b13fe 100644 --- a/escher/include/escher.h +++ b/escher/include/escher.h @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/escher/include/escher/dynamic_view_controller.h b/escher/include/escher/dynamic_view_controller.h deleted file mode 100644 index 422513155..000000000 --- a/escher/include/escher/dynamic_view_controller.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef ESCHER_DYNAMIC_VIEW_CONTROLLER_H -#define ESCHER_DYNAMIC_VIEW_CONTROLLER_H - -#include - -/* Dynamic view controllers dynamically construct their views when appearring - * and delete them when disappearing. - * The load method is called before any methods viewWillAppear, - * didEnterResponderChain and didBecomeFirstResponder. The unload method is - * called after viewWillDisappear, willExitResponderChain or - * willResignFirstResponder. */ - -class DynamicViewController : public ViewController { -public: - DynamicViewController(Responder * parentResponder); - ~DynamicViewController(); - DynamicViewController(const DynamicViewController& other) = delete; - DynamicViewController(DynamicViewController&& other) = delete; - DynamicViewController& operator=(const DynamicViewController& other) = delete; - DynamicViewController& operator=(DynamicViewController&& other) = delete; - View * view() override; - void viewWillAppear() override; - void viewDidDisappear() override; -private: - void loadViewIfNeeded(); - void unloadViewIfNeeded(); - virtual View * loadView() = 0; - virtual void unloadView(View * view) = 0; - View * m_view; -}; - -#endif diff --git a/escher/src/dynamic_view_controller.cpp b/escher/src/dynamic_view_controller.cpp deleted file mode 100644 index 1b1990501..000000000 --- a/escher/src/dynamic_view_controller.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include -#include -#include - -DynamicViewController::DynamicViewController(Responder * parentResponder) : - ViewController(parentResponder), - m_view(nullptr) -{ -} - -DynamicViewController::~DynamicViewController() { - assert(m_view == nullptr); -} - -View * DynamicViewController::view() { - loadViewIfNeeded(); - return m_view; -} - -void DynamicViewController::viewWillAppear() { - loadViewIfNeeded(); -} - -void DynamicViewController::viewDidDisappear() { - unloadViewIfNeeded(); -} - -void DynamicViewController::loadViewIfNeeded() { - if (m_view == nullptr) { - m_view = loadView(); - assert(m_view != nullptr); - } -} - -void DynamicViewController::unloadViewIfNeeded() { - if (m_view != nullptr) { - unloadView(m_view); - m_view = nullptr; - } -}