From 6e22509b5ffe6d7c29d09b07f38e64fb1bdc0b21 Mon Sep 17 00:00:00 2001 From: okaestne Date: Tue, 17 Nov 2020 20:51:27 +0100 Subject: [PATCH] Delete Tab.cpp and Tab.h as discussed with JF --- src/displayapp/screens/Tab.cpp | 64 ---------------------------------- src/displayapp/screens/Tab.h | 25 ------------- 2 files changed, 89 deletions(-) delete mode 100644 src/displayapp/screens/Tab.cpp delete mode 100644 src/displayapp/screens/Tab.h diff --git a/src/displayapp/screens/Tab.cpp b/src/displayapp/screens/Tab.cpp deleted file mode 100644 index 7d7697b9..00000000 --- a/src/displayapp/screens/Tab.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "Tab.h" -#include -#include -#include -#include -#include "../DisplayApp.h" -#include "components/datetime/DateTimeController.h" -#include "components/gfx/Gfx.h" - -using namespace Pinetime::Applications::Screens; - -extern lv_font_t jetbrains_mono_bold_20; - -//static void event_handler(lv_obj_t * obj, lv_event_t event) { -// Tile* screen = static_cast(obj->user_data); -// screen->OnObjectEvent(obj, event); -//} - -Tab::Tab(DisplayApp* app, Pinetime::Components::Gfx &gfx) : Screen(app), gfx(gfx) { -/*Create a Tab view object*/ - lv_obj_t *tabview; - tabview = lv_tabview_create(lv_scr_act(), NULL); - - /*Add 3 tabs (the tabs are page (lv_page) and can be scrolled*/ - lv_obj_t *tab1 = lv_tabview_add_tab(tabview, "Tab 1"); - lv_obj_t *tab2 = lv_tabview_add_tab(tabview, "Tab 2"); - lv_obj_t *tab3 = lv_tabview_add_tab(tabview, "Tab 3"); - - - /*Add content to the tabs*/ - lv_obj_t * label = lv_label_create(tab1, NULL); - lv_label_set_text(label, "This the first tab\n\n" - "If the content\n" - "of a tab\n" - "become too long\n" - "the it \n" - "automatically\n" - "become\n" - "scrollable."); - - label = lv_label_create(tab2, NULL); - lv_label_set_text(label, "Second tab"); - - label = lv_label_create(tab3, NULL); - lv_label_set_text(label, "Third tab"); - -} - -Tab::~Tab() { - lv_obj_clean(lv_scr_act()); -} - -void Tab::Refresh(bool fullRefresh) { - -} - -void Tab::OnObjectEvent(lv_obj_t *obj, lv_event_t event) { - if(event == LV_EVENT_CLICKED) { - NRF_LOG_INFO("Clicked"); - } - else if(event == LV_EVENT_VALUE_CHANGED) { - NRF_LOG_INFO("Toggled"); - } -} diff --git a/src/displayapp/screens/Tab.h b/src/displayapp/screens/Tab.h deleted file mode 100644 index 10661295..00000000 --- a/src/displayapp/screens/Tab.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "Screen.h" -#include -#include - -namespace Pinetime { - namespace Components { - class Gfx; - } - namespace Applications { - namespace Screens { - class Tab : public Screen { - public: - explicit Tab(DisplayApp* app, Components::Gfx& gfx); - ~Tab() override; - void Refresh(bool fullRefresh); - void OnObjectEvent(lv_obj_t* obj, lv_event_t event); - - protected: - Components::Gfx& gfx; - }; - } - } -}