From e4f3f4b1346358340a66770f099fe7e18ec3f87c Mon Sep 17 00:00:00 2001
From: Oskar Chodowicz <o.chodowicz@samsung.com>
Date: Fri, 15 Feb 2019 19:22:56 +0100
Subject: [PATCH 01/16] fix for crash on switch addition

Change-Id: Ibd89c8e70c827bad18e499f4795f7d26b2e876d4
---
 src/UniversalSwitchPage.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/UniversalSwitchPage.cpp b/src/UniversalSwitchPage.cpp
index 15c7be9..3732250 100644
--- a/src/UniversalSwitchPage.cpp
+++ b/src/UniversalSwitchPage.cpp
@@ -138,7 +138,8 @@ void UniversalSwitchPage::onNewSwitchAddition(void *data, const std::string &swi
 {
 	retm_if(data == NULL, "Input parameter is NULL");
 	auto ad = static_cast<SettingAccessibility *>(data);
-	SwitchesPage::addSwitchCb(ad, switch_id, switch_action, switch_name);
+	//TODO Try to use service which is independent from specific view
+	setting_accessibility_universal_switch_dbus_config_addSwitchConfigurationItem(&ad->config, switch_id.c_str(), switch_name.c_str(), switch_action.c_str());
 	int switch_count = setting_accessibility_universal_switch_dbus_config_get_switch_count(&ad->config);
 
 	if (switch_count == 1)
-- 
2.7.4


From ca1746d531c3f787953b95457f9219afc28a123d Mon Sep 17 00:00:00 2001
From: Oskar Chodowicz <o.chodowicz@samsung.com>
Date: Wed, 6 Feb 2019 12:43:44 +0100
Subject: [PATCH 02/16] Set all widgets defaultly visible

Change-Id: I8d4f391015c985db8ec4d07042107697e2030781
---
 src/AccessoriesSwitchesPage.cpp  | 10 ----------
 src/Box.cpp                      |  1 +
 src/Button.cpp                   |  2 ++
 src/Check.cpp                    |  1 +
 src/Conformant.cpp               |  1 +
 src/CtxPopup.cpp                 |  1 +
 src/Entry.cpp                    |  1 +
 src/Genlist.cpp                  |  1 +
 src/Icon.cpp                     |  1 +
 src/Image.cpp                    |  1 +
 src/Layout.cpp                   |  1 +
 src/MainData.cpp                 |  5 -----
 src/Naviframe.cpp                |  1 +
 src/Popup.cpp                    |  2 ++
 src/Radio.cpp                    |  1 +
 src/RemoveSwitchPage.cpp         |  2 --
 src/ScreenReaderSettingsPage.cpp |  5 -----
 src/Scroller.cpp                 |  1 +
 src/SetValuePage.cpp             |  2 --
 src/Slider.cpp                   |  1 +
 src/Toolbar.cpp                  |  1 +
 src/UniversalSwitchPage.cpp      |  3 ---
 src/UpdateSwitchPage.cpp         |  2 --
 src/Widget.cpp                   |  5 +++++
 src/Widget.hpp                   |  1 +
 25 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/AccessoriesSwitchesPage.cpp b/src/AccessoriesSwitchesPage.cpp
index 47d414e..f833c25 100644
--- a/src/AccessoriesSwitchesPage.cpp
+++ b/src/AccessoriesSwitchesPage.cpp
@@ -28,7 +28,6 @@ AccessoriesSwitchesPage::AccessoriesSwitchesPage(SettingAccessibility *ad)
 	auto naviframe = context_->md.getNaviframe();
 	auto layout = Widget::make<Layout>(naviframe, EDJ_ACCESSORY, GRP_ACCESSORY);
 	layout->setText(PRT_ACCESSORY_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_ACCESSORIES_DESC");
-	layout->show();
 
 	naviframe->pushBack("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_ACCESSORIES_TITLE", layout, {}, [this]() {
 		setting_accessibility_universal_switch_dbus_config_cancelCaptureSwitch(&context_->config);
@@ -39,7 +38,6 @@ AccessoriesSwitchesPage::AccessoriesSwitchesPage(SettingAccessibility *ad)
 		naviframe->popBack();
 	});
 	prevBtn->setStyle(Button::BACK_BUTTON_ARROW_STYLE);
-	prevBtn->show();
 	layout->setPartContent("prev_btn", prevBtn);
 
 	context_->us_configuration.switch_id = {};
@@ -74,13 +72,11 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 	popup->setEextEventCallback(EEXT_CALLBACK_BACK, []() {});
 
 	auto layout = Widget::make<Layout>(popup, EDJ_ACCESSORY_POPUP, GRP_ACCESSORY_POPUP);
-	layout->show();
 	popup->setContent(layout);
 
 	auto entry = Widget::make<Entry>(layout);
 	entry->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	entry->setPartText("guide", "IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_NAME");
-	entry->show();
 	layout->setPartContent(PRT_ACCESSORY_POPUP_ENTRY, entry);
 
 	auto cancelBtnCb = [popup, this]() {
@@ -91,7 +87,6 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 
 	auto cancelBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL", cancelBtnCb);
 	cancelBtn->setStyle("popup");
-	cancelBtn->show();
 	popup->setPartContent("button1", cancelBtn);
 
 	auto saveBtnCb = [popup, entry, this]() {
@@ -110,9 +105,7 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 
 	auto saveBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_SAVE", saveBtnCb);
 	saveBtn->setStyle("popup");
-	saveBtn->show();
 	popup->setPartContent("button2", saveBtn);
-	popup->show();
 }
 
 void AccessoriesSwitchesPage::alreadyMappedSwitchPopup()
@@ -128,14 +121,11 @@ void AccessoriesSwitchesPage::alreadyMappedSwitchPopup()
 
 	auto okBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_OK", okBtnCb);
 	okBtn->setStyle("popup");
-	okBtn->show();
 	popup->setPartContent("button1", okBtn);
 
 	auto layout = Widget::make<Layout>(popup, EDJ_ACCESSORY_POPUP, GRP_ACCESSORY_POPUP);
 	layout->setPartText(PRT_ACCESSORY_POPUP_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_ALREADY_ADDED");
-	layout->show();
 	popup->setContent(layout);
-	popup->show();
 }
 
 void AccessoriesSwitchesPage::accessorySwitchActionCb(SettingAccessibility *ad, const std::string &action, void *user_data)
diff --git a/src/Box.cpp b/src/Box.cpp
index 9186d48..c35e4d3 100644
--- a/src/Box.cpp
+++ b/src/Box.cpp
@@ -4,6 +4,7 @@ Box::Box(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_box_add(parent->getObject()));
+	show();
 }
 
 void Box::packEnd(Widget *widget)
diff --git a/src/Button.cpp b/src/Button.cpp
index 71f393e..30db1f1 100644
--- a/src/Button.cpp
+++ b/src/Button.cpp
@@ -6,6 +6,7 @@ Button::Button(Widget *parent)
 	uniqueObj_.reset(elm_button_add(parent->getObject()));
 	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	setAlignHint(EVAS_HINT_FILL, 0.5);
+	show();
 }
 
 Button::Button(Widget *parent, const TranslatedString &text, std::function<void()> onClick)
@@ -15,4 +16,5 @@ Button::Button(Widget *parent, const TranslatedString &text, std::function<void(
 	setAlignHint(EVAS_HINT_FILL, 0.5);
 	setText(text);
 	setEvasSmartCallback("clicked", onClick);
+	show();
 }
diff --git a/src/Check.cpp b/src/Check.cpp
index 50d6e3d..7ef4854 100644
--- a/src/Check.cpp
+++ b/src/Check.cpp
@@ -4,6 +4,7 @@ Check::Check(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_check_add(parent->getObject()));
+	show();
 }
 
 void Check::setState(Eina_Bool state)
diff --git a/src/Conformant.cpp b/src/Conformant.cpp
index 7789711..ac288e5 100644
--- a/src/Conformant.cpp
+++ b/src/Conformant.cpp
@@ -4,4 +4,5 @@ Conformant::Conformant(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_conformant_add(parent->getObject()));
+	show();
 }
diff --git a/src/CtxPopup.cpp b/src/CtxPopup.cpp
index dd2b303..6d5c8a1 100644
--- a/src/CtxPopup.cpp
+++ b/src/CtxPopup.cpp
@@ -4,6 +4,7 @@ CtxPopup::CtxPopup(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_ctxpopup_add(parent->getObject()));
+	show();
 }
 
 void CtxPopup::setAutoHide(bool autoHide)
diff --git a/src/Entry.cpp b/src/Entry.cpp
index be16b54..c559d5f 100644
--- a/src/Entry.cpp
+++ b/src/Entry.cpp
@@ -4,6 +4,7 @@ Entry::Entry(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_entry_add(parent->getObject()));
+	show();
 }
 
 void Entry::setEntryText(const TranslatedString &text)
diff --git a/src/Genlist.cpp b/src/Genlist.cpp
index 4068f93..87f575a 100644
--- a/src/Genlist.cpp
+++ b/src/Genlist.cpp
@@ -5,6 +5,7 @@ Genlist::Genlist(Widget *parent)
 {
 	uniqueObj_.reset(elm_genlist_add(parent->getObject()));
 	parent_ = parent;
+	show();
 }
 
 void Genlist::setMode(Elm_List_Mode mode)
diff --git a/src/Icon.cpp b/src/Icon.cpp
index d563bfc..9f02098 100644
--- a/src/Icon.cpp
+++ b/src/Icon.cpp
@@ -4,4 +4,5 @@ Icon::Icon(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_icon_add(parent->getObject()));
+	show();
 }
diff --git a/src/Image.cpp b/src/Image.cpp
index 2a0d697..a26e332 100644
--- a/src/Image.cpp
+++ b/src/Image.cpp
@@ -4,4 +4,5 @@ Image::Image(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_image_add(parent->getObject()));
+	show();
 }
diff --git a/src/Layout.cpp b/src/Layout.cpp
index 08099ab..d3d5422 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -7,6 +7,7 @@ Layout::Layout(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_layout_add(parent->getObject()));
+	show();
 }
 
 Layout::Layout(Widget *parent, const std::string &edjeFile, const std::string &group)
diff --git a/src/MainData.cpp b/src/MainData.cpp
index 0cc03f1..d1cb375 100644
--- a/src/MainData.cpp
+++ b/src/MainData.cpp
@@ -70,7 +70,6 @@ int MainData::initViewWithoutGenlist(const std::string &name)
 	auto conformant = Widget::make<Conformant>(window.get());
 	conformant->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	window->setConformant(true);
-	conformant->show();
 	window->addResizeObject(conformant);
 
 	naviframe_ = Widget::make<Naviframe>(conformant);
@@ -86,9 +85,6 @@ int MainData::initViewWithoutGenlist(const std::string &name)
 	naviframe_->pushBack(name, layout_, {}, {});
 	naviframe_it = naviframe_->top();
 
-	naviframe_->show();
-	layout_->show();
-
 	return SETTING_RETURN_SUCCESS;
 }
 
@@ -105,7 +101,6 @@ void MainData::prepareViewList()
 	genlist_ = Widget::make<Genlist>(layout_);
 	genlist_->setMode(ELM_LIST_COMPRESS);
 	genlist_->setStyle("dialogue");
-	genlist_->show();
 }
 
 void MainData::createMainWindow(const std::string &name)
diff --git a/src/Naviframe.cpp b/src/Naviframe.cpp
index c407b7d..1478f5a 100644
--- a/src/Naviframe.cpp
+++ b/src/Naviframe.cpp
@@ -10,6 +10,7 @@ Naviframe::Naviframe(Widget *parent)
 	uniqueObj_.reset(elm_naviframe_add(parent->getObject()));
 	eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
 	eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL);
+	show();
 }
 
 void Naviframe::createPrevBtnAutomatically(bool automatically)
diff --git a/src/Popup.cpp b/src/Popup.cpp
index 61de614..d21b49b 100644
--- a/src/Popup.cpp
+++ b/src/Popup.cpp
@@ -5,6 +5,7 @@ Popup::Popup(Widget *parent)
 {
 	uniqueObj_.reset(elm_popup_add(parent->getObject()));
 	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	show();
 }
 
 Popup::Popup(Widget *parent, const TranslatedString &title)
@@ -12,6 +13,7 @@ Popup::Popup(Widget *parent, const TranslatedString &title)
 	uniqueObj_.reset(elm_popup_add(parent->getObject()));
 	setPartText("title,text", title);
 	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	show();
 }
 
 void Popup::setOrientation(Elm_Popup_Orient orientation)
diff --git a/src/Radio.cpp b/src/Radio.cpp
index 711f5d0..3783ffb 100644
--- a/src/Radio.cpp
+++ b/src/Radio.cpp
@@ -4,6 +4,7 @@ Radio::Radio(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_radio_add(parent->getObject()));
+	show();
 }
 
 void Radio::addToGroup(Radio &radio)
diff --git a/src/RemoveSwitchPage.cpp b/src/RemoveSwitchPage.cpp
index 3c3a27d..9f92d7c 100644
--- a/src/RemoveSwitchPage.cpp
+++ b/src/RemoveSwitchPage.cpp
@@ -155,8 +155,6 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 	};
 	deleteSwitchBtn->setEvasSmartCallback("clicked", removeSwitchCb);
 	popup->setPartContent("button2", deleteSwitchBtn);
-
-	popup->show();
 }
 
 void RemoveSwitchPage::removeSwitch(size_t item_id)
diff --git a/src/ScreenReaderSettingsPage.cpp b/src/ScreenReaderSettingsPage.cpp
index 937c674..2d80fa4 100644
--- a/src/ScreenReaderSettingsPage.cpp
+++ b/src/ScreenReaderSettingsPage.cpp
@@ -265,7 +265,6 @@ void ScreenReaderSettingsPage::mouseUpGendialListCb(void *data, Evas_Object *obj
 
 	genlist->blockScrolling(Elm_Scroller_Movement_Block(ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL | ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL));
 	genlist->setScrollbarsVisibility(ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-	genlist->show();
 
 	box->packEnd(genlist);
 
@@ -295,8 +294,6 @@ void ScreenReaderSettingsPage::mouseUpGendialListCb(void *data, Evas_Object *obj
 	btnDone->setText("IDS_MSG_ACBUTTON_DONE_ABB");
 	btnDone->setEvasSmartCallback("clicked", onDone);
 	self->popup_->setPartContent("button2", btnDone);
-
-	self->popup_->show();
 }
 
 void ScreenReaderSettingsPage::vibrationFeedbackCb(void *data, Evas_Object *obj, void *event_info)
@@ -477,8 +474,6 @@ void ScreenReaderSettingsPage::createSpeechRatePopup(void *item)
 	popup_->setPartContent("button2", doneBtn);
 
 	evas_object_event_callback_add(popup_->getObject(), EVAS_CALLBACK_DEL, onPopupDel, item);
-
-	popup_->show();
 }
 
 void ScreenReaderSettingsPage::onPopupDel(void *data, Evas *e, Evas_Object *obj, void *event_info)
diff --git a/src/Scroller.cpp b/src/Scroller.cpp
index 1272874..31f43b3 100644
--- a/src/Scroller.cpp
+++ b/src/Scroller.cpp
@@ -4,6 +4,7 @@ Scroller::Scroller(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_scroller_add(parent->getObject()));
+	show();
 }
 
 void Scroller::setScrollbarsVisibility(Elm_Scroller_Policy h, Elm_Scroller_Policy v)
diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index 13f63a5..6b52a25 100644
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -401,7 +401,6 @@ Genlist *SetValuePage::createGenlist(Widget *parent, const char *title)
 		createGendialTitleItem(genlist->getObject(), &itc_group_item, title);
 
 	parent->setPartContent(PRT_SET_VALUE_LIST, genlist);
-	genlist->show();
 
 	return genlist;
 }
@@ -475,7 +474,6 @@ Layout *SetValuePage::createLayout(Widget *parent, const std::string &layout_grp
 	auto layout = Widget::make<Layout>(parent);
 	layout->setFile(edj_path, layout_grp);
 	layout->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	layout->show();
 
 	return layout;
 }
diff --git a/src/Slider.cpp b/src/Slider.cpp
index 6fdcfc8..a2e4954 100644
--- a/src/Slider.cpp
+++ b/src/Slider.cpp
@@ -4,6 +4,7 @@ Slider::Slider(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_slider_add(parent->getObject()));
+	show();
 }
 
 void Slider::showIndicator(bool show)
diff --git a/src/Toolbar.cpp b/src/Toolbar.cpp
index 9caa153..227ecb1 100644
--- a/src/Toolbar.cpp
+++ b/src/Toolbar.cpp
@@ -4,6 +4,7 @@ Toolbar::Toolbar(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_toolbar_add(parent->getObject()));
+	show();
 }
 
 void Toolbar::setSelectMode(Elm_Object_Select_Mode mode)
diff --git a/src/UniversalSwitchPage.cpp b/src/UniversalSwitchPage.cpp
index 449bf13..189e998 100644
--- a/src/UniversalSwitchPage.cpp
+++ b/src/UniversalSwitchPage.cpp
@@ -138,7 +138,6 @@ void UniversalSwitchPage::updateVconfKey(int state)
 			parent->removeChild(popup);
 		};
 		auto addBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_POPUP_ADD", addBtnCb);
-		addBtn->show();
 		addBtn->setStyle("popup");
 		popup->setPartContent("button1", addBtn);
 
@@ -149,10 +148,8 @@ void UniversalSwitchPage::updateVconfKey(int state)
 			parent->removeChild(popup);
 		};
 		auto cancelBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL", cancelBtnCb);
-		cancelBtn->show();
 		cancelBtn->setStyle("popup");
 		popup->setPartContent("button2", cancelBtn);
-		popup->show();
 	} else {
 		setState(state);
 	}
diff --git a/src/UpdateSwitchPage.cpp b/src/UpdateSwitchPage.cpp
index d1a15d5..e09322b 100644
--- a/src/UpdateSwitchPage.cpp
+++ b/src/UpdateSwitchPage.cpp
@@ -119,7 +119,6 @@ Layout *UpdateSwitchPage::createLayout(Widget *parent, const std::string &layout
 	auto layout = Widget::make<Layout>(parent);
 	layout->setFile(edj_path, layout_grp);
 	layout->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	layout->show();
 
 	return layout;
 }
@@ -136,7 +135,6 @@ Genlist *UpdateSwitchPage::createGenlist(Widget *parent, const char *title)
 		createGendialTitleItem(genlist->getObject(), &itc_group_item, title);
 
 	parent->setPartContent(PRT_SET_VALUE_LIST, genlist);
-	genlist->show();
 
 	return genlist;
 }
diff --git a/src/Widget.cpp b/src/Widget.cpp
index f338e81..0a3c06f 100644
--- a/src/Widget.cpp
+++ b/src/Widget.cpp
@@ -82,6 +82,11 @@ void Widget::show()
 	evas_object_show(uniqueObj_.get());
 }
 
+void Widget::hide()
+{
+	evas_object_hide(uniqueObj_.get());
+}
+
 Evas_Object *Widget::getObject()
 {
 	return uniqueObj_.get();
diff --git a/src/Widget.hpp b/src/Widget.hpp
index 18c9526..0d864a5 100644
--- a/src/Widget.hpp
+++ b/src/Widget.hpp
@@ -48,6 +48,7 @@ public:
 	void setPartContent(const std::string &part, Widget *content);
 	void emitSignal(const std::string &signal);
 	void show();
+	void hide();
 	Evas_Object *getObject();
 	Widget *getParent();
 	void addChild(std::unique_ptr<Widget> child);
-- 
2.7.4


From bb1d81908360d583cb088468463581101d2d514b Mon Sep 17 00:00:00 2001
From: Oskar Chodowicz <o.chodowicz@samsung.com>
Date: Thu, 7 Feb 2019 18:05:49 +0100
Subject: [PATCH 03/16] Use Button class instead of Evas_Object

Change-Id: I47704c34796cfa845656d5a7b683509f4e8092e1
---
 src/AccessibilityLauncherPage.cpp   | 19 +++++-------
 src/AccessibilityLauncherPage.hpp   |  1 -
 src/AccessoriesSwitchesPage.cpp     | 13 ++++-----
 src/AddSwitchPage.cpp               | 19 +++++-------
 src/AddSwitchPage.hpp               |  1 -
 src/Button.cpp                      |  5 +++-
 src/Button.hpp                      |  3 +-
 src/CameraSwitchesPage.cpp          | 19 +++++-------
 src/CameraSwitchesPage.hpp          |  1 -
 src/MainData.cpp                    | 29 +++++++------------
 src/MainData.hpp                    |  6 ++--
 src/MainPage.cpp                    | 14 +++------
 src/MainPage.hpp                    |  1 -
 src/Naviframe.cpp                   | 34 ++++++++++++++++++----
 src/Naviframe.hpp                   | 11 +++++--
 src/RemoveSwitchPage.cpp            | 35 ++++++++--------------
 src/RemoveSwitchPage.hpp            |  4 +--
 src/ScreenReaderSettingsPage.cpp    | 22 ++++----------
 src/SetValuePage.cpp                | 46 ++++++++++++++---------------
 src/SetValuePage.hpp                |  2 ++
 src/SwitchesPage.cpp                | 38 +++++++++---------------
 src/SwitchesPage.hpp                |  5 ++--
 src/UniversalSwitchPage.cpp         | 58 ++++++++++++++-----------------------
 src/UniversalSwitchPage.hpp         |  5 ++--
 src/UniversalSwitchSettingsPage.cpp | 12 +++++---
 src/Widget.cpp                      | 11 +++++++
 src/Widget.hpp                      |  2 ++
 src/WidgetFactory.cpp               |  5 ----
 src/WidgetFactory.hpp               |  1 -
 29 files changed, 188 insertions(+), 234 deletions(-)

diff --git a/src/AccessibilityLauncherPage.cpp b/src/AccessibilityLauncherPage.cpp
index 4dadb3c..d309e1e 100644
--- a/src/AccessibilityLauncherPage.cpp
+++ b/src/AccessibilityLauncherPage.cpp
@@ -46,7 +46,8 @@ AccessibilityLauncherPage::AccessibilityLauncherPage(SettingAccessibility *ad)
 
 	int state = 0;
 
-	auto genlist = Widget::make<Genlist>(ad->md.getNaviframe());
+	auto naviframe = ad->md.getNaviframe();
+	auto genlist = Widget::make<Genlist>(naviframe);
 	genlist->setMode(ELM_LIST_COMPRESS);
 	genlist->setStyle("dialogue");
 	genlist->clear(); // TODO check if necessary
@@ -96,12 +97,15 @@ AccessibilityLauncherPage::AccessibilityLauncherPage(SettingAccessibility *ad)
 
 	}
 
-	ad->md.naviframe_it = elm_naviframe_item_push(ad->md.getNaviframe()->getObject(), _("IDS_ACCS_ACCESSIBILITY_LAUNCHER"), NULL, NULL, genlist->getObject(), NULL);
+	ad->md.naviframe_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_ACCESSIBILITY_LAUNCHER"), NULL, NULL, genlist->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(ad->md.naviframe_it, onNaviframePopCb, items);
 	elm_object_item_domain_text_translatable_set(ad->md.naviframe_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(ad->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, onBackButtonCb, ad);
-	elm_layout_content_set(ad->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
+
 }
 
 Eina_Bool AccessibilityLauncherPage::onNaviframePopCb(void *data, Elm_Object_Item *it)
@@ -113,13 +117,6 @@ Eina_Bool AccessibilityLauncherPage::onNaviframePopCb(void *data, Elm_Object_Ite
 	return EINA_TRUE;
 }
 
-void AccessibilityLauncherPage::onBackButtonCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
-
 void AccessibilityLauncherPage::updateVconf(ItemWrapper *items)
 {
 	int value = 0;
diff --git a/src/AccessibilityLauncherPage.hpp b/src/AccessibilityLauncherPage.hpp
index 8a2cc69..de1f36d 100644
--- a/src/AccessibilityLauncherPage.hpp
+++ b/src/AccessibilityLauncherPage.hpp
@@ -43,7 +43,6 @@ public:
 
 private:
 	static Eina_Bool onNaviframePopCb(void *data, Elm_Object_Item *it);
-	static void onBackButtonCb(void *data, Evas_Object *obj, void *event_info);
 	static void updateVconf(ItemWrapper *items);
 	static void onCheckboxChangeCb(void *data, Evas_Object *obj, void *event_info);
 	static void onItemSelectedCb(void *data, Evas_Object *obj, void *event_info);
diff --git a/src/AccessoriesSwitchesPage.cpp b/src/AccessoriesSwitchesPage.cpp
index f833c25..f83e327 100644
--- a/src/AccessoriesSwitchesPage.cpp
+++ b/src/AccessoriesSwitchesPage.cpp
@@ -34,11 +34,10 @@ AccessoriesSwitchesPage::AccessoriesSwitchesPage(SettingAccessibility *ad)
 		context_->us_configuration.switch_id = {};
 	});
 
-	auto prevBtn = Widget::make<Button>(layout, std::string{}, [naviframe]() {
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
 		naviframe->popBack();
-	});
-	prevBtn->setStyle(Button::BACK_BUTTON_ARROW_STYLE);
-	layout->setPartContent("prev_btn", prevBtn);
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 
 	context_->us_configuration.switch_id = {};
 	setting_accessibility_universal_switch_dbus_config_captureSwitch(&context_->config, ACCESSIBILITY_UNIVERSAL_SWITCH_ACCESSORIES_SWITCH_PROVIDER, -1, captureSwitchCb, this);
@@ -85,7 +84,7 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 		setting_accessibility_universal_switch_dbus_config_captureSwitch(&context_->config, ACCESSIBILITY_UNIVERSAL_SWITCH_ACCESSORIES_SWITCH_PROVIDER, -1, captureSwitchCb, this);
 	};
 
-	auto cancelBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL", cancelBtnCb);
+	auto cancelBtn = Widget::make<Button>(popup, cancelBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL");
 	cancelBtn->setStyle("popup");
 	popup->setPartContent("button1", cancelBtn);
 
@@ -103,7 +102,7 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 		parent->removeChild(popup);
 	};
 
-	auto saveBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_SAVE", saveBtnCb);
+	auto saveBtn = Widget::make<Button>(popup, saveBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_SAVE");
 	saveBtn->setStyle("popup");
 	popup->setPartContent("button2", saveBtn);
 }
@@ -119,7 +118,7 @@ void AccessoriesSwitchesPage::alreadyMappedSwitchPopup()
 		parent->removeChild(popup);
 	};
 
-	auto okBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_OK", okBtnCb);
+	auto okBtn = Widget::make<Button>(popup, okBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_OK");
 	okBtn->setStyle("popup");
 	popup->setPartContent("button1", okBtn);
 
diff --git a/src/AddSwitchPage.cpp b/src/AddSwitchPage.cpp
index c0317b1..c73c3af 100644
--- a/src/AddSwitchPage.cpp
+++ b/src/AddSwitchPage.cpp
@@ -27,7 +27,8 @@ AddSwitchPage::AddSwitchPage(SettingAccessibility *ad)
 {
 	retm_if(ad == NULL, "Input parameter is NULL");
 
-	auto genlist = Widget::make<Genlist>(context_->md.getNaviframe());
+	auto naviframe = context_->md.getNaviframe();
+	auto genlist = Widget::make<Genlist>(naviframe);
 	genlist->setMode(ELM_LIST_COMPRESS);
 	genlist->setStyle("dialogue");
 	genlist->clear(); // TODO check if necessary
@@ -47,12 +48,14 @@ AddSwitchPage::AddSwitchPage(SettingAccessibility *ad)
 		}
 	}
 
-	Elm_Object_Item *navi_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH"), NULL, NULL, genlist->getObject(), NULL);
+	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH"), NULL, NULL, genlist->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(navi_it, onNaviframePopCb, context_);
 	elm_object_item_domain_text_translatable_set(navi_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, context_);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 }
 
 void AddSwitchPage::attachCallbackOnSwitchAttach(UniversalSwitchCb cb, void *cbData)
@@ -112,14 +115,6 @@ void AddSwitchPage::showSwitchesPage(const std::string &providerId)
 	}
 }
 
-void AddSwitchPage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
-
 Eina_Bool AddSwitchPage::onNaviframePopCb(void *data, Elm_Object_Item *it)
 {
 	return EINA_TRUE;
diff --git a/src/AddSwitchPage.hpp b/src/AddSwitchPage.hpp
index 201cc1c..1a983c2 100644
--- a/src/AddSwitchPage.hpp
+++ b/src/AddSwitchPage.hpp
@@ -48,7 +48,6 @@ private:
 	static void disableScreenSwitchProviderIfSwitchMapped(const std::vector<UniversalSwitchConfigurationItem *> &configuration_items, UniversalSwitchSwitchProvider *switch_provider, Elm_Object_Item *item);
 	static void onSwitchAddition(void *data, Evas_Object *obj, void *event_info);
 	void showSwitchesPage(const std::string &providerId);
-	static void backCb(void *data, Evas_Object *obj, void *event_info);
 	static Eina_Bool onNaviframePopCb(void *data, Elm_Object_Item *it);
 
 	SettingAccessibility *context_ = nullptr;
diff --git a/src/Button.cpp b/src/Button.cpp
index 30db1f1..65a1650 100644
--- a/src/Button.cpp
+++ b/src/Button.cpp
@@ -1,4 +1,5 @@
 #include "Button.hpp"
+#include "setting-debug.h"
 
 Button::Button(Widget *parent)
 	: Widget(parent)
@@ -9,12 +10,14 @@ Button::Button(Widget *parent)
 	show();
 }
 
-Button::Button(Widget *parent, const TranslatedString &text, std::function<void()> onClick)
+Button::Button(Widget *parent, std::function<void()> onClick, const TranslatedString &text, const std::string &style)
 {
 	uniqueObj_.reset(elm_button_add(parent->getObject()));
 	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	setAlignHint(EVAS_HINT_FILL, 0.5);
 	setText(text);
+	if(!style.empty())
+		setStyle(style);
 	setEvasSmartCallback("clicked", onClick);
 	show();
 }
diff --git a/src/Button.hpp b/src/Button.hpp
index dbbf5bc..dd57a16 100644
--- a/src/Button.hpp
+++ b/src/Button.hpp
@@ -9,7 +9,8 @@ public:
 	static constexpr const char *BACK_BUTTON_ARROW_STYLE = "naviframe/end_btn/default";
 
 	Button(Widget *parent);
-	Button(Widget *parent, const TranslatedString &text, std::function<void()> onClick);
+	Button(Widget *parent, std::function<void()> onClick, const TranslatedString &text = {}, const std::string &style = {});
+
 };
 
 #endif
diff --git a/src/CameraSwitchesPage.cpp b/src/CameraSwitchesPage.cpp
index 893f995..3391477 100644
--- a/src/CameraSwitchesPage.cpp
+++ b/src/CameraSwitchesPage.cpp
@@ -25,7 +25,8 @@
 CameraSwitchesPage::CameraSwitchesPage(SettingAccessibility *ad)
 	: context_(ad)
 {
-	auto genlist = Widget::make<Genlist>(context_->md.getNaviframe());
+	auto naviframe = context_->md.getNaviframe();
+	auto genlist = Widget::make<Genlist>(naviframe);
 	genlist->setMode(ELM_LIST_COMPRESS);
 	genlist->setStyle("dialogue");
 	genlist->clear(); // TODO check if necessary
@@ -58,11 +59,13 @@ CameraSwitchesPage::CameraSwitchesPage(SettingAccessibility *ad)
 		}
 	}
 
-	Elm_Object_Item *navi_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_CAMERA_TITLE"), NULL, NULL, genlist->getObject(), NULL);
+	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_CAMERA_TITLE"), NULL, NULL, genlist->getObject(), NULL);
 	elm_object_item_domain_text_translatable_set(navi_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, context_);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 }
 
 void CameraSwitchesPage::attachActionCallback(UniversalSwitchCb cb, void *cbData)
@@ -93,11 +96,3 @@ void CameraSwitchesPage::switchActionCb(SettingAccessibility *ad, const std::str
 		self->camera_switch_added_cb(self->camera_switch_added_cb_data, self->chosenSwitch_->id, action, self->chosenSwitch_->name);
 	self->chosenSwitch_ = nullptr;
 }
-
-void CameraSwitchesPage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
diff --git a/src/CameraSwitchesPage.hpp b/src/CameraSwitchesPage.hpp
index ec20f3d..b1ddc92 100644
--- a/src/CameraSwitchesPage.hpp
+++ b/src/CameraSwitchesPage.hpp
@@ -38,7 +38,6 @@ public:
 private:
 	static void addSwitchCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchActionCb(SettingAccessibility *ad, const std::string &action, void *user_data);
-	static void backCb(void *data, Evas_Object *obj, void *event_info);
 
 	SettingAccessibility *context_ = nullptr;
 	GenGroupItemData *universal_switch_camera_comment = nullptr;
diff --git a/src/MainData.cpp b/src/MainData.cpp
index d1cb375..ede896b 100644
--- a/src/MainData.cpp
+++ b/src/MainData.cpp
@@ -19,6 +19,7 @@
 #include "setting-common-general-func.h"
 #include "setting-common-draw-widget.h"
 #include "setting-debug.h"
+#include "Button.hpp"
 #include "WidgetFactory.hpp"
 
 #include <app.h>
@@ -39,10 +40,10 @@ int MainData::initApp(const std::string &name)
 	return SETTING_RETURN_SUCCESS;
 }
 
-void MainData::initView(const std::string &name)
+void MainData::initView(const TranslatedString &name, std::function<void()> backCb)
 {
 	/* init without genlist */
-	auto ret = initViewWithoutGenlist(name);
+	auto ret = initViewWithoutGenlist(name, backCb);
 	if (ret != SETTING_RETURN_SUCCESS)
 		return;
 
@@ -65,7 +66,7 @@ Genlist *MainData::getGenlist() const
 	return genlist_;
 }
 
-int MainData::initViewWithoutGenlist(const std::string &name)
+int MainData::initViewWithoutGenlist(const TranslatedString &name, std::function<void()> backCb)
 {
 	auto conformant = Widget::make<Conformant>(window.get());
 	conformant->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -82,7 +83,11 @@ int MainData::initViewWithoutGenlist(const std::string &name)
 	layout_ = Widget::make<Layout>(naviframe_);
 	layout_->setTheme("layout", "application", "default");
 
-	naviframe_->pushBack(name, layout_, {}, {});
+	auto prevBtn = Widget::make<Button>(naviframe_, [naviframe = naviframe_]() {
+		naviframe->popBack();
+	}, "IDS_ST_BUTTON_BACK", Button::BACK_BUTTON_ARROW_STYLE);
+
+	naviframe_->pushBack(name, layout_, {}, backCb, prevBtn);
 	naviframe_it = naviframe_->top();
 
 	return SETTING_RETURN_SUCCESS;
@@ -115,18 +120,4 @@ void MainData::createMainWindow(const std::string &name)
 	window->setIndicatorMode(ELM_WIN_INDICATOR_SHOW);
 	window->setOpacity(ELM_WIN_INDICATOR_OPAQUE);
 
-}
-
-void MainData::addBackButton(Elm_Naviframe_Item_Pop_Cb view_pop_cb, void *ad) const
-{
-	auto back_button = WidgetFactory::createButton(naviframe_->getObject(), "IDS_ST_BUTTON_BACK", WidgetFactory::BACK_BUTTON_ARROW_STYLE, softkeyBackClickCb, naviframe_->getObject());
-	elm_layout_content_set(naviframe_->getObject(), "prev_btn", back_button);
-	elm_naviframe_item_pop_cb_set(naviframe_it, view_pop_cb, ad);
-}
-
-void MainData::softkeyBackClickCb(void *data, Evas_Object *obj, void *event_inf)
-{
-	auto naviframe = static_cast<Evas_Object *>(data);
-	ret_if(!naviframe);
-	elm_naviframe_item_pop(naviframe);
-}
+}
\ No newline at end of file
diff --git a/src/MainData.hpp b/src/MainData.hpp
index d05e1f5..0a23aff 100644
--- a/src/MainData.hpp
+++ b/src/MainData.hpp
@@ -35,19 +35,17 @@ struct MainData {
 public:
 	MainData() = default;
 	int initApp(const std::string &name);
-	void initView(const std::string &name);
+	void initView(const TranslatedString &name, std::function<void()> backCb);
 	Window *getWindow() const;
 	Naviframe *getNaviframe() const;
 	Genlist *getGenlist() const;
-	void addBackButton(Elm_Naviframe_Item_Pop_Cb view_pop_cb, void *ad) const;
 	Elm_Object_Item *naviframe_it;
 
 private:
-	int initViewWithoutGenlist(const std::string &name);
+	int initViewWithoutGenlist(const TranslatedString &name, std::function<void()> backCb);
 	void addRotateSupport();
 	void prepareViewList();
 	void createMainWindow(const std::string &name);
-	static void softkeyBackClickCb(void *data, Evas_Object *obj, void *event_inf);
 
 	Evas *evas = nullptr;
 	std::unique_ptr<Window> window;
diff --git a/src/MainPage.cpp b/src/MainPage.cpp
index f2001a5..fc5dfd4 100644
--- a/src/MainPage.cpp
+++ b/src/MainPage.cpp
@@ -8,11 +8,12 @@
 MainPage::MainPage(SettingAccessibility *ad)
 	: context_(ad)
 {
-	context_->md.initView(_("IDS_ST_BODY_ACCESSIBILITY"));
+	context_->md.initView("IDS_ST_BODY_ACCESSIBILITY", [this]() {
+		vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, onScreenReaderVconfKeyChanged);
+		ui_app_exit();
+	});
 	context_->md.getGenlist()->setStyle("dialogue");
 
-	context_->md.addBackButton(cancelCb, nullptr);
-
 	Evas_Object *scroller = context_->md.getGenlist()->getObject();
 	createGendialTitleItem(scroller, &(itc_group_item), "IDS_ST_HEADER_VISION");
 
@@ -57,13 +58,6 @@ MainPage::MainPage(SettingAccessibility *ad)
 	}
 }
 
-Eina_Bool MainPage::cancelCb(void *data, Elm_Object_Item *it)
-{
-	vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, onScreenReaderVconfKeyChanged);
-	ui_app_exit();
-	return EINA_TRUE;
-}
-
 void MainPage::onScreenReaderVconfKeyChanged(keynode_t *key, void *user_data)
 {
 	auto screen_reader_item = static_cast<GenGroupItemData *>(user_data);
diff --git a/src/MainPage.hpp b/src/MainPage.hpp
index e1d2ca4..16584a2 100644
--- a/src/MainPage.hpp
+++ b/src/MainPage.hpp
@@ -15,7 +15,6 @@ public:
 	MainPage(SettingAccessibility *ad);
 
 private:
-	static Eina_Bool cancelCb(void *data, Elm_Object_Item *it);
 	static void onScreenReaderVconfKeyChanged(keynode_t *key, void *user_data);
 	static void onScreenReaderItemClicked(void *data, Evas_Object *obj, void *event_info);
 	static void onUniversalSwitchItemClicked(void *data, Evas_Object *obj, void *event_info);
diff --git a/src/Naviframe.cpp b/src/Naviframe.cpp
index 1478f5a..ad3d2fa 100644
--- a/src/Naviframe.cpp
+++ b/src/Naviframe.cpp
@@ -10,6 +10,7 @@ Naviframe::Naviframe(Widget *parent)
 	uniqueObj_.reset(elm_naviframe_add(parent->getObject()));
 	eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
 	eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL);
+	elm_naviframe_content_preserve_on_pop_set(uniqueObj_.get(), EINA_TRUE);
 	show();
 }
 
@@ -18,23 +19,44 @@ void Naviframe::createPrevBtnAutomatically(bool automatically)
 	elm_naviframe_prev_btn_auto_pushed_set(uniqueObj_.get(), automatically ? EINA_TRUE : EINA_FALSE);
 }
 
-void Naviframe::pushBack(const TranslatedString &title, Widget *content, const std::string &style, std::function<void()> onPopCb)
+void Naviframe::pushBack(const TranslatedString &title, Widget *content, const std::string &style, std::function<void()> onPopCb, Widget *prevBtn)
 {
-	top_ = elm_naviframe_item_push(uniqueObj_.get(), title.c_str(), nullptr, nullptr, content->getObject(), style.c_str());
+	naviframeStack_.push(std::make_pair(content, prevBtn));
+	auto top = elm_naviframe_item_push(uniqueObj_.get(), title.c_str(), prevBtn ? prevBtn->getObject() : nullptr, nullptr, content->getObject(), style.c_str());
 	if (onPopCb) {
-		naviframeCallbacks_.insert_or_assign(top_, std::move(onPopCb));
-		elm_naviframe_item_pop_cb_set(top_, callbackMethod, this);
+		naviframeCallbacks_.insert_or_assign(top, std::move(onPopCb));
+		elm_naviframe_item_pop_cb_set(top, callbackMethod, this);
+	}
+}
+
+void Naviframe::onPopAnimationEnd()
+{
+	if (naviframeStack_.size())
+	{
+		auto children = naviframeStack_.top();
+		auto removeFromParent = [](Widget *child) {
+			if (child) {
+				auto parent = child->getParent();
+				parent->removeChild(child);
+			}
+		};
+		removeFromParent(children.first);
+		removeFromParent(children.second);
+		naviframeStack_.pop();
 	}
 }
 
 void Naviframe::popBack()
 {
 	elm_naviframe_item_pop(uniqueObj_.get());
-	top_ = elm_naviframe_top_item_get(uniqueObj_.get());
 }
 
 void Naviframe::onPop(Elm_Object_Item *item)
 {
+	setEvasSmartCallback("transition,finished", [this]() {
+		removeEvasSmartCallback("transition,finished");
+		onPopAnimationEnd();
+	});
 	auto cb = naviframeCallbacks_.find(item);
 	if (cb == naviframeCallbacks_.end()) {
 		SETTING_TRACE_ERROR("No callback registered for this frame");
@@ -45,7 +67,7 @@ void Naviframe::onPop(Elm_Object_Item *item)
 
 Elm_Naviframe_Item *Naviframe::top()
 {
-	return top_;
+	return elm_naviframe_top_item_get(uniqueObj_.get());
 }
 
 Eina_Bool Naviframe::callbackMethod(void *data, Elm_Object_Item *it)
diff --git a/src/Naviframe.hpp b/src/Naviframe.hpp
index 10afde6..2131e8c 100644
--- a/src/Naviframe.hpp
+++ b/src/Naviframe.hpp
@@ -2,6 +2,8 @@
 #define NAVIFRAME_HPP
 
 #include "Widget.hpp"
+#include <stack>
+#include <utility>
 
 class Naviframe : public Widget
 {
@@ -9,16 +11,19 @@ public:
 	Naviframe(Widget *parent);
 
 	void createPrevBtnAutomatically(bool automatically);
-	void pushBack(const TranslatedString &title, Widget *content, const std::string &style, std::function<void()> onPopCb);
+	void pushBack(const TranslatedString &title, Widget *content, const std::string &style, std::function<void()> onPopCb, Widget *prevBtn = nullptr);
 	void popBack();
-	void onPop(Elm_Object_Item *item);
 	Elm_Naviframe_Item *top();
 
 private:
+	void onPop(Elm_Object_Item *item);
 	static Eina_Bool callbackMethod(void *data, Elm_Object_Item *it);
+	void onPopAnimationEnd();
 
-	Elm_Naviframe_Item *top_ = nullptr;
+	std::stack<std::pair<Widget*, Widget*>> naviframeStack_;
 	std::unordered_map<Elm_Object_Item *, std::function<void()>> naviframeCallbacks_;
 };
 
+
+
 #endif
diff --git a/src/RemoveSwitchPage.cpp b/src/RemoveSwitchPage.cpp
index 9f92d7c..dd25917 100644
--- a/src/RemoveSwitchPage.cpp
+++ b/src/RemoveSwitchPage.cpp
@@ -35,12 +35,15 @@ RemoveSwitchPage::RemoveSwitchPage(SettingAccessibility *ad)
 	setValuePage_ = std::make_unique<SetValuePage>(context_, ValueEditorType::SWITCHES, _("IDS_ACCS_SELECT_ITEMS"));
 	SetValuePage::addRemoveSwitchPageCallback(context_, useNaviframeTitleAsCounter, this);
 
-	all_checkbox = WidgetFactory::createCheck(context_->md.getNaviframe()->getObject(), EINA_FALSE, nullptr, {}, onAllButtonsClicked, this);
+	auto naviframe = context_->md.getNaviframe();
+	all_checkbox = WidgetFactory::createCheck(naviframe->getObject(), EINA_FALSE, nullptr, {}, onAllButtonsClicked, this);
 	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", all_checkbox);
 
-	remove_switches_popup_button = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), "IDS_ACCS_DELETE_CAPS", "naviframe/title_right", onDeleteButtonClicked, this);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "title_right_btn", remove_switches_popup_button);
-	elm_object_disabled_set(remove_switches_popup_button, EINA_TRUE);
+	removeSwitchPopupBtn_ = Widget::make<Button>(naviframe, [this]() {
+		createPopupForSwitchesRemoving();
+	}, "IDS_ACCS_DELETE_CAPS", "naviframe/title_right");
+	removeSwitchPopupBtn_->disable(true);
+	naviframe->setPartContent("title_right_btn", removeSwitchPopupBtn_);
 
 	for (auto i = 0u; i < context_->config.configuration_items.size(); ++i) {
 		auto activity_name = setting_accessibility_universal_switch_dbus_config_get_activity_name(&context_->config, context_->config.configuration_items[i]->activity_type);
@@ -54,15 +57,6 @@ void RemoveSwitchPage::attachCallback(UniversalSwitchCb cb, void *cbData)
 	switch_removed_cb_data = cbData;
 }
 
-void RemoveSwitchPage::onDeleteButtonClicked(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Input parameter is NULL");
-	auto self = static_cast<RemoveSwitchPage *>(data);
-	retm_if(self->context_->set_value_layout.getGenlist() == NULL, "No genlist provided");
-
-	self->createPopupForSwitchesRemoving();
-}
-
 void RemoveSwitchPage::onAllButtonsClicked(void *data, Evas_Object *obj, void *event_info)
 {
 	retm_if(data == NULL, "Input parameter is NULL");
@@ -96,7 +90,7 @@ void RemoveSwitchPage::useNaviframeTitleAsCounter(RemoveSwitchPage *self)
 	} else {
 		title = TranslatedString{"IDS_ACCS_SELECT_ITEMS"} .str();
 	}
-	elm_object_disabled_set(self->remove_switches_popup_button, self->context_->switches_to_remove_counter ? EINA_FALSE : EINA_TRUE);
+	self->removeSwitchPopupBtn_->disable(self->context_->switches_to_remove_counter ? false : true);
 	elm_layout_text_set(self->context_->md.getNaviframe()->getObject(), "default", title.c_str());
 }
 
@@ -125,16 +119,9 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 	popup->setEvasSmartCallback("block,clicked", removeCb);
 
 
-	auto cancelBtn = Widget::make<Button>(popup);
-	cancelBtn->setText("IDS_ST_BUTTON_CANCEL");
-	cancelBtn->setStyle("bottom");
-	cancelBtn->setEvasSmartCallback("clicked", removeCb);
+	auto cancelBtn = Widget::make<Button>(popup, removeCb, "IDS_ST_BUTTON_CANCEL", "bottom");
 	popup->setPartContent("button1", cancelBtn);
 
-	auto deleteSwitchBtn = Widget::make<Button>(popup);
-	deleteSwitchBtn->setText("IDS_ACCS_DELETE");
-	deleteSwitchBtn->setStyle("bottom");
-
 	auto removeSwitchCb = [removeCb, this]() {
 
 		Elm_Object_Item *item = elm_genlist_last_item_get(context_->set_value_layout.getGenlist()->getObject());
@@ -146,6 +133,7 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 		}
 
 		removeCb();
+		context_->md.getNaviframe()->removeChild(removeSwitchPopupBtn_);
 		context_->md.getNaviframe()->popBack();
 
 		bool disable_universal_switch = context_->switches_to_remove_counter == context_->set_value_layout.getGenlist()->size();
@@ -153,7 +141,8 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 			LOGE("Failed to set vconf key %s.", VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE);
 
 	};
-	deleteSwitchBtn->setEvasSmartCallback("clicked", removeSwitchCb);
+
+	auto deleteSwitchBtn = Widget::make<Button>(popup, removeSwitchCb, "IDS_ACCS_DELETE", "bottom");
 	popup->setPartContent("button2", deleteSwitchBtn);
 }
 
diff --git a/src/RemoveSwitchPage.hpp b/src/RemoveSwitchPage.hpp
index 5b00e00..23654b4 100644
--- a/src/RemoveSwitchPage.hpp
+++ b/src/RemoveSwitchPage.hpp
@@ -20,6 +20,7 @@
 #include "SettingAccessibility.hpp"
 #include "SetValuePage.hpp"
 #include "Popup.hpp"
+#include "Button.hpp"
 
 class SetValuePage;
 
@@ -41,7 +42,6 @@ public:
 	static void useNaviframeTitleAsCounter(RemoveSwitchPage *self);
 
 private:
-	static void onDeleteButtonClicked(void *data, Evas_Object *obj, void *event_info);
 	static void onAllButtonsClicked(void *data, Evas_Object *obj, void *event_info);
 	void createPopupForSwitchesRemoving();
 	static void onRemoveSelectedSwitches(void *data, Evas_Object *obj, void *event_info);
@@ -52,7 +52,7 @@ private:
 	std::unique_ptr<SetValuePage> setValuePage_;
 	UniversalSwitchCb switch_removed_cb;
 	void *switch_removed_cb_data = nullptr;
-	Evas_Object *remove_switches_popup_button = nullptr;
+	Button *removeSwitchPopupBtn_ = nullptr;
 	Evas_Object *all_checkbox = nullptr;
 };
 
diff --git a/src/ScreenReaderSettingsPage.cpp b/src/ScreenReaderSettingsPage.cpp
index 2d80fa4..f357fa0 100644
--- a/src/ScreenReaderSettingsPage.cpp
+++ b/src/ScreenReaderSettingsPage.cpp
@@ -272,10 +272,7 @@ void ScreenReaderSettingsPage::mouseUpGendialListCb(void *data, Evas_Object *obj
 	box->setMaxSizeHint(-1, ELM_SCALE_SIZE(POPUP_CONTENT_BASE_SIZE) * vConfCheckData.size());
 	self->popup_->setContent(box);
 
-	auto btnCancel = Widget::make<Button>(self->popup_);
-	btnCancel->setStyle("popup");
-	btnCancel->setText("IDS_MSG_ACBUTTON_CANCEL_ABB");
-	btnCancel->setEvasSmartCallback("clicked", removeCb);
+	auto btnCancel = Widget::make<Button>(self->popup_, removeCb, "IDS_MSG_ACBUTTON_CANCEL_ABB", "popup");
 	self->popup_->setPartContent("button1", btnCancel);
 
 	auto onDone = [removeCb]() {
@@ -289,10 +286,7 @@ void ScreenReaderSettingsPage::mouseUpGendialListCb(void *data, Evas_Object *obj
 		}
 	};
 
-	auto btnDone = Widget::make<Button>(self->popup_);
-	btnDone->setStyle("popup");
-	btnDone->setText("IDS_MSG_ACBUTTON_DONE_ABB");
-	btnDone->setEvasSmartCallback("clicked", onDone);
+	auto btnDone = Widget::make<Button>(self->popup_, onDone, "IDS_MSG_ACBUTTON_DONE_ABB", "popup");
 	self->popup_->setPartContent("button2", btnDone);
 }
 
@@ -456,21 +450,15 @@ void ScreenReaderSettingsPage::createSpeechRatePopup(void *item)
 	slider->setValue(val);
 	layout->setPartContent("slider", slider);
 
-	auto cancelBtn = Widget::make<Button>(popup_);
-	cancelBtn->setText("IDS_ST_BUTTON_CANCEL_ABB");
-	cancelBtn->setStyle("bottom");
-	cancelBtn->setEvasSmartCallback("clicked", removeCb);
+	auto cancelBtn = Widget::make<Button>(popup_, removeCb, "IDS_ST_BUTTON_CANCEL_ABB", "bottom");
 	popup_->setPartContent("button1", cancelBtn);
 
-	auto doneBtn = Widget::make<Button>(popup_);
-	doneBtn->setText("IDS_ST_SK3_DONE");
-	doneBtn->setStyle("bottom");
-	doneBtn->setEvasSmartCallback("clicked", [p = popup_, window, slider]() {
+	auto doneBtn = Widget::make<Button>(popup_, [p = popup_, window, slider]() {
 		auto value = static_cast<int>(slider->getValue());
 		if (0 != tts_setting_set_speed(value))
 			SETTING_TRACE("Setting speed to tts engine failed");
 		window->removeChild(p);
-	});
+	}, "IDS_ST_SK3_DONE", "bottom");
 	popup_->setPartContent("button2", doneBtn);
 
 	evas_object_event_callback_add(popup_->getObject(), EVAS_CALLBACK_DEL, onPopupDel, item);
diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index 6b52a25..8d70dc1 100644
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -40,9 +40,10 @@
 #define PRT_SET_VALUE_ENTRY "set-value-entry"
 
 SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const char *title)
+	: context_(ad)
 {
 	const char *layout_grp = NULL;
-	retm_if(ad == NULL, "Input parameter is NULL");
+	retm_if(context_ == NULL, "Input parameter is NULL");
 	retm_if(title == NULL, "Title parameter is NULL");
 
 	switch (type) {
@@ -63,40 +64,43 @@ SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const
 		layout_grp = GRP_SET_VALUE_NUMERIC;
 		SETTING_TRACE_DEBUG("Unrecognized layout type!");
 	}
-	ad->set_value_layout.setLayout(createLayout(ad->md.getNaviframe(), layout_grp));
+	auto naviframe = context_->md.getNaviframe();
+	context_->set_value_layout.setLayout(createLayout(naviframe, layout_grp));
 	switch (type) {
 	case ValueEditorType::NUMERIC:
-		ad->set_value_layout.setScroller(createScroller(ad->set_value_layout.getLayout()->getObject()));
-		ad->set_value_layout.setBox(createBox(ad->set_value_layout.getScroller()));
-		evas_object_smart_callback_add(ad->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
+		context_->set_value_layout.setScroller(createScroller(context_->set_value_layout.getLayout()->getObject()));
+		context_->set_value_layout.setBox(createBox(context_->set_value_layout.getScroller()));
+		evas_object_smart_callback_add(context_->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
 		break;
 	case ValueEditorType::NUMERIC_SWITCH:
-		ad->set_value_layout.setScroller(createScroller(ad->set_value_layout.getLayout()->getObject()));
-		ad->set_value_layout.setBox(createBox(ad->set_value_layout.getScroller()));
-		ad->set_value_layout.setCheck(createCheck(ad->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
-		evas_object_smart_callback_add(ad->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
+		context_->set_value_layout.setScroller(createScroller(context_->set_value_layout.getLayout()->getObject()));
+		context_->set_value_layout.setBox(createBox(context_->set_value_layout.getScroller()));
+		context_->set_value_layout.setCheck(createCheck(context_->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
+		evas_object_smart_callback_add(context_->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
 		break;
 	case ValueEditorType::RADIOS:
-		ad->set_value_layout.radio_item_change_cb = NULL;
-		ad->set_value_layout.setGenlist(createGenlist(ad->set_value_layout.getLayout(), NULL));
+		context_->set_value_layout.radio_item_change_cb = NULL;
+		context_->set_value_layout.setGenlist(createGenlist(context_->set_value_layout.getLayout(), NULL));
 		break;
 	case ValueEditorType::SWITCHES:
-		ad->set_value_layout.setGenlist(createGenlist(ad->set_value_layout.getLayout(), NULL));
+		context_->set_value_layout.setGenlist(createGenlist(context_->set_value_layout.getLayout(), NULL));
 		break;
 	case ValueEditorType::LIST_SWITCH:
-		ad->set_value_layout.setCheck(createCheck(ad->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
-		ad->set_value_layout.setGenlist(createGenlist(ad->set_value_layout.getLayout(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS")));
+		context_->set_value_layout.setCheck(createCheck(context_->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
+		context_->set_value_layout.setGenlist(createGenlist(context_->set_value_layout.getLayout(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS")));
 		break;
 	default:
 		LOGE("Wrong value type");
 	}
 
-	Elm_Object_Item *navi_it = elm_naviframe_item_push(ad->md.getNaviframe()->getObject(), title, NULL, NULL, ad->set_value_layout.getLayout()->getObject(), NULL);
+	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), title, NULL, NULL, context_->set_value_layout.getLayout()->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(navi_it, naviframePopCb, ad);
 	elm_object_item_domain_text_translatable_set(navi_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(ad->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, ad);
-	elm_layout_content_set(ad->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 }
 
 void SetValuePage::setDescription(SettingAccessibility *ad, const char *description)
@@ -561,11 +565,3 @@ Eina_Bool SetValuePage::naviframePopCb(void *data, Elm_Object_Item *it)
 
 	return EINA_TRUE;
 }
-
-void SetValuePage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
diff --git a/src/SetValuePage.hpp b/src/SetValuePage.hpp
index c7ee611..16cdd97 100644
--- a/src/SetValuePage.hpp
+++ b/src/SetValuePage.hpp
@@ -72,6 +72,8 @@ private:
 	static void checkStateChangedCb(void *data, Evas_Object *obj, void *event_info);
 	static Eina_Bool naviframePopCb(void *data, Elm_Object_Item *it);
 	static void backCb(void *data, Evas_Object *obj, void *event_info);
+
+	SettingAccessibility *context_ = nullptr;
 };
 
 #endif
diff --git a/src/SwitchesPage.cpp b/src/SwitchesPage.cpp
index f06e443..724dfd7 100644
--- a/src/SwitchesPage.cpp
+++ b/src/SwitchesPage.cpp
@@ -24,19 +24,26 @@
 SwitchesPage::SwitchesPage(SettingAccessibility *ad)
 	: context_(ad)
 {
-	switches_ = Widget::make<Genlist>(context_->md.getNaviframe());
+	auto naviframe = context_->md.getNaviframe();
+	switches_ = Widget::make<Genlist>(naviframe);
 	switches_->setMode(ELM_LIST_COMPRESS);
 	switches_->setStyle("dialogue");
 
-	context_->md.naviframe_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SWITCHES"), NULL, NULL, switches_->getObject(), NULL);
+	context_->md.naviframe_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SWITCHES"), NULL, NULL, switches_->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(context_->md.naviframe_it, naviframePopCb, this);
 	elm_object_item_domain_text_translatable_set(context_->md.naviframe_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, ad);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	removeSwitchesPageBtn_ = Widget::make<Button>(naviframe, [this]() {
+		removeSwitchPage_ = std::make_unique<RemoveSwitchPage>(context_);
+		removeSwitchPage_->attachCallback(switchRemovedCb, this);
+	}, "IDS_ACCS_DELETE_CAPS", "naviframe/title_right");
+	naviframe->setPartContent("title_right_btn", removeSwitchesPageBtn_);
 
-	remove_switches_page_button = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), "IDS_ACCS_DELETE_CAPS", "naviframe/title_right", createRemovePageCb, this);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "title_right_btn", remove_switches_page_button);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe, this]() {
+		naviframe->removeChild(removeSwitchesPageBtn_);
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 
 	updateSwitchesList();
 }
@@ -52,7 +59,7 @@ void SwitchesPage::updateSwitchesList()
 	switches_->clear();
 	createSwitchesGroup();
 	createAddButton();
-	elm_object_disabled_set(remove_switches_page_button, context_->config.configuration_items.size() == 0);
+	removeSwitchesPageBtn_->disable(context_->config.configuration_items.size() == 0);
 }
 
 void SwitchesPage::createAddButton()
@@ -78,15 +85,6 @@ void SwitchesPage::createSwitchesGroup()
 	}
 }
 
-void SwitchesPage::createRemovePageCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<SwitchesPage *>(data);
-
-	self->removeSwitchPage_ = std::make_unique<RemoveSwitchPage>(self->context_);
-	self->removeSwitchPage_->attachCallback(switchRemovedCb, self);
-}
-
 void SwitchesPage::addSwitchClickedCb(void *data, Evas_Object *obj, void *event_info)
 {
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
@@ -171,11 +169,3 @@ Eina_Bool SwitchesPage::naviframePopCb(void *data, Elm_Object_Item *it)
 
 	return EINA_TRUE;
 }
-
-void SwitchesPage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
diff --git a/src/SwitchesPage.hpp b/src/SwitchesPage.hpp
index 10ad379..2f1394a 100644
--- a/src/SwitchesPage.hpp
+++ b/src/SwitchesPage.hpp
@@ -23,6 +23,7 @@
 #include "AddSwitchPage.hpp"
 #include "UpdateSwitchPage.hpp"
 #include "Genlist.hpp"
+#include "Button.hpp"
 
 class RemoveSwitchPage;
 class AddSwitchPage;
@@ -49,17 +50,15 @@ private:
 	void updateSwitchesList();
 	void createAddButton();
 	void createSwitchesGroup();
-	static void createRemovePageCb(void *data, Evas_Object *obj, void *event_info);
 	static void addSwitchClickedCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchClickCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchUpdatedCb(void *data, const std::string &switch_id, const std::string &switch_action, const std::string &switch_name);
 	static void switchRemovedCb(void *data, const std::string &switch_id, const std::string &switch_action, const std::string &switch_name);
 	GenGroupItemData *addMappedSwitchMenuItem(const std::string &main_text, const std::string &sub_text, SettingCallback item_cb, void *user_data);
 	static Eina_Bool  naviframePopCb(void *data, Elm_Object_Item *it);
-	static void backCb(void *data, Evas_Object *obj, void *event_info);
 
 	SettingAccessibility *context_ = nullptr;
-	Evas_Object *remove_switches_page_button = nullptr;
+	Button *removeSwitchesPageBtn_ = nullptr;
 	back_cb universal_switch_switches_back = nullptr;
 	void *universal_switch_switches_back_data = nullptr;
 	Genlist *switches_ = nullptr;
diff --git a/src/UniversalSwitchPage.cpp b/src/UniversalSwitchPage.cpp
index 189e998..f93d459 100644
--- a/src/UniversalSwitchPage.cpp
+++ b/src/UniversalSwitchPage.cpp
@@ -17,7 +17,6 @@
 #include "UniversalSwitchPage.hpp"
 
 #include "setting-accessibility.h"
-#include "Button.hpp"
 #include "Popup.hpp"
 #include "WidgetFactory.hpp"
 
@@ -29,7 +28,8 @@ UniversalSwitchPage::UniversalSwitchPage(SettingAccessibility *ad)
 {
 	int state = false;
 	context_->md.naviframe_it = NULL;
-	auto genlist = Widget::make<Genlist>(context_->md.getNaviframe());
+	auto naviframe = context_->md.getNaviframe();
+	auto genlist = Widget::make<Genlist>(naviframe);
 	genlist->setMode(ELM_LIST_COMPRESS);
 	genlist->setStyle("dialogue");
 	genlist->clear(); // TODO check if necessary
@@ -67,19 +67,24 @@ UniversalSwitchPage::UniversalSwitchPage(SettingAccessibility *ad)
 		elm_genlist_item_select_mode_set(universal_switch_comment->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 	}
 
-	context_->md.naviframe_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH"), NULL, NULL, genlist->getObject(), NULL);
-	elm_object_item_domain_text_translatable_set(context_->md.naviframe_it, PACKAGE, EINA_TRUE);
-	elm_naviframe_item_pop_cb_set(context_->md.naviframe_it, naviframePopCb, this);
+	auto prevBtn = Widget::make<Button>(naviframe, [this, naviframe]() {
+		naviframe->removeChild(usSettingsBtn_);
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
 
-	std::string title_str = "<font_size=30>" + TranslatedString{"IDS_ACCS_SETTINGS_CAPS"} .str() + "</font_size>";
+	naviframe->pushBack("IDS_ACCS_UNIVERSAL_SWITCH", genlist, {}, [this]() {
+		vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, onVconfKeyChange);
+		stopUniversalSwitch(context_);
 
-	universal_switch_settings_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), title_str, "naviframe/title_right", createSettingsPage, this);
-	if (universal_switch_settings_btn)
-		elm_object_disabled_set(universal_switch_settings_btn, EINA_TRUE);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "title_right_btn", universal_switch_settings_btn);
+		universal_switch_off_checkbox = NULL;
+	}, prevBtn);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, context_);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	std::string title_str = "<font_size=30>" + TranslatedString{"IDS_ACCS_SETTINGS_CAPS"} .str() + "</font_size>";
+	usSettingsBtn_ = Widget::make<Button>(naviframe, [this]() {
+		universalSwitchSettingsPage_ = std::make_unique<UniversalSwitchSettingsPage>(context_);
+	}, title_str, "naviframe/title_right");
+	usSettingsBtn_->disable(true);
+	naviframe->setPartContent("title_right_btn", usSettingsBtn_);
 
 	startUniversalSwitch();
 }
@@ -137,7 +142,7 @@ void UniversalSwitchPage::updateVconfKey(int state)
 			auto parent = popup->getParent();
 			parent->removeChild(popup);
 		};
-		auto addBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_POPUP_ADD", addBtnCb);
+		auto addBtn = Widget::make<Button>(popup, addBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_POPUP_ADD");
 		addBtn->setStyle("popup");
 		popup->setPartContent("button1", addBtn);
 
@@ -147,7 +152,7 @@ void UniversalSwitchPage::updateVconfKey(int state)
 			auto parent = popup->getParent();
 			parent->removeChild(popup);
 		};
-		auto cancelBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL", cancelBtnCb);
+		auto cancelBtn = Widget::make<Button>(popup, cancelBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL");
 		cancelBtn->setStyle("popup");
 		popup->setPartContent("button2", cancelBtn);
 	} else {
@@ -169,27 +174,6 @@ void UniversalSwitchPage::onNewSwitchAddition(void *data, const std::string &swi
 	SETTING_TRACE_DEBUG("New switch added. Id: %s, name: %s, action: %s. Switches count: %d", switch_id.c_str(), switch_name.c_str(), switch_action.c_str(), switch_count);
 }
 
-void UniversalSwitchPage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
-
-Eina_Bool UniversalSwitchPage::naviframePopCb(void *data, Elm_Object_Item *it)
-{
-	auto self = static_cast<UniversalSwitchPage *>(data);
-
-	vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, onVconfKeyChange);
-	stopUniversalSwitch(self->context_);
-
-	self->universal_switch_off_checkbox = NULL;
-	self->universal_switch_settings_btn = NULL;
-
-	return EINA_TRUE;
-}
-
 void UniversalSwitchPage::stopUniversalSwitch(SettingAccessibility *ad)
 {
 	setting_accessibility_universal_switch_dbus_config_shutdown(&ad->config);
@@ -222,8 +206,8 @@ void UniversalSwitchPage::onUniversalSwitchStarting(void *data)
 	if (self->universal_switch_off_checkbox)
 		elm_object_item_disabled_set(self->universal_switch_off_checkbox->item, EINA_FALSE);
 
-	if (self->universal_switch_settings_btn)
-		elm_object_disabled_set(self->universal_switch_settings_btn, EINA_FALSE);
+	if (self->usSettingsBtn_)
+		self->usSettingsBtn_->disable(false);
 }
 
 void UniversalSwitchPage::listCb(void *data, Evas_Object *obj, void *event_info)
diff --git a/src/UniversalSwitchPage.hpp b/src/UniversalSwitchPage.hpp
index 12de42a..704f3de 100644
--- a/src/UniversalSwitchPage.hpp
+++ b/src/UniversalSwitchPage.hpp
@@ -19,6 +19,7 @@
 
 #include "SettingAccessibility.hpp"
 #include "UniversalSwitchSettingsPage.hpp"
+#include "Button.hpp"
 
 #include <vconf.h>
 
@@ -44,8 +45,6 @@ private:
 	static bool setState(bool state);
 	void updateVconfKey(int state); //TODO rename
 	static void onNewSwitchAddition(void *data, const std::string &switch_id, const std::string &switch_action, const std::string &switch_name);
-	static void backCb(void *data, Evas_Object *obj, void *event_info);
-	static Eina_Bool naviframePopCb(void *data, Elm_Object_Item *it);
 	static void stopUniversalSwitch(SettingAccessibility *ad);
 	void startUniversalSwitch();
 	static void onUniversalSwitchStarting(void *data);
@@ -57,7 +56,7 @@ private:
 	std::unique_ptr<UniversalSwitchSettingsPage> universalSwitchSettingsPage_;
 	GenGroupItemData *universal_switch_comment;
 	GenGroupItemData *universal_switch_off_checkbox;
-	Evas_Object *universal_switch_settings_btn;
+	Button *usSettingsBtn_ = nullptr;
 
 };
 
diff --git a/src/UniversalSwitchSettingsPage.cpp b/src/UniversalSwitchSettingsPage.cpp
index fe2004e..4cd45ae 100644
--- a/src/UniversalSwitchSettingsPage.cpp
+++ b/src/UniversalSwitchSettingsPage.cpp
@@ -18,6 +18,7 @@
 
 #include "setting-accessibility.h"
 #include "utils.hpp"
+#include "Button.hpp"
 #include "WidgetFactory.hpp"
 
 #include <app.h>
@@ -137,8 +138,9 @@ const char *_manage_options_key_array[] = {
 UniversalSwitchSettingsPage::UniversalSwitchSettingsPage(SettingAccessibility *ad)
 	: context_(ad)
 {
+	auto naviframe = context_->md.getNaviframe();
 	context_->md.naviframe_it = NULL;
-	genlist_ = Widget::make<Genlist>(context_->md.getNaviframe());
+	genlist_ = Widget::make<Genlist>(naviframe);
 	genlist_->setMode(ELM_LIST_COMPRESS);
 	genlist_->setStyle("dialogue");
 
@@ -149,12 +151,14 @@ UniversalSwitchSettingsPage::UniversalSwitchSettingsPage(SettingAccessibility *a
 	createFeedbackGroup();
 	createManageGroup();
 
-	Elm_Object_Item *navi_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS"), NULL, NULL, genlist_->getObject(), NULL);
+	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS"), NULL, NULL, genlist_->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(navi_it, naviframPopCb, context_);
 	elm_object_item_domain_text_translatable_set(navi_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, context_);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 }
 
 void UniversalSwitchSettingsPage::createManageGroup()
diff --git a/src/Widget.cpp b/src/Widget.cpp
index 0a3c06f..1de370d 100644
--- a/src/Widget.cpp
+++ b/src/Widget.cpp
@@ -44,6 +44,12 @@ void Widget::setEvasSmartCallback(const std::string &eventName, std::function<vo
 	evas_object_smart_callback_add(getObject(), eventName.c_str(), smartCallbackMethod, dataPtr);
 }
 
+void Widget::removeEvasSmartCallback(const std::string &eventName)
+{
+	evas_object_smart_callback_del(uniqueObj_.get(), eventName.c_str(), smartCallbackMethod);
+	smartCallbacks_.erase(eventName);
+}
+
 void Widget::setEextEventCallback(const Eext_Callback_Type type, std::function<void()> callback)
 {
 	auto cbData = std::make_unique<WidgetCallback::Data<Eext_Callback_Type>>(this, type);
@@ -72,6 +78,11 @@ void Widget::setPartContent(const std::string &part, Widget *content)
 	elm_object_part_content_set(uniqueObj_.get(), part.c_str(), content->getObject());
 }
 
+void Widget::disable(bool disable)
+{
+	disable ? elm_object_disabled_set(uniqueObj_.get(), EINA_TRUE) : elm_object_disabled_set(uniqueObj_.get(), EINA_FALSE);
+}
+
 void Widget::emitSignal(const std::string &signal)
 {
 	elm_object_signal_emit(uniqueObj_.get(), signal.c_str(), "");
diff --git a/src/Widget.hpp b/src/Widget.hpp
index 0d864a5..16b5c93 100644
--- a/src/Widget.hpp
+++ b/src/Widget.hpp
@@ -41,11 +41,13 @@ public:
 	void setMinSizeHint(Evas_Coord v, Evas_Coord h);
 	void setMaxSizeHint(Evas_Coord v, Evas_Coord h);
 	void setEvasSmartCallback(const std::string &eventName, std::function<void()> callback);
+	void removeEvasSmartCallback(const std::string &eventName);
 	void setEextEventCallback(const Eext_Callback_Type type, std::function<void()> callback);
 	void setStyle(const std::string &style);
 	void setColor(int r, int g, int b, int a);
 	void setContent(Widget *widget);
 	void setPartContent(const std::string &part, Widget *content);
+	void disable(bool disable);
 	void emitSignal(const std::string &signal);
 	void show();
 	void hide();
diff --git a/src/WidgetFactory.cpp b/src/WidgetFactory.cpp
index de10d99..410cdd7 100644
--- a/src/WidgetFactory.cpp
+++ b/src/WidgetFactory.cpp
@@ -7,22 +7,17 @@ Evas_Object *WidgetFactory::createButton(Evas_Object *parent, const std::string
 		const std::string &btn_style, Evas_Smart_Cb onClicked, void *cbData)
 {
 	retv_if(!parent, NULL);
-
 	auto button = elm_button_add(parent);
 	retv_if(!button, NULL);
-
 	if (!btn_style.empty()) //TODO: "if" can be probably removed
 		elm_object_style_set(button, btn_style.c_str());
-
 	if (btn_style != BACK_BUTTON_ARROW_STYLE) {
 		elm_object_text_set(button, TranslatedString{btn_str} .c_str());
 		evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		evas_object_size_hint_align_set(button, EVAS_HINT_FILL, 0.5);
 	}
-
 	if (onClicked)
 		evas_object_smart_callback_add(button, "clicked", onClicked, cbData);
-
 	evas_object_show(button);
 	return button;
 }
diff --git a/src/WidgetFactory.hpp b/src/WidgetFactory.hpp
index 1fda40d..f801d22 100644
--- a/src/WidgetFactory.hpp
+++ b/src/WidgetFactory.hpp
@@ -13,7 +13,6 @@ public:
 
 	static Evas_Object *createButton(Evas_Object *parent, const std::string &btn_str,
 									 const std::string &btn_style, Evas_Smart_Cb onClicked, void *cbData);
-
 	static Evas_Object *createRadio(Evas_Object *parent, int value, Elm_Radio *group, Evas_Smart_Cb onChanged, void *cbData);
 	static Evas_Object *createCheck(Evas_Object *parent, Eina_Bool state, Eina_Bool *statePtr, const std::string &style, Evas_Smart_Cb onChanged, void *cbData);
 
-- 
2.7.4


From dc7ba01676f16fc0ea524a0c2327104c6036c7f2 Mon Sep 17 00:00:00 2001
From: Oskar Chodowicz <o.chodowicz@samsung.com>
Date: Mon, 11 Feb 2019 10:55:12 +0100
Subject: [PATCH 04/16] use CtxPopup class instead EvasObject

Change-Id: I6ae296f5c2b66d9c98a98e797c00f53e9d15cf61
---
 src/CtxPopup.cpp                    |  31 +++++++
 src/CtxPopup.hpp                    |   8 +-
 src/Geometry.cpp                    |  56 +++++++++++++
 src/Geometry.hpp                    |  69 ++++++++++++++++
 src/UniversalSwitchSettingsPage.cpp | 159 +++++++++++++++++++-----------------
 src/UniversalSwitchSettingsPage.hpp |  12 +--
 src/Widget.cpp                      |  24 ++++--
 src/Widget.hpp                      |   7 +-
 src/WidgetCallback.hpp              |  10 +--
 9 files changed, 280 insertions(+), 96 deletions(-)
 create mode 100644 src/Geometry.cpp
 create mode 100644 src/Geometry.hpp

diff --git a/src/CtxPopup.cpp b/src/CtxPopup.cpp
index 6d5c8a1..41724ca 100644
--- a/src/CtxPopup.cpp
+++ b/src/CtxPopup.cpp
@@ -1,4 +1,5 @@
 #include "CtxPopup.hpp"
+#include "setting-debug.h"
 
 CtxPopup::CtxPopup(Widget *parent)
 	: Widget(parent)
@@ -7,7 +8,37 @@ CtxPopup::CtxPopup(Widget *parent)
 	show();
 }
 
+CtxPopup::CtxPopup(Widget *parent, bool disableAutoHide)
+	: Widget(parent)
+{
+	uniqueObj_.reset(elm_ctxpopup_add(parent->getObject()));
+	setAutoHide(disableAutoHide);
+	show();
+}
+
 void CtxPopup::setAutoHide(bool autoHide)
 {
 	elm_ctxpopup_auto_hide_disabled_set(uniqueObj_.get(), autoHide ? EINA_FALSE : EINA_TRUE);
 }
+
+void CtxPopup::addItem(const TranslatedString &label, std::function<void()> onClick)
+{
+	auto cbData = std::make_unique<WidgetCallback::Data<CtxPopup, int>>(this, callbacks_.size());
+	auto dataPtr = cbData.get();
+	auto val = WidgetCallback::Value<CtxPopup, int>{std::move(onClick), std::move(cbData)};
+	callbacks_.push_back(std::move(val));
+	elm_ctxpopup_item_append(uniqueObj_.get(), label.c_str(), NULL, callbackMethod, dataPtr);
+}
+
+void CtxPopup::callbackMethod(void *data, Evas_Object *obj, void *event_info)
+{
+	auto cbData = static_cast<WidgetCallback::Data<CtxPopup, int>*>(data);
+
+	try {
+		auto c = cbData->self->callbacks_.at(cbData->eventName).callback;
+		c();
+	}
+	catch ( std::out_of_range error) {
+		SETTING_TRACE_ERROR("No callback registered for this event");
+	}
+}
\ No newline at end of file
diff --git a/src/CtxPopup.hpp b/src/CtxPopup.hpp
index 65c7ffb..a2ee4a0 100644
--- a/src/CtxPopup.hpp
+++ b/src/CtxPopup.hpp
@@ -2,14 +2,20 @@
 #define CTX_POPUP_HPP
 
 #include "Widget.hpp"
+#include "Window.hpp"
 
 class CtxPopup : public Widget
 {
 public:
 	CtxPopup(Widget *parent);
+	CtxPopup(Widget *parent, bool disableAutoHide);
 
-	void setAutoHide(bool autoHide);
+	void addItem(const TranslatedString &label, std::function<void()> onClick);
+	void setAutoHide(bool disable);
 
+protected:
+	static void callbackMethod(void *data, Evas_Object *obj, void *event_info);
+	std::vector<WidgetCallback::Value<CtxPopup, int>> callbacks_;
 };
 
 #endif
diff --git a/src/Geometry.cpp b/src/Geometry.cpp
new file mode 100644
index 0000000..f15038a
--- /dev/null
+++ b/src/Geometry.cpp
@@ -0,0 +1,56 @@
+#include "Geometry.hpp"
+
+std::string Point::toString() const
+{
+	std::ostringstream o;
+	o << "x=" << std::setw(4) << x << " y=" << std::setw(4) << y;
+	return o.str();
+}
+
+std::string Size::toString() const
+{
+	std::ostringstream o;
+	o << "w=" << std::setw(4) << width << " h=" << std::setw(4) << height;
+	return o.str();
+}
+
+std::string Rectangle::toString() const
+{
+	return position.toString() + " " + size.toString();
+}
+
+bool Rectangle::contains(Point pt) const
+{
+	return position.x <= pt.x && position.y <= pt.y && position.x + size.width > pt.x && position.y + size.height > pt.y;
+}
+
+Point Rectangle::getCenterPoint() const
+{
+	return { position.x + size.width / 2, position.y + size.height / 2 };
+}
+
+Rectangle Rectangle::intersect(const Rectangle first, const Rectangle second)
+{
+	Rectangle rect;
+
+	rect.position.x = std::max(first.position.x, second.position.x);
+	rect.position.y = std::max(first.position.y, second.position.y);
+
+	rect.size.width = std::max(rect.position.x, std::min(first.position.x + first.size.width, second.position.x + second.size.width)) - rect.position.x;
+	rect.size.height = std::max(rect.position.y, std::min(first.position.y + first.size.height, second.position.y + second.size.height)) - rect.position.y;
+
+	return rect;
+}
+
+Rectangle Rectangle::sum(const Rectangle first, const Rectangle second)
+{
+	Rectangle rect;
+
+	rect.position.x = std::min(first.position.x, second.position.x);
+	rect.position.y = std::min(first.position.y, second.position.y);
+
+	rect.size.width = std::max(first.position.x + first.size.width, second.position.x + second.size.width) - rect.position.x;
+	rect.size.height = std::max(first.position.y + first.size.height, second.position.y + second.size.height) - rect.position.y;
+
+	return rect;
+}
\ No newline at end of file
diff --git a/src/Geometry.hpp b/src/Geometry.hpp
new file mode 100644
index 0000000..a56d366
--- /dev/null
+++ b/src/Geometry.hpp
@@ -0,0 +1,69 @@
+#ifndef GEOMETRY_HPP
+#define GEOMETRY_HPP
+
+#include <string>
+#include <sstream>
+#include <iomanip>
+
+struct Point {
+	int x{};
+	int y{};
+
+	std::string toString() const;
+
+	bool operator == (Point p) const
+	{
+		return x == p.x && y == p.y;
+	}
+	bool operator != (Point p) const
+	{
+		return !(*this == p);
+	}
+};
+
+struct Size {
+	int width{};
+	int height{};
+
+	std::string toString() const;
+	bool isPositive() const
+	{
+		return width > 0 && height > 0;
+	}
+
+	bool operator == (Size p) const
+	{
+		return width == p.width && height == p.height;
+	}
+	bool operator != (Size p) const
+	{
+		return !(*this == p);
+	}
+};
+
+struct Rectangle {
+	Point position;
+	Size size;
+
+	std::string toString() const;
+	bool hasPositiveSize() const
+	{
+		return size.isPositive();
+	}
+	bool contains(Point pt) const;
+	Point getCenterPoint() const;
+
+	static Rectangle intersect(const Rectangle first, const Rectangle second);
+	static Rectangle sum(const Rectangle first, const Rectangle second);
+
+	bool operator == (Rectangle p) const
+	{
+		return position == p.position && size == p.size;
+	}
+	bool operator != (Rectangle p) const
+	{
+		return !(*this == p);
+	}
+};
+
+#endif
\ No newline at end of file
diff --git a/src/UniversalSwitchSettingsPage.cpp b/src/UniversalSwitchSettingsPage.cpp
index 4cd45ae..d7d27cb 100644
--- a/src/UniversalSwitchSettingsPage.cpp
+++ b/src/UniversalSwitchSettingsPage.cpp
@@ -19,6 +19,7 @@
 #include "setting-accessibility.h"
 #include "utils.hpp"
 #include "Button.hpp"
+#include "CtxPopup.hpp"
 #include "WidgetFactory.hpp"
 
 #include <app.h>
@@ -282,10 +283,10 @@ void UniversalSwitchSettingsPage::createScanningGroup()
 
 	elm_object_item_disabled_set(universal_switch_scans_num->item, (Eina_Bool)!context_->us_configuration.auto_scan);
 
-	str = getScanMethodText(context_->us_configuration.scan_method);
+	str = getScanMethodText(context_->us_configuration.scan_method).str();
 	universal_switch_scan_method = addMenuItem(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_METHOD"), str, scanMethodCb, false, false, NULL);
 
-	str = getScanDirectionText(context_->us_configuration.scan_dir);
+	str = getScanDirectionText(context_->us_configuration.scan_dir).str();
 	universal_switch_scan_dir = addMenuItem(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_DIR"), str, scanDirectionCb, false, false, NULL);
 
 	str = getValueUnitText(&context_->us_configuration.scan_pt_speed, NULL, NULL, false, NULL);
@@ -298,49 +299,27 @@ void UniversalSwitchSettingsPage::createSwitchesGroup()
 	updateSwitchesCount(this);
 }
 
-void UniversalSwitchSettingsPage::setCtxPopupPosition(SettingAccessibility *ad, Evas_Object *ctxpopup)
-{
-	retm_if(ad == NULL, "Input parameter is NULL");
-	int y = 0;
-	int h = 0;
-
-	evas_pointer_output_xy_get(evas_object_evas_get(ad->md.getWindow()->getObject()), NULL, &y);
-	evas_object_geometry_get(ctxpopup, NULL, NULL, NULL, &h);
-	evas_object_move(ctxpopup, -1, y + h);
-}
-
-Evas_Object *UniversalSwitchSettingsPage::createCtxPopup()
-{
-	Evas_Object *ctxpopup = elm_ctxpopup_add(context_->md.getNaviframe()->getObject());
-	elm_ctxpopup_auto_hide_disabled_set(ctxpopup, EINA_TRUE);
-	evas_object_data_set(ctxpopup, CTXPOPUP_DATA_AD, this);
-	eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK, ctxPopupDelCb, NULL);
-	evas_object_smart_callback_add(ctxpopup, "dismissed", ctxPopupDelCb, NULL);
-
-	return ctxpopup;
-}
-
-const char *UniversalSwitchSettingsPage::getScanDirectionText(ScanDirection direction)
+TranslatedString UniversalSwitchSettingsPage::getScanDirectionText(ScanDirection direction)
 {
 	switch (direction) {
 	case ScanDirection::TO_BOTTOM:
-		return _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_DIR_TB");
+		return "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_DIR_TB";
 	case ScanDirection::TO_TOP:
-		return _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_DIR_BT");
+		return "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_DIR_BT";
 	default:
-		return _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_UNDEFINED");
+		return "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_UNDEFINED";
 	}
 }
 
-const char *UniversalSwitchSettingsPage::getScanMethodText(ScanMethod method)
+TranslatedString UniversalSwitchSettingsPage::getScanMethodText(ScanMethod method)
 {
 	switch (method) {
 	case ScanMethod::POINT:
-		return _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_METHOD_POINT");
+		return "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_METHOD_POINT";
 	case ScanMethod::ROW:
-		return _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_METHOD_ROW");
+		return "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_METHOD_ROW";
 	default:
-		return _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_UNDEFINED");
+		return "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_UNDEFINED";
 	}
 }
 
@@ -1109,34 +1088,94 @@ void UniversalSwitchSettingsPage::scanSpeedChangedCb(void *data, double value)
 
 void UniversalSwitchSettingsPage::scanDirectionCb(void *data, Evas_Object *obj, void *event_info)
 {
-	Evas_Object *ctxpopup;
 	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+	self->createScanDirectionCtxPopup();
+}
 
-	ctxpopup = self->createCtxPopup();
+void UniversalSwitchSettingsPage::createScanDirectionCtxPopup()
+{
+	auto naviframe = context_->md.getNaviframe();
+	auto ctxPopup = Widget::make<CtxPopup>(naviframe, true);
+	auto removeCb = [naviframe, ctxPopup]() {
+		naviframe->removeChild(ctxPopup);
+	};
+	ctxPopup->setEvasSmartCallback("dismissed", removeCb);
+	ctxPopup->setEextEventCallback(EEXT_CALLBACK_BACK, removeCb);
+
+	ctxPopup->addItem("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_DIR_TB", [this, removeCb]() {
+		scanDirectionCtxPopupItemClicked(ScanDirection::TO_BOTTOM);
+		removeCb();
+	});
+	ctxPopup->addItem("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_DIR_BT", [this, removeCb]() {
+		scanDirectionCtxPopupItemClicked(ScanDirection::TO_TOP);
+		removeCb();
+	});
+
+	//TODO use real genlistitem position instead click position
+	int y = 0;
+	evas_pointer_output_xy_get(evas_object_evas_get(context_->md.getWindow()->getObject()), NULL, &y);
 
-	elm_ctxpopup_item_append(ctxpopup, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_DIR_TB"), NULL, ScanDirectionCtxPopupCb, (void *)ScanDirection::TO_BOTTOM);
-	elm_ctxpopup_item_append(ctxpopup, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_DIR_BT"), NULL, ScanDirectionCtxPopupCb, (void *)ScanDirection::TO_TOP);
+	auto geometry = ctxPopup->getGeometry();
+	ctxPopup->setPosition({-1, y + geometry.size.height/2});
 
-	setCtxPopupPosition(self->context_, ctxpopup);
+}
 
-	evas_object_show(ctxpopup);
+void UniversalSwitchSettingsPage::scanDirectionCtxPopupItemClicked(ScanDirection scan_dir)
+{
+	if (updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SCAN_DIR_VERTICAL, NULL, (int *)&scan_dir, NULL)) {
+		context_->us_configuration.scan_dir = scan_dir;
+		universal_switch_scan_dir->sub_desc = getScanDirectionText(scan_dir);
+		elm_genlist_item_update(universal_switch_scan_dir->item);
+		return;
+	}
+	SETTING_TRACE_ERROR("Only one of vconf keys was successfully set. The scanner may malfunction");
 }
 
 void UniversalSwitchSettingsPage::scanMethodCb(void *data, Evas_Object *obj, void *event_info)
 {
-	Evas_Object *ctxpopup;
 	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
-	ctxpopup = self->createCtxPopup();
+	self->createScanMethodCtxPopup();
+}
 
-	elm_ctxpopup_item_append(ctxpopup, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_METHOD_POINT"), NULL, ScanMethodCtxPopupCb, (void *)ScanMethod::POINT);
-	elm_ctxpopup_item_append(ctxpopup, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_METHOD_ROW"), NULL, ScanMethodCtxPopupCb, (void *)ScanMethod::ROW);
+void UniversalSwitchSettingsPage::createScanMethodCtxPopup()
+{
+	auto naviframe = context_->md.getNaviframe();
+	auto ctxPopup = Widget::make<CtxPopup>(naviframe, true);
+	auto removeCb = [naviframe, ctxPopup]() {
+		naviframe->removeChild(ctxPopup);
+	};
+	ctxPopup->setEvasSmartCallback("dismissed", removeCb);
+	ctxPopup->setEextEventCallback(EEXT_CALLBACK_BACK, removeCb);
+
+	ctxPopup->addItem("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_METHOD_POINT", [this, removeCb]() {
+		scanMethodCtxPopupItemClicked(ScanMethod::POINT);
+		removeCb();
+	});
+	ctxPopup->addItem("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_SCAN_METHOD_ROW", [this, removeCb]() {
+		scanMethodCtxPopupItemClicked(ScanMethod::ROW);
+		removeCb();
+	});
+
+	//TODO use real genlistitem position instead click position
+	int y = 0;
+	evas_pointer_output_xy_get(evas_object_evas_get(context_->md.getWindow()->getObject()), NULL, &y);
 
-	setCtxPopupPosition(self->context_, ctxpopup);
+	auto geometry = ctxPopup->getGeometry();
+	ctxPopup->setPosition({-1, y + geometry.size.height/2});
+}
 
-	evas_object_show(ctxpopup);
+void UniversalSwitchSettingsPage::scanMethodCtxPopupItemClicked(ScanMethod scan_method)
+{
+	if (updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SCAN_METHOD, NULL, (int *)&scan_method, NULL)) {
+		context_->us_configuration.scan_method = scan_method;
+		universal_switch_scan_method->sub_desc = getScanMethodText(scan_method);
+		elm_genlist_item_update(universal_switch_scan_method->item);
+		return;
+	}
+	SETTING_TRACE_ERROR("Only one of vconf keys was successfully set. The scanner may malfunction");
 }
 
 void UniversalSwitchSettingsPage::scanNumberCb(void *data, Evas_Object *obj, void *event_info)
@@ -1188,38 +1227,6 @@ void UniversalSwitchSettingsPage::autoScanIntervalChangedCb(void *data, double v
 	elm_genlist_item_update(self->universal_switch_auto_scan_int->item);
 }
 
-void UniversalSwitchSettingsPage::ScanDirectionCtxPopupCb(void *data, Evas_Object *obj, void *event_info)
-{
-	ScanDirection scan_dir = (ScanDirection)reinterpret_cast<long>(data); //TODO change way the argument is being passed
-	auto self = static_cast<UniversalSwitchSettingsPage *>(evas_object_data_get(obj, CTXPOPUP_DATA_AD));
-	retm_if(self == NULL, "ctxpopup data is NULL");
-
-	if (updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SCAN_DIR_VERTICAL, NULL, (int *)&scan_dir, NULL)) {
-		if (!updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SCAN_DIR_HORIZONTAL, NULL, (int *)&scan_dir, NULL))
-			SETTING_TRACE_ERROR("Only one of vconf keys was successfully set. The scanner may malfunction");
-		self->context_->us_configuration.scan_dir = scan_dir;
-		self->universal_switch_scan_dir->sub_desc = getScanDirectionText(scan_dir);
-		elm_genlist_item_update(self->universal_switch_scan_dir->item);
-	}
-
-	ctxPopupDelCb(NULL, obj, event_info);
-}
-
-void UniversalSwitchSettingsPage::ScanMethodCtxPopupCb(void *data, Evas_Object *obj, void *event_info)
-{
-	ScanMethod scan_method = (ScanMethod)reinterpret_cast<long>(data);//TODO change way the argument is being passed
-	auto self = static_cast<UniversalSwitchSettingsPage *>(evas_object_data_get(obj, CTXPOPUP_DATA_AD));
-	retm_if(self == NULL, "ctxpopup data is NULL");
-
-	if (updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SCAN_METHOD, NULL, (int *)&scan_method, NULL)) {
-		self->context_->us_configuration.scan_method = scan_method;
-		self->universal_switch_scan_method->sub_desc = getScanMethodText(scan_method);
-		elm_genlist_item_update(self->universal_switch_scan_method->item);
-	}
-
-	ctxPopupDelCb(NULL, obj, event_info);
-}
-
 void UniversalSwitchSettingsPage::autoScanCheckboxCb(void *data, Evas_Object *obj, void *event_info)
 {
 	retm_if(data == NULL, "Data parameter is NULL");
diff --git a/src/UniversalSwitchSettingsPage.hpp b/src/UniversalSwitchSettingsPage.hpp
index a5a65a1..98ec005 100644
--- a/src/UniversalSwitchSettingsPage.hpp
+++ b/src/UniversalSwitchSettingsPage.hpp
@@ -50,10 +50,12 @@ private:
 	void createScanningGroup();
 	static void onAutoScanItemSelection(void *data, Evas_Object *obj, void *event_info);
 	void createSwitchesGroup();
-	static void setCtxPopupPosition(SettingAccessibility *ad, Evas_Object *ctxpopup);
-	Evas_Object *createCtxPopup();
-	static const char *getScanDirectionText(ScanDirection direction);
-	static const char *getScanMethodText(ScanMethod method);
+	void createScanMethodCtxPopup();
+	void scanMethodCtxPopupItemClicked(ScanMethod scan_method);
+	void createScanDirectionCtxPopup();
+	void scanDirectionCtxPopupItemClicked(ScanDirection scan_dir);
+	TranslatedString getScanDirectionText(ScanDirection direction);
+	TranslatedString getScanMethodText(ScanMethod method);
 	static const char *getBoleanText(bool bvalue, const char *t_str, const char *f_str);
 	static std::string getValueUnitText(int *ivalue, double *dvalue, const char *units, bool def_trigger, const char *def);
 	GenGroupItemData *addMenuItem(const std::string &main_text, const std::string &sub_text,
@@ -106,8 +108,6 @@ private:
 	static void scanNumberChangedCb(void *data, double value);
 	static void autoScanIntervalCb(void *data, Evas_Object *obj, void *event_info);
 	static void autoScanIntervalChangedCb(void *data, double value);
-	static void ScanDirectionCtxPopupCb(void *data, Evas_Object *obj, void *event_info);
-	static void ScanMethodCtxPopupCb(void *data, Evas_Object *obj, void *event_info);
 	static void autoScanCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchesClickCb(void *data, Evas_Object *obj, void *event_info);
 	static void ctxPopupDelCb(void *data, Evas_Object *obj, void *event_info);
diff --git a/src/Widget.cpp b/src/Widget.cpp
index 1de370d..a480ad7 100644
--- a/src/Widget.cpp
+++ b/src/Widget.cpp
@@ -36,11 +36,23 @@ void Widget::setMaxSizeHint(Evas_Coord v, Evas_Coord h)
 	evas_object_size_hint_max_set(uniqueObj_.get(), v, h);
 }
 
+Rectangle Widget::getGeometry()
+{
+	int x, y, w, h;
+	evas_object_geometry_get(uniqueObj_.get(), &x, &y, &w, &h);
+	return {{x, y}, {w, h}};
+}
+
+void Widget::setPosition(Point anchor)
+{
+	evas_object_move(uniqueObj_.get(), anchor.x, anchor.y);
+}
+
 void Widget::setEvasSmartCallback(const std::string &eventName, std::function<void()> callback)
 {
-	auto cbData = std::make_unique<WidgetCallback::Data<std::string>>(this, eventName);
+	auto cbData = std::make_unique<WidgetCallback::Data<Widget, std::string>>(this, eventName);
 	auto dataPtr = cbData.get();
-	smartCallbacks_.insert_or_assign(eventName, WidgetCallback::Value<std::string> {std::move(callback), std::move(cbData)});
+	smartCallbacks_.insert_or_assign(eventName, WidgetCallback::Value<Widget, std::string> {std::move(callback), std::move(cbData)});
 	evas_object_smart_callback_add(getObject(), eventName.c_str(), smartCallbackMethod, dataPtr);
 }
 
@@ -52,9 +64,9 @@ void Widget::removeEvasSmartCallback(const std::string &eventName)
 
 void Widget::setEextEventCallback(const Eext_Callback_Type type, std::function<void()> callback)
 {
-	auto cbData = std::make_unique<WidgetCallback::Data<Eext_Callback_Type>>(this, type);
+	auto cbData = std::make_unique<WidgetCallback::Data<Widget, Eext_Callback_Type>>(this, type);
 	auto dataPtr = cbData.get();
-	eextEventCallbacks_.insert_or_assign(type, WidgetCallback::Value<Eext_Callback_Type> {std::move(callback), std::move(cbData)});
+	eextEventCallbacks_.insert_or_assign(type, WidgetCallback::Value<Widget, Eext_Callback_Type> {std::move(callback), std::move(cbData)});
 	eext_object_event_callback_add(getObject(), type, eextEventMethod, dataPtr);
 }
 
@@ -129,7 +141,7 @@ void Widget::removeChild(Widget *child)
 
 void Widget::smartCallbackMethod(void *data, Evas_Object *obj, void *event_info)
 {
-	auto cbData = static_cast<WidgetCallback::Data<std::string>*>(data);
+	auto cbData = static_cast<WidgetCallback::Data<Widget, std::string>*>(data);
 
 	auto cb = cbData->self->smartCallbacks_.find(cbData->eventName);
 	if (cb == cbData->self->smartCallbacks_.end()) {
@@ -142,7 +154,7 @@ void Widget::smartCallbackMethod(void *data, Evas_Object *obj, void *event_info)
 
 void Widget::eextEventMethod(void *data, Evas_Object *obj, void *event_info)
 {
-	auto cbData = static_cast<WidgetCallback::Data<Eext_Callback_Type>*>(data);
+	auto cbData = static_cast<WidgetCallback::Data<Widget, Eext_Callback_Type>*>(data);
 
 	auto cb = cbData->self->eextEventCallbacks_.find(cbData->eventName);
 	if (cb == cbData->self->eextEventCallbacks_.end()) {
diff --git a/src/Widget.hpp b/src/Widget.hpp
index 16b5c93..23a54d7 100644
--- a/src/Widget.hpp
+++ b/src/Widget.hpp
@@ -7,6 +7,7 @@
 #include "TranslatedString.hpp"
 #include "utils.hpp"
 #include "WidgetCallback.hpp"
+#include "Geometry.hpp"
 
 #include <memory>
 #include <vector>
@@ -40,6 +41,8 @@ public:
 	void setAlignHint(double x, double y);
 	void setMinSizeHint(Evas_Coord v, Evas_Coord h);
 	void setMaxSizeHint(Evas_Coord v, Evas_Coord h);
+	Rectangle getGeometry();
+	void setPosition(Point anchor);
 	void setEvasSmartCallback(const std::string &eventName, std::function<void()> callback);
 	void removeEvasSmartCallback(const std::string &eventName);
 	void setEextEventCallback(const Eext_Callback_Type type, std::function<void()> callback);
@@ -65,8 +68,8 @@ protected:
 	std::unique_ptr<Evas_Object, utils::EvasDeleter> uniqueObj_;
 	Widget *parent_ = nullptr;
 	std::vector<std::unique_ptr<Widget>> children_;
-	std::unordered_map<std::string, WidgetCallback::Value<std::string>> smartCallbacks_;
-	std::unordered_map<Eext_Callback_Type, WidgetCallback::Value<Eext_Callback_Type>> eextEventCallbacks_;
+	std::unordered_map<std::string, WidgetCallback::Value<Widget, std::string>> smartCallbacks_;
+	std::unordered_map<Eext_Callback_Type, WidgetCallback::Value<Widget, Eext_Callback_Type>> eextEventCallbacks_;
 };
 
 #endif
diff --git a/src/WidgetCallback.hpp b/src/WidgetCallback.hpp
index 1decfc7..9413689 100644
--- a/src/WidgetCallback.hpp
+++ b/src/WidgetCallback.hpp
@@ -9,19 +9,19 @@ class Widget;
 
 namespace WidgetCallback
 {
-	template <typename T>
+	template <typename S, typename T>
 	struct Data {
-		Data(Widget *self, const T &name)
+		Data(S *self, const T &name)
 			: self(self), eventName(name)
 		{}
-		Widget *self = nullptr;
+		S *self = nullptr;
 		T eventName{};
 	};
 
-	template <typename T>
+	template <typename S, typename T>
 	struct Value {
 		std::function<void()> callback;
-		std::unique_ptr<Data<T>> data;
+		std::unique_ptr<Data<S, T>> data;
 	};
 
 }
-- 
2.7.4


From d929b2b3ccc882c776a1e691993ca963c9477e70 Mon Sep 17 00:00:00 2001
From: Lukasz Wlazly <l.wlazly@partner.samsung.com>
Date: Thu, 14 Feb 2019 14:37:19 +0100
Subject: [PATCH 05/16] Refactor of SetValuePage class

This patch separates SetValuePage from RemoveSwitchPage
and replace c-style callbacks with lambda function
Change-Id: I857d1e5bf3a6f7f09180ae5360aabb05fa24478c
---
 src/AccessoriesSwitchesPage.cpp     |   4 +-
 src/ActionPage.cpp                  |  21 +-
 src/ActionPage.hpp                  |   7 +-
 src/Button.cpp                      |   2 +-
 src/CtxPopup.cpp                    |   5 +-
 src/Naviframe.cpp                   |   5 +-
 src/Naviframe.hpp                   |   2 +-
 src/RemoveSwitchPage.cpp            |  84 +++++--
 src/RemoveSwitchPage.hpp            |   5 +
 src/SetValueLayout.cpp              | 112 ---------
 src/SetValueLayout.hpp              |  88 -------
 src/SetValuePage.cpp                | 290 ++++++++--------------
 src/SetValuePage.hpp                |  63 +++--
 src/SettingAccessibility.hpp        |  16 --
 src/UniversalSwitchSettingsPage.cpp | 474 ++++++++++++++++++------------------
 src/UniversalSwitchSettingsPage.hpp |  47 ++--
 src/UpdateSwitchPage.cpp            |  13 +-
 src/UpdateSwitchPage.hpp            |   1 +
 18 files changed, 503 insertions(+), 736 deletions(-)
 delete mode 100644 src/SetValueLayout.cpp
 delete mode 100644 src/SetValueLayout.hpp

diff --git a/src/AccessoriesSwitchesPage.cpp b/src/AccessoriesSwitchesPage.cpp
index f83e327..7b80ce3 100644
--- a/src/AccessoriesSwitchesPage.cpp
+++ b/src/AccessoriesSwitchesPage.cpp
@@ -89,7 +89,7 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 	popup->setPartContent("button1", cancelBtn);
 
 	auto saveBtnCb = [popup, entry, this]() {
-		if ((switchName_ = entry->getEntryText()).empty()){
+		if ((switchName_ = entry->getEntryText()).empty()) {
 			SETTING_TRACE_END; //TODO probably to remove
 			return;
 		}
@@ -112,7 +112,7 @@ void AccessoriesSwitchesPage::alreadyMappedSwitchPopup()
 	auto popup = Widget::make<Popup>(context_->md.getNaviframe(), "IDS_ACCS_UNIVERSAL_SWITCH_UNABLE_TO_ADD");
 	popup->setEextEventCallback(EEXT_CALLBACK_BACK, []() {});
 
-	auto okBtnCb = [popup, this](){
+	auto okBtnCb = [popup, this]() {
 		setting_accessibility_universal_switch_dbus_config_captureSwitch(&context_->config, ACCESSIBILITY_UNIVERSAL_SWITCH_ACCESSORIES_SWITCH_PROVIDER, -1, captureSwitchCb, this);
 		auto parent = popup->getParent();
 		parent->removeChild(popup);
diff --git a/src/ActionPage.cpp b/src/ActionPage.cpp
index d37b650..fa1b014 100644
--- a/src/ActionPage.cpp
+++ b/src/ActionPage.cpp
@@ -23,26 +23,25 @@
 ActionPage::ActionPage(SettingAccessibility *ad)
 	: context_(ad)
 {
-	context_->setValuePage_ = std::make_unique<SetValuePage>(context_, ValueEditorType::RADIOS, _("IDS_ACCS_UNIVERSAL_SWITCH_SELECT_ACTION"));
-	SetValuePage::addRadioItemChangedCb(context_, actionChangedCb, this);
+	setValuePage_ = std::make_unique<SetValuePage>(context_, ValueEditorType::RADIOS, _("IDS_ACCS_UNIVERSAL_SWITCH_SELECT_ACTION"));
+	setValuePage_->addRadioItemChangedCb([this](auto val) {
+		this->actionChangedCb(val);
+	});
 	for (auto i = 0u; i < context_->config.activity_types.size(); ++i)
-		SetValuePage::addRadioItem(context_, context_->config.activity_types[i]->name, i, false);
+		setValuePage_->addRadioItem(context_->config.activity_types[i]->name, i, false);
 }
 
-void ActionPage::actionChangedCb(void *data, size_t item_id)
+void ActionPage::actionChangedCb(size_t item_id)
 {
-	retm_if(data == NULL, "Input parameter is NULL");
-	auto self = static_cast<ActionPage *>(data);
-
-	if (item_id >= self->context_->config.activity_types.size()) {
+	if (item_id >= context_->config.activity_types.size()) {
 		SETTING_TRACE_END;
 		return;
 	}
 
-	auto activity = self->context_->config.activity_types[item_id];
+	auto activity = context_->config.activity_types[item_id];
 	// SETTING_TRACE_DEBUG("Selected activity type, id: %s, name: %s, description: %s", activity->id, activity->name, activity->description);
-	if (self->actionCb_)
-		self->actionCb_(self->context_, activity->id, self->actionCbData_);
+	if (actionCb_)
+		actionCb_(context_, activity->id, actionCbData_);
 }
 
 void ActionPage::attachCallback(switch_action_cb cb, void *user_data)
diff --git a/src/ActionPage.hpp b/src/ActionPage.hpp
index 8cc8efb..be3c3b2 100644
--- a/src/ActionPage.hpp
+++ b/src/ActionPage.hpp
@@ -18,7 +18,11 @@
 #define ACTION_PAGE_HPP
 
 #include "SettingAccessibility.hpp"
+#include "SetValuePage.hpp"
 
+#include <memory>
+
+class SetValuePage;
 /**
  * View allowing to select action and bind it to currently selected switch
  *
@@ -35,11 +39,12 @@ public:
 	void attachCallback(switch_action_cb cb, void *user_data);
 
 private:
-	static void actionChangedCb(void *data, size_t item_id);
+	void actionChangedCb(size_t item_id);
 
 	SettingAccessibility *context_ = nullptr;
 	switch_action_cb actionCb_ = nullptr;
 	void *actionCbData_ = nullptr;
+	std::unique_ptr<SetValuePage> setValuePage_;
 };
 
 #endif
diff --git a/src/Button.cpp b/src/Button.cpp
index 65a1650..428f292 100644
--- a/src/Button.cpp
+++ b/src/Button.cpp
@@ -16,7 +16,7 @@ Button::Button(Widget *parent, std::function<void()> onClick, const TranslatedSt
 	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	setAlignHint(EVAS_HINT_FILL, 0.5);
 	setText(text);
-	if(!style.empty())
+	if (!style.empty())
 		setStyle(style);
 	setEvasSmartCallback("clicked", onClick);
 	show();
diff --git a/src/CtxPopup.cpp b/src/CtxPopup.cpp
index 41724ca..2f15807 100644
--- a/src/CtxPopup.cpp
+++ b/src/CtxPopup.cpp
@@ -25,7 +25,7 @@ void CtxPopup::addItem(const TranslatedString &label, std::function<void()> onCl
 {
 	auto cbData = std::make_unique<WidgetCallback::Data<CtxPopup, int>>(this, callbacks_.size());
 	auto dataPtr = cbData.get();
-	auto val = WidgetCallback::Value<CtxPopup, int>{std::move(onClick), std::move(cbData)};
+	auto val = WidgetCallback::Value<CtxPopup, int> {std::move(onClick), std::move(cbData)};
 	callbacks_.push_back(std::move(val));
 	elm_ctxpopup_item_append(uniqueObj_.get(), label.c_str(), NULL, callbackMethod, dataPtr);
 }
@@ -37,8 +37,7 @@ void CtxPopup::callbackMethod(void *data, Evas_Object *obj, void *event_info)
 	try {
 		auto c = cbData->self->callbacks_.at(cbData->eventName).callback;
 		c();
-	}
-	catch ( std::out_of_range error) {
+	} catch (std::out_of_range error) {
 		SETTING_TRACE_ERROR("No callback registered for this event");
 	}
 }
\ No newline at end of file
diff --git a/src/Naviframe.cpp b/src/Naviframe.cpp
index ad3d2fa..5bfa42e 100644
--- a/src/Naviframe.cpp
+++ b/src/Naviframe.cpp
@@ -31,10 +31,9 @@ void Naviframe::pushBack(const TranslatedString &title, Widget *content, const s
 
 void Naviframe::onPopAnimationEnd()
 {
-	if (naviframeStack_.size())
-	{
+	if (naviframeStack_.size()) {
 		auto children = naviframeStack_.top();
-		auto removeFromParent = [](Widget *child) {
+		auto removeFromParent = [](Widget * child) {
 			if (child) {
 				auto parent = child->getParent();
 				parent->removeChild(child);
diff --git a/src/Naviframe.hpp b/src/Naviframe.hpp
index 2131e8c..acb85dd 100644
--- a/src/Naviframe.hpp
+++ b/src/Naviframe.hpp
@@ -20,7 +20,7 @@ private:
 	static Eina_Bool callbackMethod(void *data, Elm_Object_Item *it);
 	void onPopAnimationEnd();
 
-	std::stack<std::pair<Widget*, Widget*>> naviframeStack_;
+	std::stack<std::pair<Widget *, Widget *>> naviframeStack_;
 	std::unordered_map<Elm_Object_Item *, std::function<void()>> naviframeCallbacks_;
 };
 
diff --git a/src/RemoveSwitchPage.cpp b/src/RemoveSwitchPage.cpp
index dd25917..3e52aa6 100644
--- a/src/RemoveSwitchPage.cpp
+++ b/src/RemoveSwitchPage.cpp
@@ -30,12 +30,15 @@
 RemoveSwitchPage::RemoveSwitchPage(SettingAccessibility *ad)
 	: context_(ad)
 {
-	context_->switches_to_remove_counter = 0;
+	auto naviframe = context_->md.getNaviframe();
+	layout_ = Widget::make<Layout>(naviframe, "edje/accessibility-settings-set-value.edj", "set-value-switches");
+	genlist_ = Widget::make<Genlist>(layout_);
+	genlist_->setMode(ELM_LIST_COMPRESS);
+	genlist_->setStyle("dialogue");
+	layout_->setPartContent("set-value-list", genlist_);
 
-	setValuePage_ = std::make_unique<SetValuePage>(context_, ValueEditorType::SWITCHES, _("IDS_ACCS_SELECT_ITEMS"));
-	SetValuePage::addRemoveSwitchPageCallback(context_, useNaviframeTitleAsCounter, this);
+	elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_SELECT_ITEMS"), NULL, NULL, layout_->getObject(), NULL);
 
-	auto naviframe = context_->md.getNaviframe();
 	all_checkbox = WidgetFactory::createCheck(naviframe->getObject(), EINA_FALSE, nullptr, {}, onAllButtonsClicked, this);
 	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", all_checkbox);
 
@@ -47,10 +50,53 @@ RemoveSwitchPage::RemoveSwitchPage(SettingAccessibility *ad)
 
 	for (auto i = 0u; i < context_->config.configuration_items.size(); ++i) {
 		auto activity_name = setting_accessibility_universal_switch_dbus_config_get_activity_name(&context_->config, context_->config.configuration_items[i]->activity_type);
-		SetValuePage::addRemoveSwitchItem(context_, context_->config.configuration_items[i]->user_name, activity_name, i, false);
+		auto item = createGendialGroupItem(genlist_->getObject(), &itc_1text_1icon_3,
+										   gendialRemoveSelectedItemCb, NULL,
+										   SwallowType::CHECK, false,
+										   context_->config.configuration_items[i]->user_name,
+										   activity_name,
+										   gendialRemoveCheckboxItemCb);
+
+		if (item) {
+			item->userdata = this;
+			item->chk_id = i;
+		}
 	}
 }
 
+void RemoveSwitchPage::gendialRemoveSelectedItemCb(void *data, Evas_Object *obj, void *event_info)
+{
+	retm_if(event_info == NULL, "Invalid argument: event_info is NULL");
+	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
+
+	elm_genlist_item_selected_set(item, 0);
+
+	auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
+	setting_update_gl_item_chk_status(list_item, list_item->chk_status ? 0 : 1);
+
+	auto self = static_cast<RemoveSwitchPage *>(list_item->userdata);
+
+	if (elm_check_state_get(list_item->eo_check))
+		self->switchesToRemoveCounter_++;
+	else
+		self->switchesToRemoveCounter_--;
+
+	useNaviframeTitleAsCounter(self);
+}
+
+void RemoveSwitchPage::gendialRemoveCheckboxItemCb(void *data, Evas_Object *obj, void *event_info)
+{
+	retm_if(data == NULL, "Input parameter is NULL");
+	auto list_item = static_cast<GenGroupItemData *>(data);
+	auto self = static_cast<RemoveSwitchPage *>(list_item->userdata);
+	if (elm_check_state_get(list_item->eo_check))
+		self->switchesToRemoveCounter_++;
+	else
+		self->switchesToRemoveCounter_--;
+
+	useNaviframeTitleAsCounter(self);
+}
+
 void RemoveSwitchPage::attachCallback(UniversalSwitchCb cb, void *cbData)
 {
 	switch_removed_cb = cb;
@@ -61,36 +107,36 @@ void RemoveSwitchPage::onAllButtonsClicked(void *data, Evas_Object *obj, void *e
 {
 	retm_if(data == NULL, "Input parameter is NULL");
 	auto self = static_cast<RemoveSwitchPage *>(data);
-	retm_if(self->context_->set_value_layout.getGenlist() == NULL, "No genlist provided");
+	retm_if(self->genlist_ == NULL, "No genlist provided");
 
-	auto genlist_size = self->context_->set_value_layout.getGenlist()->size();
-	bool all_selected = (self->context_->switches_to_remove_counter == genlist_size);
+	auto genlist_size = self->genlist_->size();
+	bool all_selected = (self->switchesToRemoveCounter_ == genlist_size);
 
-	Elm_Object_Item *item = elm_genlist_first_item_get(self->context_->set_value_layout.getGenlist()->getObject());
+	Elm_Object_Item *item = elm_genlist_first_item_get(self->genlist_->getObject());
 	while (item != NULL) {
 		auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
 		setting_update_gl_item_chk_status(list_item, !all_selected);
 		item = elm_genlist_item_next_get(item);
 	}
 
-	self->context_->switches_to_remove_counter = all_selected ? 0 : genlist_size;
+	self->switchesToRemoveCounter_ = all_selected ? 0 : genlist_size;
 	useNaviframeTitleAsCounter(self);
 }
 
 void RemoveSwitchPage::useNaviframeTitleAsCounter(RemoveSwitchPage *self)
 {
-	Eina_Bool state = self->context_->switches_to_remove_counter == self->context_->set_value_layout.getGenlist()->size();
+	Eina_Bool state = self->switchesToRemoveCounter_ == self->genlist_->size();
 	elm_check_state_set(self->all_checkbox, state);
 
 	std::string title;
-	if (self->context_->switches_to_remove_counter > SWITCH_COUNTER_MAX) {
+	if (self->switchesToRemoveCounter_ > SWITCH_COUNTER_MAX) {
 		title = std::to_string(SWITCH_COUNTER_MAX);
-	} else if (self->context_->switches_to_remove_counter > 0) {
-		title = std::to_string(self->context_->switches_to_remove_counter);
+	} else if (self->switchesToRemoveCounter_ > 0) {
+		title = std::to_string(self->switchesToRemoveCounter_);
 	} else {
 		title = TranslatedString{"IDS_ACCS_SELECT_ITEMS"} .str();
 	}
-	self->removeSwitchPopupBtn_->disable(self->context_->switches_to_remove_counter ? false : true);
+	self->removeSwitchPopupBtn_->disable(self->switchesToRemoveCounter_ ? false : true);
 	elm_layout_text_set(self->context_->md.getNaviframe()->getObject(), "default", title.c_str());
 }
 
@@ -105,10 +151,10 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 	retm_if(vconf_ret != 0,
 			"Failed to get vconf bool value VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE. Error: %d", vconf_ret);
 
-	if (vconf_val && context_->switches_to_remove_counter == context_->set_value_layout.getGenlist()->size()) {
+	if (vconf_val && switchesToRemoveCounter_ == genlist_->size()) {
 		popup->setText("IDS_ACCS_UNIVERSAL_SWITCH_DELETE_ALL_SWITCHES_DESC");
 	} else {
-		auto s = std::to_string(context_->switches_to_remove_counter) + " " + TranslatedString{"IDS_ACCS_UNIVERSAL_SWITCH_DELETE_SWITCHES_DESC"} .str();
+		auto s = std::to_string(switchesToRemoveCounter_) + " " + TranslatedString{"IDS_ACCS_UNIVERSAL_SWITCH_DELETE_SWITCHES_DESC"} .str();
 		popup->setText(s);
 	}
 	auto removeCb = [p = popup, nf = context_->md.getNaviframe()]() {
@@ -124,7 +170,7 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 
 	auto removeSwitchCb = [removeCb, this]() {
 
-		Elm_Object_Item *item = elm_genlist_last_item_get(context_->set_value_layout.getGenlist()->getObject());
+		Elm_Object_Item *item = elm_genlist_last_item_get(genlist_->getObject());
 		while (item != NULL) {
 			auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
 			item = elm_genlist_item_prev_get(item);
@@ -136,7 +182,7 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 		context_->md.getNaviframe()->removeChild(removeSwitchPopupBtn_);
 		context_->md.getNaviframe()->popBack();
 
-		bool disable_universal_switch = context_->switches_to_remove_counter == context_->set_value_layout.getGenlist()->size();
+		bool disable_universal_switch = switchesToRemoveCounter_ == genlist_->size();
 		if (disable_universal_switch && vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, 0))
 			LOGE("Failed to set vconf key %s.", VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE);
 
diff --git a/src/RemoveSwitchPage.hpp b/src/RemoveSwitchPage.hpp
index 23654b4..50dc7e4 100644
--- a/src/RemoveSwitchPage.hpp
+++ b/src/RemoveSwitchPage.hpp
@@ -47,6 +47,8 @@ private:
 	static void onRemoveSelectedSwitches(void *data, Evas_Object *obj, void *event_info);
 	static void onRemovePopup(void *data, Evas_Object *obj, void *event_info);
 	void removeSwitch(size_t item_id);
+	static void gendialRemoveSelectedItemCb(void *data, Evas_Object *obj, void *event_info);
+	static void gendialRemoveCheckboxItemCb(void *data, Evas_Object *obj, void *event_info);
 
 	SettingAccessibility *context_ = nullptr;
 	std::unique_ptr<SetValuePage> setValuePage_;
@@ -54,6 +56,9 @@ private:
 	void *switch_removed_cb_data = nullptr;
 	Button *removeSwitchPopupBtn_ = nullptr;
 	Evas_Object *all_checkbox = nullptr;
+	Layout *layout_ = nullptr;
+	Genlist *genlist_ = nullptr;
+	size_t switchesToRemoveCounter_ = 0;
 };
 
 
diff --git a/src/SetValueLayout.cpp b/src/SetValueLayout.cpp
deleted file mode 100644
index cab527a..0000000
--- a/src/SetValueLayout.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2018 Samsung Electronics Co., Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SetValueLayout.hpp"
-
-Layout *SetValueLayout::getLayout() const
-{
-	return layout;
-}
-
-void SetValueLayout::setLayout(Layout *layout)
-{
-	this->layout = layout;
-}
-
-Evas_Object *SetValueLayout::getScroller() const
-{
-	return scroller;
-}
-
-void SetValueLayout::setScroller(Evas_Object *scroller)
-{
-	this->scroller = scroller;
-}
-
-Evas_Object *SetValueLayout::getBox() const
-{
-	return box;
-}
-
-void SetValueLayout::setBox(Evas_Object *box)
-{
-	this->box = box;
-}
-
-Evas_Object *SetValueLayout::getCheck() const
-{
-	return check;
-}
-
-void SetValueLayout::setCheck(Evas_Object *check)
-{
-	this->check = check;
-}
-
-Genlist *SetValueLayout::getGenlist() const
-{
-	return genlist_;
-}
-
-void SetValueLayout::setGenlist(Genlist *genlist)
-{
-	genlist_ = genlist;
-}
-
-std::vector<OptionsItem *> &SetValueLayout::getOptionsData()
-{
-	return options_data;
-}
-
-double SetValueLayout::getMinVal() const
-{
-	return min_val;
-}
-
-void SetValueLayout::setMinVal(double val)
-{
-	min_val = val;
-}
-
-double SetValueLayout::getMaxVal() const
-{
-	return max_val;
-}
-
-void SetValueLayout::setMaxVal(double val)
-{
-	max_val = val;
-}
-
-double SetValueLayout::getStep() const
-{
-	return step;
-}
-
-void SetValueLayout::setStep(double val)
-{
-	step = val;
-}
-
-std::string SetValueLayout::getUnits() const
-{
-	return units;
-}
-
-void SetValueLayout::setUnits(const std::string &units)
-{
-	this->units = units;
-}
diff --git a/src/SetValueLayout.hpp b/src/SetValueLayout.hpp
deleted file mode 100644
index 67eea44..0000000
--- a/src/SetValueLayout.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2018 Samsung Electronics Co., Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef SET_VALUE_LAYOUT_HPP
-#define SET_VALUE_LAYOUT_HPP
-
-#include <Elementary.h>
-#include "Layout.hpp"
-#include "Genlist.hpp"
-
-#include <vector>
-#include <string>
-#include <functional>
-
-struct SettingAccessibility;
-
-using changeValueCb = std::function<void(void *, double)>;
-using changeSwitchCb = std::function<void(void *, bool)>;
-using changeRadioItemCb = std::function<void(void *, size_t)>;
-using changeSwitchItemCb = std::function<void(SettingAccessibility *, int, bool)>;
-using requestListItemOptionsCb = std::function<void(void *, int)>;
-
-struct OptionsItem {
-	SettingAccessibility *ad;
-	int option_id;
-};
-
-class SetValueLayout
-{
-public:
-	SetValueLayout() = default;
-	Layout *getLayout() const;
-	void setLayout(Layout *layout);
-	Evas_Object *getScroller() const;
-	void setScroller(Evas_Object *scroller);
-	Evas_Object *getBox() const;
-	void setBox(Evas_Object *box);
-	Evas_Object *getCheck() const;
-	void setCheck(Evas_Object *check);
-	Genlist *getGenlist() const;
-	void setGenlist(Genlist *genlist);
-	std::vector<OptionsItem *> &getOptionsData();
-	double getMinVal() const;
-	void setMinVal(double val);
-	double getMaxVal() const;
-	void setMaxVal(double val);
-	double getStep() const;
-	void setStep(double val);
-	std::string getUnits() const;
-	void setUnits(const std::string &units);
-
-	changeValueCb value_change_cb;
-	void *value_change_cb_data = nullptr;
-	changeSwitchCb switch_change_cb;
-	void *switch_change_cb_data = nullptr;
-	changeRadioItemCb radio_item_change_cb;
-	void *radio_item_change_cb_data = nullptr;
-	changeSwitchItemCb switch_item_change_cb;
-	requestListItemOptionsCb list_item_options_request_cb;
-	void *list_item_options_request_cb_data = nullptr;
-
-private:
-	Layout *layout = nullptr;
-	Evas_Object *scroller = nullptr;
-	Evas_Object *box = nullptr;
-	Evas_Object *check = nullptr;
-	Genlist *genlist_ = nullptr;
-	std::vector<OptionsItem *> options_data;
-	double min_val = 0.0;
-	double max_val = 0.0;
-	double step = 0.0;
-	std::string units;
-};
-
-#endif
diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index 8d70dc1..845ccda 100644
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -65,36 +65,35 @@ SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const
 		SETTING_TRACE_DEBUG("Unrecognized layout type!");
 	}
 	auto naviframe = context_->md.getNaviframe();
-	context_->set_value_layout.setLayout(createLayout(naviframe, layout_grp));
+	layout_ = createLayout(naviframe, layout_grp);
 	switch (type) {
 	case ValueEditorType::NUMERIC:
-		context_->set_value_layout.setScroller(createScroller(context_->set_value_layout.getLayout()->getObject()));
-		context_->set_value_layout.setBox(createBox(context_->set_value_layout.getScroller()));
-		evas_object_smart_callback_add(context_->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
+		scroller_ = createScroller(layout_->getObject());
+		box_ = createBox(scroller_);
+		evas_object_smart_callback_add(scroller_, "scroll,page,changed", scrollerScrollCb, this);
 		break;
 	case ValueEditorType::NUMERIC_SWITCH:
-		context_->set_value_layout.setScroller(createScroller(context_->set_value_layout.getLayout()->getObject()));
-		context_->set_value_layout.setBox(createBox(context_->set_value_layout.getScroller()));
-		context_->set_value_layout.setCheck(createCheck(context_->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
-		evas_object_smart_callback_add(context_->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
+		scroller_ = createScroller(layout_->getObject());
+		box_ = createBox(scroller_);
+		check_ = createCheck(layout_->getObject(), EINA_FALSE, checkStateChangedCb, this);
+		evas_object_smart_callback_add(scroller_, "scroll,page,changed", scrollerScrollCb, this);
 		break;
 	case ValueEditorType::RADIOS:
-		context_->set_value_layout.radio_item_change_cb = NULL;
-		context_->set_value_layout.setGenlist(createGenlist(context_->set_value_layout.getLayout(), NULL));
+		genlist_ = createGenlist(layout_, NULL);
 		break;
 	case ValueEditorType::SWITCHES:
-		context_->set_value_layout.setGenlist(createGenlist(context_->set_value_layout.getLayout(), NULL));
+		genlist_ = createGenlist(layout_, NULL);
 		break;
 	case ValueEditorType::LIST_SWITCH:
-		context_->set_value_layout.setCheck(createCheck(context_->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
-		context_->set_value_layout.setGenlist(createGenlist(context_->set_value_layout.getLayout(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS")));
+		check_ = createCheck(layout_->getObject(), EINA_FALSE, checkStateChangedCb, this);
+		genlist_ = createGenlist(layout_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS"));
 		break;
 	default:
 		LOGE("Wrong value type");
 	}
 
-	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), title, NULL, NULL, context_->set_value_layout.getLayout()->getObject(), NULL);
-	elm_naviframe_item_pop_cb_set(navi_it, naviframePopCb, ad);
+	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), title, NULL, NULL, layout_->getObject(), NULL);
+	elm_naviframe_item_pop_cb_set(navi_it, naviframePopCb, this);
 	elm_object_item_domain_text_translatable_set(navi_it, PACKAGE, EINA_TRUE);
 
 	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
@@ -103,25 +102,22 @@ SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const
 	naviframe->setPartContent("prev_btn", prevBtn);
 }
 
-void SetValuePage::setDescription(SettingAccessibility *ad, const char *description)
+void SetValuePage::setDescription(const char *description)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	ad->set_value_layout.getLayout()->setPartText(PRT_SET_VALUE_DESC, description);
+	layout_->setPartText(PRT_SET_VALUE_DESC, description);
 }
 
-void SetValuePage::setRange(SettingAccessibility *ad, double min, double max, double step)
+void SetValuePage::setRange(double min, double max, double step)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
 	retm_if(min >= max, "Invalid min/max arguments");
 	retm_if(step <= 0.0, "Invalid step value");
 
-	ad->set_value_layout.setMinVal(min);
-	ad->set_value_layout.setMaxVal(max);
-	ad->set_value_layout.setStep(step);
+	minVal_ = min;
+	maxVal_ = max;
+	step_ = step;
 
-	elm_box_pack_end(ad->set_value_layout.getBox(), createLabel(ad->set_value_layout.getBox(), ""));
-	elm_box_pack_end(ad->set_value_layout.getBox(), createLabel(ad->set_value_layout.getBox(), ""));
+	elm_box_pack_end(box_, createLabel(box_, ""));
+	elm_box_pack_end(box_, createLabel(box_, ""));
 
 	for (auto i = min; i < max + step / 2; i += step) {
 		std::ostringstream out;
@@ -132,70 +128,63 @@ void SetValuePage::setRange(SettingAccessibility *ad, double min, double max, do
 			out.precision(0);
 		out << std::fixed << i << "</font/>";
 
-		Evas_Object *label = createLabel(ad->set_value_layout.getBox(), out.str().c_str());
-		elm_box_pack_end(ad->set_value_layout.getBox(), label);
+		Evas_Object *label = createLabel(box_, out.str().c_str());
+		elm_box_pack_end(box_, label);
 	}
 
-	elm_box_pack_end(ad->set_value_layout.getBox(), createLabel(ad->set_value_layout.getBox(), ""));
-	elm_box_pack_end(ad->set_value_layout.getBox(), createLabel(ad->set_value_layout.getBox(), ""));
+	elm_box_pack_end(box_, createLabel(box_, ""));
+	elm_box_pack_end(box_, createLabel(box_, ""));
 
 	std::ostringstream out;
-	if (step < 1.0)
+	if (step_ < 1.0)
 		out.precision(1);
 	else
 		out.precision(0);
 
 	out << std::fixed << "Accepted range: " << min << " to " << max; //TODO translation
 
-	ad->set_value_layout.getLayout()->setPartText(PRT_SET_VALUE_RANGE, out.str());
+	layout_->setPartText(PRT_SET_VALUE_RANGE, out.str());
 }
 
-void SetValuePage::setValue(SettingAccessibility *ad, double value, const char *units)
+void SetValuePage::setValue(double value, const std::string &units)
 {
-	retm_if(ad == NULL || units == NULL, "Input parameter is NULL");
-	retm_if(value < ad->set_value_layout.getMinVal(), "Invalid value");
-	retm_if(value > ad->set_value_layout.getMaxVal(), "Invalid value");
+	retm_if(value < minVal_, "Invalid value");
+	retm_if(value > maxVal_, "Invalid value");
 
-	ad->set_value_layout.setUnits(units);
-	elm_scroller_page_show(ad->set_value_layout.getScroller(), 0, (value - ad->set_value_layout.getMinVal()) / ad->set_value_layout.getStep());
+	units_ = units;
+	elm_scroller_page_show(scroller_, 0, (value - minVal_) / step_);
 
-	displayValue(ad, value);
+	displayValue(value);
 }
 
-void SetValuePage::setSwitch(SettingAccessibility *ad, bool state)
+void SetValuePage::setSwitch(bool state)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	elm_check_state_set(ad->set_value_layout.getCheck(), (Eina_Bool)state);
+	elm_check_state_set(check_, (Eina_Bool)state);
 
 	if (state)
-		ad->set_value_layout.getLayout()->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_ON");
+		layout_->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_ON");
 	else
-		ad->set_value_layout.getLayout()->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
+		layout_->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 }
 
-void SetValuePage::addRadioItem(SettingAccessibility *ad, const std::string &caption, int id, bool selected)
+void SetValuePage::addRadioItem(const std::string &caption, int id, bool selected)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	GenGroupItemData *item = createGendialGroupItem(ad->set_value_layout.getGenlist()->getObject(), &itc_1text_1icon_3,
-							 gendialRadioItemSelectedCb, NULL,
+	GenGroupItemData *item = createGendialGroupItem(genlist_->getObject(), &itc_1text_1icon_3,
+							 gendialRadioItemSelectedCb, this,
 							 SwallowType::RADIO_1TEXT, selected ? 0 : -1,
 							 caption,
 							 {},
 							 gendialRadioChangeCb);
 
 	if (item) {
-		item->userdata = ad;
+		item->userdata = this;
 		item->chk_id = id;
 	}
 }
 
-void SetValuePage::addSwitchItem(SettingAccessibility *ad, const char *caption, const char *sub_desc, int id, bool state, SettingCallback gl_sel)
+void SetValuePage::addSwitchItem(const char *caption, const char *sub_desc, int id, bool state, SettingCallback gl_sel)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	GenGroupItemData *item = createGendialGroupItem(ad->set_value_layout.getGenlist()->getObject(), &ad->itc_multiline_sub,
+	GenGroupItemData *item = createGendialGroupItem(genlist_->getObject(), &context_->itc_multiline_sub,
 							 gl_sel, NULL,
 							 SwallowType::ICON_RADIO, (int)state,
 							 caption ? caption : std::string{},
@@ -203,113 +192,75 @@ void SetValuePage::addSwitchItem(SettingAccessibility *ad, const char *caption,
 							 switchItemCheckboxCb);
 
 	if (item) {
-		item->userdata = (void *)ad;
-		item->chk_id = id;
-	}
-}
-
-void SetValuePage::addRemoveSwitchItem(SettingAccessibility *ad, const std::string &caption, const std::string &subtext, int id, bool state)
-{
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	GenGroupItemData *item = createGendialGroupItem(ad->set_value_layout.getGenlist()->getObject(), &itc_1text_1icon_3,
-							 gendialRemoveSelectedItemCb, NULL,
-							 SwallowType::CHECK, (int)state,
-							 caption,
-							 subtext,
-							 gendialRemoveCheckboxItemCb);
-
-	if (item) {
-		item->userdata = (void *)ad;
+		item->userdata = this;
 		item->chk_id = id;
 	}
 }
 
-GenGroupItemData *SetValuePage::addRadioListItem(SettingAccessibility *ad, const char *main_text, const char *sub_text, int option_id)
+GenGroupItemData *SetValuePage::addRadioListItem(const char *main_text, const char *sub_text, int option_id)
 {
-	retvm_if(ad == NULL, NULL, "Input parameter is NULL");
-
 	auto opt_item = new OptionsItem;
 	retvm_if(opt_item == NULL, NULL, "calloc failed");
 
-	opt_item->ad = ad;
+	opt_item->self = this;
 	opt_item->option_id = option_id;
 
-	ad->set_value_layout.getOptionsData().push_back(opt_item);
+	options_data.push_back(opt_item);
 
-	GenGroupItemData *item = createGendialGroupItem(ad->set_value_layout.getGenlist()->getObject(), &itc_2text,
+	GenGroupItemData *item = createGendialGroupItem(genlist_->getObject(), &itc_2text,
 							 listItemClickCb, opt_item,
 							 SwallowType::INVALID, 0,
 							 main_text ? main_text : std::string{},
 							 sub_text ? sub_text : std::string{},
 							 NULL);
 	if (item)
-		elm_object_item_disabled_set(item->item, !elm_check_state_get(ad->set_value_layout.getCheck()));
+		elm_object_item_disabled_set(item->item, !elm_check_state_get(check_));
 
 
 	return item;
 }
 
-void SetValuePage::addValueChangedCb(SettingAccessibility *ad, changeValueCb cb, void *data)
+void SetValuePage::addValueChangedCb(ChangeValueCb cb)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	ad->set_value_layout.value_change_cb = cb;
-	ad->set_value_layout.value_change_cb_data = data;
+	changeValueCb_ = std::move(cb);
 }
 
-void SetValuePage::addSwitchChangedCb(SettingAccessibility *ad, changeSwitchCb cb, void *data)
+void SetValuePage::addSwitchChangedCb(ChangeSwitchCb cb)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	ad->set_value_layout.switch_change_cb = cb;
-	ad->set_value_layout.switch_change_cb_data = data;
+	changeSwitchCb_ = std::move(cb);
 }
 
-void SetValuePage::addRadioItemChangedCb(SettingAccessibility *ad, changeRadioItemCb cb, void *data)
+void SetValuePage::addRadioItemChangedCb(ChangeRadioItemCb cb)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	ad->set_value_layout.radio_item_change_cb = cb;
-	ad->set_value_layout.radio_item_change_cb_data = data;
+	changeRadioItemCb_ = std::move(cb);
 }
 
-void SetValuePage::addSwitchItemChangedCb(SettingAccessibility *ad, changeSwitchItemCb cb)
+void SetValuePage::addSwitchItemChangedCb(ChangeSwitchItemCb cb)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	ad->set_value_layout.switch_item_change_cb = cb;
+	changeSwitchItemCb_ = std::move(cb);
 }
 
-void SetValuePage::addListItemOptionsRequestCb(SettingAccessibility *ad, requestListItemOptionsCb cb, void *data)
+void SetValuePage::addListItemOptionsRequestCb(RequestListItemOptionsCb cb)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
-
-	ad->set_value_layout.list_item_options_request_cb = cb;
-	ad->set_value_layout.list_item_options_request_cb_data = data;
+	requestListItemOptionsCb_ = std::move(cb);
 }
 
 void SetValuePage::syncPageWithVconf(keynode_t *node, void *user_data)
 {
 	retm_if(user_data == NULL, "Data parameter is NULL");
 	retm_if(node == NULL, "Data parameter is NULL");
-	auto ad = static_cast<SettingAccessibility *>(user_data);
+	auto self = static_cast<SetValuePage *>(user_data);
 	int ret = vconf_keynode_get_bool(node);
 	retm_if(ret < 0, "FAIL: vconf_keynode_get_bool");
-	if (elm_check_state_get(ad->set_value_layout.getCheck()) != ret) {
-		elm_check_state_set(ad->set_value_layout.getCheck(), ret);
-		checkStateChangedCb(ad, ad->set_value_layout.getCheck(), NULL);
+	if (elm_check_state_get(self->check_) != ret) {
+		elm_check_state_set(self->check_, ret);
+		checkStateChangedCb(self, self->check_, NULL);
 	}
 }
 
-void SetValuePage::addRemoveSwitchPageCallback(SettingAccessibility *ad, RemoveSwitchPageCb cb, RemoveSwitchPage *data)
-{
-	ad->removeSwitchPageCb_ = cb;
-	ad->removeSwitchPageCbData_ = data;
-}
-
 void SetValuePage::gendialRadioItemSelectedCb(void *data, Evas_Object *obj, void *event_info)
 {
+	auto self = static_cast<SetValuePage *>(data);
 	retm_if(event_info == NULL, "Invalid argument: event_info is NULL");
 	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
 
@@ -319,77 +270,40 @@ void SetValuePage::gendialRadioItemSelectedCb(void *data, Evas_Object *obj, void
 	if (list_item->chk_status)
 		setting_update_gl_item_chk_status(list_item, 0);
 
-	callRadioItemChangeCbAndPopNaviframe(list_item);
+	self->callRadioItemChangeCbAndPopNaviframe(list_item);
 }
 
 void SetValuePage::gendialRadioChangeCb(void *data, Evas_Object *obj, void *event_info)
 {
 	retm_if(data == NULL, "Input parameter is NULL");
 	auto list_item = static_cast<GenGroupItemData *>(data);
-	callRadioItemChangeCbAndPopNaviframe(list_item);
+	auto self = static_cast<SetValuePage *>(list_item->userdata);
+	self->callRadioItemChangeCbAndPopNaviframe(list_item);
 }
 
 void SetValuePage::callRadioItemChangeCbAndPopNaviframe(GenGroupItemData *list_item)
 {
 	retm_if(list_item == NULL, "Input parameter is NULL");
-	auto ad = static_cast<SettingAccessibility *>(list_item->userdata);
-	retm_if(ad == NULL, "Application data is NULL");
-	if (ad->set_value_layout.radio_item_change_cb)
-		ad->set_value_layout.radio_item_change_cb(ad->set_value_layout.radio_item_change_cb_data, list_item->chk_id);
-
-	if (ad->md.naviframe_it) {
-		elm_naviframe_item_pop_cb_set(elm_naviframe_top_item_get(ad->md.getNaviframe()->getObject()), NULL, NULL);
-		elm_naviframe_item_pop_to(ad->md.naviframe_it);
+	if (changeRadioItemCb_)
+		changeRadioItemCb_(list_item->chk_id);
+
+	if (context_->md.naviframe_it) {
+		elm_naviframe_item_pop_cb_set(elm_naviframe_top_item_get(context_->md.getNaviframe()->getObject()), NULL, NULL);
+		elm_naviframe_item_pop_to(context_->md.naviframe_it);
 	} else {
-		elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
+		elm_naviframe_item_pop(context_->md.getNaviframe()->getObject());
 	}
 }
 
-void SetValuePage::gendialRemoveSelectedItemCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(event_info == NULL, "Invalid argument: event_info is NULL");
-	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-
-	elm_genlist_item_selected_set(item, 0);
-
-	auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
-	setting_update_gl_item_chk_status(list_item,
-									  list_item->chk_status ? 0 : 1);
-
-	auto ad = static_cast<SettingAccessibility *>(list_item->userdata);
-
-	if (elm_check_state_get(list_item->eo_check))
-		ad->switches_to_remove_counter++;
-	else
-		ad->switches_to_remove_counter--;
-
-	if (ad->removeSwitchPageCb_)
-		ad->removeSwitchPageCb_(ad->removeSwitchPageCbData_);
-}
-
-void SetValuePage::gendialRemoveCheckboxItemCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Input parameter is NULL");
-	auto list_item = static_cast<GenGroupItemData *>(data);
-	auto ad = static_cast<SettingAccessibility *>(list_item->userdata);
-	if (elm_check_state_get(list_item->eo_check))
-		ad->switches_to_remove_counter++;
-	else
-		ad->switches_to_remove_counter--;
-
-	if (ad->removeSwitchPageCb_)
-		ad->removeSwitchPageCb_(ad->removeSwitchPageCbData_);
-}
-
 void SetValuePage::switchItemCheckboxCb(void *data, Evas_Object *obj, void *event_info)
 {
 	retm_if(data == NULL, "Input parameter is NULL");
 	auto list_item = static_cast<GenGroupItemData *>(data);
-	auto ad = static_cast<SettingAccessibility *>(list_item->userdata);
+	auto self = static_cast<SetValuePage *>(list_item->userdata);
 
-	if (ad->set_value_layout.switch_item_change_cb) {
+	if (self->changeSwitchItemCb_) {
 		bool state = elm_check_state_get(list_item->eo_check);
-		ad->set_value_layout.switch_item_change_cb(ad, list_item->chk_id, state);
+		self->changeSwitchItemCb_(list_item->chk_id, state);
 	}
 }
 
@@ -482,19 +396,17 @@ Layout *SetValuePage::createLayout(Widget *parent, const std::string &layout_grp
 	return layout;
 }
 
-void SetValuePage::displayValue(SettingAccessibility *ad, double value)
+void SetValuePage::displayValue(double value)
 {
-	retm_if(ad == NULL, "Input argument is NULL");
-
 	std::ostringstream out;
-	if (ad->set_value_layout.getStep() < 1.0)
+	if (step_ < 1.0)
 		out.precision(1);
 	else
 		out.precision(0);
 
-	out << std::fixed << value << " " << ad->set_value_layout.getUnits(); //TODO translation
+	out << std::fixed << value << " " << units_; //TODO translation
 
-	ad->set_value_layout.getLayout()->setPartText(PRT_SET_VALUE_VALUE, out.str());
+	layout_->setPartText(PRT_SET_VALUE_VALUE, out.str());
 }
 
 void SetValuePage::listItemClickCb(void *data, Evas_Object *obj, void *event_info)
@@ -502,65 +414,65 @@ void SetValuePage::listItemClickCb(void *data, Evas_Object *obj, void *event_inf
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 	retm_if(data == NULL, "Input parameter is NULL");
 	auto opt_item = static_cast<OptionsItem *>(data);
-	retm_if(opt_item->ad->set_value_layout.list_item_options_request_cb == NULL, "Function not provided");
 
-	opt_item->ad->set_value_layout.list_item_options_request_cb(opt_item->ad->set_value_layout.list_item_options_request_cb_data, opt_item->option_id);
+	if (opt_item->self->requestListItemOptionsCb_)
+		opt_item->self->requestListItemOptionsCb_(opt_item->option_id);
 }
 
 void SetValuePage::scrollerScrollCb(void *data, Evas_Object *obj, void *event_info)
 {
 	int page_num = 0;
 	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
+	auto self = static_cast<SetValuePage *>(data);
 
-	elm_scroller_current_page_get(ad->set_value_layout.getScroller(), NULL, &page_num);
+	elm_scroller_current_page_get(self->scroller_, NULL, &page_num);
 
-	displayValue(ad, (double)page_num * ad->set_value_layout.getStep() + ad->set_value_layout.getMinVal());
+	self->displayValue((double)page_num * self->step_ + self->minVal_);
 }
 
 void SetValuePage::checkStateChangedCb(void *data, Evas_Object *obj, void *event_info)
 {
 	bool state;
 	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
+	auto self = static_cast<SetValuePage *>(data);
 
 	state = elm_check_state_get(obj);
 
 	if (state)
-		ad->set_value_layout.getLayout()->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_ON");
+		self->layout_->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_ON");
 	else
-		ad->set_value_layout.getLayout()->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
+		self->layout_->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 
-	if (ad->set_value_layout.getGenlist()) {
-		Elm_Object_Item *item = elm_genlist_first_item_get(ad->set_value_layout.getGenlist()->getObject());
+	if (self->genlist_) {
+		Elm_Object_Item *item = elm_genlist_first_item_get(self->genlist_->getObject());
 		do {
 			elm_object_item_disabled_set(item, !state);
 			item = elm_genlist_item_next_get(item);
 		} while (item != NULL);
 	}
 
-	if (ad->set_value_layout.switch_change_cb)
-		ad->set_value_layout.switch_change_cb(ad->set_value_layout.switch_change_cb_data, state);
+	if (self->changeSwitchCb_)
+		self->changeSwitchCb_(state);
 }
 
 Eina_Bool SetValuePage::naviframePopCb(void *data, Elm_Object_Item *it)
 {
 	retv_if(data == NULL, EINA_TRUE);
-	auto ad = static_cast<SettingAccessibility *>(data);
+	auto self = static_cast<SetValuePage *>(data);
 
 	vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_VOICE_STATE, SetValuePage::syncPageWithVconf);
 	vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_SOUND_STATE, SetValuePage::syncPageWithVconf);
 
-	if (ad->set_value_layout.value_change_cb) {
+	if (self->changeValueCb_) {
 		int page_num = 0;
-		elm_scroller_current_page_get(ad->set_value_layout.getScroller(), NULL, &page_num);
-		ad->set_value_layout.value_change_cb(ad->set_value_layout.value_change_cb_data, (double)page_num * ad->set_value_layout.getStep() + ad->set_value_layout.getMinVal());
+		elm_scroller_current_page_get(self->scroller_, NULL, &page_num);
+		self->changeValueCb_((double)page_num * self->step_ + self->minVal_);
 	}
 
-	if (!ad->set_value_layout.getOptionsData().empty()) {
-		for (auto it : ad->set_value_layout.getOptionsData())
+	if (!self->options_data.empty()) {
+		for (auto it : self->options_data)
 			free(it);
-		ad->set_value_layout.getOptionsData().clear();
+		self->options_data.clear();
 	}
 
 	return EINA_TRUE;
diff --git a/src/SetValuePage.hpp b/src/SetValuePage.hpp
index 16cdd97..a2e6322 100644
--- a/src/SetValuePage.hpp
+++ b/src/SetValuePage.hpp
@@ -25,6 +25,8 @@
 class RemoveSwitchPage;
 using RemoveSwitchPageCb = void(*)(RemoveSwitchPage *); //temporary solution
 
+using ChangeValueCb = std::function<void(double)>;
+
 enum class ValueEditorType {
 	NUMERIC,
 	NUMERIC_SWITCH,
@@ -33,32 +35,40 @@ enum class ValueEditorType {
 	LIST_SWITCH
 };
 
+class SetValuePage;
+struct OptionsItem {
+	SetValuePage *self;
+	int option_id;
+};
+
+using ChangeValueCb = std::function<void(double)>;
+using ChangeSwitchCb = std::function<void(bool)>;
+using ChangeRadioItemCb = std::function<void(size_t)>;
+using ChangeSwitchItemCb = std::function<void(int, bool)>;
+using RequestListItemOptionsCb = std::function<void(int)>;
+
 class SetValuePage
 {
 public:
 	SetValuePage(SettingAccessibility *ad, ValueEditorType type, const char *title);
-	static void setDescription(SettingAccessibility *ad, const char *description);
-	static void setRange(SettingAccessibility *ad, double min, double max, double step);
-	static void setValue(SettingAccessibility *ad, double value, const char *units);
-	static void setSwitch(SettingAccessibility *ad, bool state);
-	static void addRadioItem(SettingAccessibility *ad, const std::string &caption, int id, bool selected);
-	static void addSwitchItem(SettingAccessibility *ad, const char *caption, const char *sub_desc, int id, bool state, SettingCallback gl_sel);
-	static void addRemoveSwitchItem(SettingAccessibility *ad, const std::string &caption, const std::string &subtext, int id, bool state);
-	static GenGroupItemData *addRadioListItem(SettingAccessibility *ad, const char *main_text, const char *sub_text, int option_id);
-	static void addValueChangedCb(SettingAccessibility *ad, changeValueCb cb, void *data);
-	static void addSwitchChangedCb(SettingAccessibility *ad, changeSwitchCb cb, void *data);
-	static void addRadioItemChangedCb(SettingAccessibility *ad, changeRadioItemCb cb, void *data);
-	static void addSwitchItemChangedCb(SettingAccessibility *ad, changeSwitchItemCb cb);
-	static void addListItemOptionsRequestCb(SettingAccessibility *ad, requestListItemOptionsCb cb, void *data);
+	void setDescription(const char *description);
+	void setRange(double min, double max, double step);
+	void setValue(double value, const std::string &units);
+	void setSwitch(bool state);
+	void addRadioItem(const std::string &caption, int id, bool selected);
+	void addSwitchItem(const char *caption, const char *sub_desc, int id, bool state, SettingCallback gl_sel);
+	GenGroupItemData *addRadioListItem(const char *main_text, const char *sub_text, int option_id);
+	void addValueChangedCb(ChangeValueCb cb);
+	void addSwitchChangedCb(ChangeSwitchCb cb);
+	void addRadioItemChangedCb(ChangeRadioItemCb cb);
+	void addSwitchItemChangedCb(ChangeSwitchItemCb cb);
+	void addListItemOptionsRequestCb(RequestListItemOptionsCb cb);
 	static void syncPageWithVconf(keynode_t *node, void *user_data);
-	static void addRemoveSwitchPageCallback(SettingAccessibility *ad, RemoveSwitchPageCb cb, RemoveSwitchPage *data);
 
 private:
 	static void gendialRadioItemSelectedCb(void *data, Evas_Object *obj, void *event_info);
 	static void gendialRadioChangeCb(void *data, Evas_Object *obj, void *event_info);
-	static void callRadioItemChangeCbAndPopNaviframe(GenGroupItemData *list_item);
-	static void gendialRemoveSelectedItemCb(void *data, Evas_Object *obj, void *event_info);
-	static void gendialRemoveCheckboxItemCb(void *data, Evas_Object *obj, void *event_info);
+	void callRadioItemChangeCbAndPopNaviframe(GenGroupItemData *list_item);
 	static void switchItemCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	Genlist *createGenlist(Widget *parent, const char *title);
 	static Evas_Object *createCheck(Evas_Object *parent, bool state, Evas_Smart_Cb onChanged, void *cbData);
@@ -66,7 +76,7 @@ private:
 	static Evas_Object *createBox(Evas_Object *parent);
 	static Evas_Object *createScroller(Evas_Object *parent);
 	Layout *createLayout(Widget *parent, const std::string &layout_grp);
-	static void displayValue(SettingAccessibility *ad, double value);
+	void displayValue(double value);
 	static void listItemClickCb(void *data, Evas_Object *obj, void *event_info);
 	static void scrollerScrollCb(void *data, Evas_Object *obj, void *event_info);
 	static void checkStateChangedCb(void *data, Evas_Object *obj, void *event_info);
@@ -74,6 +84,23 @@ private:
 	static void backCb(void *data, Evas_Object *obj, void *event_info);
 
 	SettingAccessibility *context_ = nullptr;
+
+	Layout *layout_ = nullptr;
+	Evas_Object *scroller_ = nullptr;
+	Evas_Object *box_ = nullptr;
+	Evas_Object *check_ = nullptr;
+	Genlist *genlist_ = nullptr;
+	std::vector<OptionsItem *> options_data;
+	double minVal_ = 0.0;
+	double maxVal_ = 0.0;
+	double step_ = 0.0;
+	std::string units_;
+
+	ChangeValueCb changeValueCb_;
+	ChangeSwitchCb changeSwitchCb_;
+	ChangeRadioItemCb changeRadioItemCb_;
+	ChangeSwitchItemCb changeSwitchItemCb_;
+	RequestListItemOptionsCb requestListItemOptionsCb_;
 };
 
 #endif
diff --git a/src/SettingAccessibility.hpp b/src/SettingAccessibility.hpp
index 3598f56..8f67aac 100644
--- a/src/SettingAccessibility.hpp
+++ b/src/SettingAccessibility.hpp
@@ -18,7 +18,6 @@
 #define SETTING_ACCESSIBILITY_HPP
 
 #include "MainData.hpp"
-#include "SetValueLayout.hpp"
 #include "UniversalSwitchConfiguration.hpp"
 #include "setting-accessibility-universal-switch-dbus.h"
 #include "AddSwitchPage.hpp"
@@ -41,17 +40,8 @@ class ActionPage;
 class SetValuePage;
 class MainPage;
 
-typedef void (*switch_action_cb)(SettingAccessibility *ad, const std::string &action, void *user_data);
-
-typedef void (*back_cb)(void *ad);
-
-class RemoveSwitchPage;
-using RemoveSwitchPageCb = void(*)(RemoveSwitchPage *); //temporary solution
-
 /**
  * Global context of application
- *
- * TODO: split into smaller classes
  */
 struct SettingAccessibility {
 	MainData md;
@@ -59,21 +49,15 @@ struct SettingAccessibility {
 	Elm_Genlist_Item_Class itc_multiline_sub;
 
 	Elm_Object_Item *naviframe_it;
-	SetValueLayout set_value_layout;
 
 	tts_h tts;
 
 	UniversalSwitchDbusConfig config;
 	UniversalSwitchConfiguration us_configuration;
-	size_t switches_to_remove_counter;
 
 	std::unique_ptr<MainPage> mainPage_;
 	std::unique_ptr<AddSwitchPage> addSwitchPage_;
 	std::unique_ptr<ActionPage> actionPage_;
-	std::unique_ptr<SetValuePage> setValuePage_;
-
-	RemoveSwitchPageCb removeSwitchPageCb_ = nullptr;
-	RemoveSwitchPage *removeSwitchPageCbData_ = nullptr;
 };
 
 #endif
diff --git a/src/UniversalSwitchSettingsPage.cpp b/src/UniversalSwitchSettingsPage.cpp
index d7d27cb..ab11899 100644
--- a/src/UniversalSwitchSettingsPage.cpp
+++ b/src/UniversalSwitchSettingsPage.cpp
@@ -513,13 +513,15 @@ void UniversalSwitchSettingsPage::manageOptionsCb(void *data, Evas_Object *obj,
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::SWITCHES, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_MANAGE"));
 
 	for (auto i = 0u; i < utils::lenOf(_manage_options); ++i)
-		SetValuePage::addSwitchItem(self->context_, _manage_options[i].first.c_str(),
-									(i == UniversalSwitchConfiguration::MANAGE_OPTIONS_COUNT - 1) ? "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_MANAGE_CONTEXTUAL_MENU_DESC" : NULL,
-									static_cast<int>(_manage_options[i].second),
-									self->context_->us_configuration.manage_options_state[i],
-									manageOptionsItemSelected);
-
-	SetValuePage::addSwitchItemChangedCb(self->context_, manageOptionsCheckboxCb);
+		self->setValuePage_->addSwitchItem(_manage_options[i].first.c_str(),
+										   (i == UniversalSwitchConfiguration::MANAGE_OPTIONS_COUNT - 1) ? "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_MANAGE_CONTEXTUAL_MENU_DESC" : NULL,
+										   static_cast<int>(_manage_options[i].second),
+										   self->context_->us_configuration.manage_options_state[i],
+										   manageOptionsItemSelected);
+
+	self->setValuePage_->addSwitchItemChangedCb([self](auto val, auto state) {
+		self->manageOptionsCheckboxCb(val, state);
+	});
 }
 
 void UniversalSwitchSettingsPage::manageOptionsItemSelected(void *data, Evas_Object *obj, void *event_info)
@@ -536,14 +538,15 @@ void UniversalSwitchSettingsPage::manageOptionsItemSelected(void *data, Evas_Obj
 	list_item->chk_status = ad->us_configuration.manage_options_state[list_item->chk_id] ? 1 : 0;
 	setting_update_gl_item_chk_status(list_item, list_item->chk_status ? 0 : 1);
 
-	manageOptionsCheckboxCb(ad, list_item->chk_id, list_item->chk_status);
+	ad->us_configuration.manage_options_state[list_item->chk_id] = list_item->chk_status;
+	bool state = list_item->chk_status;
+	updateVconfValue(_manage_options_key_array[list_item->chk_id], &state, NULL, NULL);
 }
 
-void UniversalSwitchSettingsPage::manageOptionsCheckboxCb(SettingAccessibility *ad, size_t item_id, bool state)
+void UniversalSwitchSettingsPage::manageOptionsCheckboxCb(size_t item_id, bool state)
 {
-	retm_if(ad == NULL, "Input parameter is NULL");
 	retm_if(item_id >= UniversalSwitchConfiguration::MANAGE_OPTIONS_COUNT, "Invalid item ID.");
-	ad->us_configuration.manage_options_state[item_id] = state;
+	context_->us_configuration.manage_options_state[item_id] = state;
 	updateVconfValue(_manage_options_key_array[item_id], &state, NULL, NULL);
 }
 
@@ -552,101 +555,100 @@ void UniversalSwitchSettingsPage::feedbackVoiceCb(void *data, Evas_Object *obj,
 	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
-	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::LIST_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_VOICE"));
-	SetValuePage::setSwitch(self->context_, self->context_->us_configuration.feedback_voice_state);
-	SetValuePage::setDescription(self->context_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_FEEDBACK_VOICE"));
-	SetValuePage::addSwitchChangedCb(self->context_, feedbackVoiceSwitchChangedCb, self);
-	int vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_VOICE_STATE, SetValuePage::syncPageWithVconf, self->context_);
+	self->nestedSetValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::LIST_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_VOICE"));
+	self->nestedSetValuePage_->setSwitch(self->context_->us_configuration.feedback_voice_state);
+	self->nestedSetValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_FEEDBACK_VOICE"));
+	self->nestedSetValuePage_->addSwitchChangedCb([self](auto state) {
+		self->feedbackVoiceSwitchChangedCb(state);
+	});;
+	int vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_VOICE_STATE, SetValuePage::syncPageWithVconf, self->nestedSetValuePage_.get());
 	if (vconf_ret)
 		SETTING_TRACE_ERROR("FAIL: vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_VOICE_STATE)");
 
 	std::string str = std::to_string(self->context_->us_configuration.feedback_voice_speech_rate) + "%";
-	self->universal_switch_feedback_voice_speech_rate = SetValuePage::addRadioListItem(self->context_,
-			_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_VOICE_SPEECH_RATE"), str.c_str(), static_cast<int>(VoiceFeedbackAttribute::SPEECH_RATE));
+	self->universal_switch_feedback_voice_speech_rate = self->nestedSetValuePage_->addRadioListItem(
+				_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_VOICE_SPEECH_RATE"), str.c_str(), static_cast<int>(VoiceFeedbackAttribute::SPEECH_RATE));
 
 	str = std::to_string(self->context_->us_configuration.feedback_voice_speech_volume) + "%";
-	self->universal_switch_feedback_voice_speech_volume = SetValuePage::addRadioListItem(self->context_,
-			_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_VOICE_SPEECH_VOLUME"), str.c_str(), static_cast<int>(VoiceFeedbackAttribute::VOLUME));
+	self->universal_switch_feedback_voice_speech_volume = self->nestedSetValuePage_->addRadioListItem(
+				_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_VOICE_SPEECH_VOLUME"), str.c_str(), static_cast<int>(VoiceFeedbackAttribute::VOLUME));
 
-	SetValuePage::addListItemOptionsRequestCb(self->context_, feedbackVoiceItemOptionsRequestCb, self);
+	self->nestedSetValuePage_->addListItemOptionsRequestCb([self](auto val) {
+		self->feedbackVoiceItemOptionsRequestCb(val);
+	});
 }
 
-void UniversalSwitchSettingsPage::feedbackVoiceItemOptionsRequestCb(void *data, int option_id)
+void UniversalSwitchSettingsPage::feedbackVoiceItemOptionsRequestCb(int option_id)
 {
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
 	char *page_title = NULL;
 	int sel_value = 0;
 	auto feedbackType = static_cast<VoiceFeedbackAttribute>(option_id);
-	changeRadioItemCb cb;
 	if (feedbackType == VoiceFeedbackAttribute::SPEECH_RATE) {
 		page_title = _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_VOICE_SPEECH_RATE");
-		sel_value = self->context_->us_configuration.feedback_voice_speech_rate;
-		cb = feedbackVoiceSpeechRateChangedCb;
+		sel_value = context_->us_configuration.feedback_voice_speech_rate;
+		setValuePage_ = std::make_unique<SetValuePage>(context_, ValueEditorType::RADIOS, page_title);
+		setValuePage_->addRadioItemChangedCb([this](auto val) {
+			this->feedbackVoiceSpeechRateChangedCb(val);
+		});
 	} else if (feedbackType == VoiceFeedbackAttribute::VOLUME) {
 		page_title = _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_VOICE_SPEECH_VOLUME");
-		sel_value = self->context_->us_configuration.feedback_voice_speech_volume;
-		cb = feedbackVoiceSpeechVolumeChangedCb;
+		sel_value = context_->us_configuration.feedback_voice_speech_volume;
+		setValuePage_ = std::make_unique<SetValuePage>(context_, ValueEditorType::RADIOS, page_title);
+		setValuePage_->addRadioItemChangedCb([this](auto val) {
+			this->feedbackVoiceSpeechVolumeChangedCb(val);
+		});
 	} else {
 		SETTING_TRACE_END;
 		return;
 	}
 
-	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::RADIOS, page_title);
-	SetValuePage::addRadioItemChangedCb(self->context_, cb, self);
-	elm_naviframe_item_pop_cb_set(elm_naviframe_top_item_get(self->context_->md.getNaviframe()->getObject()), NULL, NULL);
+	elm_naviframe_item_pop_cb_set(elm_naviframe_top_item_get(context_->md.getNaviframe()->getObject()), NULL, NULL);
 
 	int i;
 	for (i = 0; i < MEDIA_LEVEL_COUNT; i++)
-		SetValuePage::addRadioItem(self->context_, _media_level[i].key, i, _media_level[i].id == sel_value);
+		setValuePage_->addRadioItem(_media_level[i].key, i, _media_level[i].id == sel_value);
 }
 
-void UniversalSwitchSettingsPage::feedbackVoiceSpeechVolumeChangedCb(void *data, int item_id)
+void UniversalSwitchSettingsPage::feedbackVoiceSpeechVolumeChangedCb(int item_id)
 {
-	retm_if(data == NULL, "Data argument is NULL");
 	retm_if(item_id < 0 || item_id >= MEDIA_LEVEL_COUNT, "Invalid item_id");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 
-	self->context_->us_configuration.feedback_voice_speech_volume = _media_level[item_id].id;
+	context_->us_configuration.feedback_voice_speech_volume = _media_level[item_id].id;
 	double media_level = _media_level[item_id].id / 100.0;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_VOICE_SPEECH_VOLUME, NULL, NULL, &media_level);
 
-	self->universal_switch_feedback_voice_speech_volume->sub_desc = _media_level[item_id].key ? _media_level[item_id].key : std::string{};
-	elm_genlist_item_update(self->universal_switch_feedback_voice_speech_volume->item);
+	universal_switch_feedback_voice_speech_volume->sub_desc = _media_level[item_id].key ? _media_level[item_id].key : std::string{};
+	elm_genlist_item_update(universal_switch_feedback_voice_speech_volume->item);
 }
 
-void UniversalSwitchSettingsPage::feedbackVoiceSpeechRateChangedCb(void *data, int item_id)
+void UniversalSwitchSettingsPage::feedbackVoiceSpeechRateChangedCb(int item_id)
 {
-	retm_if(data == NULL, "Data argument is NULL");
 	retm_if(item_id < 0 || item_id >= MEDIA_LEVEL_COUNT, "Invalid item_id");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 
-	self->context_->us_configuration.feedback_voice_speech_rate = _media_level[item_id].id;
+	context_->us_configuration.feedback_voice_speech_rate = _media_level[item_id].id;
 	double media_level = _media_level[item_id].id / 100.0;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_VOICE_SPEECH_RATE, NULL, NULL, &media_level);
 
-	self->universal_switch_feedback_voice_speech_rate->sub_desc = _media_level[item_id].key ? _media_level[item_id].key : std::string{};
-	elm_genlist_item_update(self->universal_switch_feedback_voice_speech_rate->item);
+	universal_switch_feedback_voice_speech_rate->sub_desc = _media_level[item_id].key ? _media_level[item_id].key : std::string{};
+	elm_genlist_item_update(universal_switch_feedback_voice_speech_rate->item);
 }
 
-void UniversalSwitchSettingsPage::feedbackVoiceSwitchChangedCb(void *data, bool state)
+void UniversalSwitchSettingsPage::feedbackVoiceSwitchChangedCb(bool state)
 {
 	const char *str = NULL;
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 
-	self->context_->us_configuration.feedback_voice_state = state;
+	context_->us_configuration.feedback_voice_state = state;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_VOICE_STATE, &state, NULL, NULL);
 
-	if (self->context_->us_configuration.feedback_voice_state)
+	if (context_->us_configuration.feedback_voice_state)
 		str = _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_ON");
 	else
 		str = _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 
-	self->universal_switch_feedback_voice->chk_status = state;
-	elm_check_state_set(self->universal_switch_feedback_voice->eo_check, state);
-	self->universal_switch_feedback_voice->sub_desc = str ? str : std::string{};
-	elm_genlist_item_update(self->universal_switch_feedback_voice->item);
+	universal_switch_feedback_voice->chk_status = state;
+	elm_check_state_set(universal_switch_feedback_voice->eo_check, state);
+	universal_switch_feedback_voice->sub_desc = str ? str : std::string{};
+	elm_genlist_item_update(universal_switch_feedback_voice->item);
 }
 
 void UniversalSwitchSettingsPage::feedbackVoiceCheckboxCb(void *data, Evas_Object *obj, void *event_info)
@@ -676,62 +678,62 @@ void UniversalSwitchSettingsPage::feedbackSoundCb(void *data, Evas_Object *obj,
 
 	std::string str = std::to_string(self->context_->us_configuration.feedback_sound_volume) + "%";
 
-	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::LIST_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND"));
-	SetValuePage::setSwitch(self->context_, self->context_->us_configuration.feedback_sound_state);
-	SetValuePage::setDescription(self->context_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_FEEDBACK_SOUND"));
-	SetValuePage::addSwitchChangedCb(self->context_, feedbackSoundSwitchChangedCb, self);
-	self->universal_switch_feedback_sound_volume = SetValuePage::addRadioListItem(self->context_,
-			_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND_VOLUME"), str.c_str(), 0);
-	SetValuePage::addListItemOptionsRequestCb(self->context_, feedbackSoundItemOptionsRequestCb, self);
-	int vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_SOUND_STATE, SetValuePage::syncPageWithVconf, self->context_);
+	self->nestedSetValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::LIST_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND"));
+	self->nestedSetValuePage_->setSwitch(self->context_->us_configuration.feedback_sound_state);
+	self->nestedSetValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_FEEDBACK_SOUND"));
+	self->nestedSetValuePage_->addSwitchChangedCb([self](auto state) {
+		self->feedbackSoundSwitchChangedCb(state);
+	});
+	self->universal_switch_feedback_sound_volume = self->nestedSetValuePage_->addRadioListItem(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND_VOLUME"), str.c_str(), 0);
+	self->nestedSetValuePage_->addListItemOptionsRequestCb([self](auto val) {
+		self->feedbackSoundItemOptionsRequestCb(val);
+	});
+	int vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_SOUND_STATE, SetValuePage::syncPageWithVconf, self->nestedSetValuePage_.get());
 	if (vconf_ret)
 		SETTING_TRACE_ERROR("FAIL: vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_SOUND_STATE)");
 }
 
-void UniversalSwitchSettingsPage::feedbackSoundItemOptionsRequestCb(void *data, int option_id)
+void UniversalSwitchSettingsPage::feedbackSoundItemOptionsRequestCb(int option_id)
 {
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::RADIOS, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND_VOLUME"));
-	SetValuePage::addRadioItemChangedCb(self->context_, feedbackSoundVolumeChangedCb, self);
-	elm_naviframe_item_pop_cb_set(elm_naviframe_top_item_get(self->context_->md.getNaviframe()->getObject()), NULL, NULL);
+	setValuePage_ = std::make_unique<SetValuePage>(context_, ValueEditorType::RADIOS, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_SOUND_VOLUME"));
+	setValuePage_->addRadioItemChangedCb([this](auto val) {
+		this->feedbackSoundVolumeChangedCb(val);
+	});
+	elm_naviframe_item_pop_cb_set(elm_naviframe_top_item_get(context_->md.getNaviframe()->getObject()), NULL, NULL);
 
 	int i;
 	for (i = 0; i < MEDIA_LEVEL_COUNT; i++)
-		SetValuePage::addRadioItem(self->context_, _media_level[i].key, i, _media_level[i].id == self->context_->us_configuration.feedback_sound_volume);
+		setValuePage_->addRadioItem(_media_level[i].key, i, _media_level[i].id == context_->us_configuration.feedback_sound_volume);
 }
 
-void UniversalSwitchSettingsPage::feedbackSoundVolumeChangedCb(void *data, int item_id)
+void UniversalSwitchSettingsPage::feedbackSoundVolumeChangedCb(int item_id)
 {
-	retm_if(data == NULL, "Data argument is NULL");
 	retm_if(item_id < 0 || item_id >= MEDIA_LEVEL_COUNT, "Invalid item_id");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 
-	self->context_->us_configuration.feedback_sound_volume = _media_level[item_id].id;
+	context_->us_configuration.feedback_sound_volume = _media_level[item_id].id;
 	double media_level = _media_level[item_id].id / 100.0;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_SOUND_VOLUME, NULL, NULL, &media_level);
 
-	self->universal_switch_feedback_sound_volume->sub_desc = _media_level[item_id].key ? _media_level[item_id].key : std::string{};
-	elm_genlist_item_update(self->universal_switch_feedback_sound_volume->item);
+	universal_switch_feedback_sound_volume->sub_desc = _media_level[item_id].key ? _media_level[item_id].key : std::string{};
+	elm_genlist_item_update(universal_switch_feedback_sound_volume->item);
 }
 
-void UniversalSwitchSettingsPage::feedbackSoundSwitchChangedCb(void *data, bool state)
+void UniversalSwitchSettingsPage::feedbackSoundSwitchChangedCb(bool state)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 	const char *str = NULL;
 
-	self->context_->us_configuration.feedback_sound_state = state;
+	context_->us_configuration.feedback_sound_state = state;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_SOUND_STATE, &state, NULL, NULL);
 
-	if (self->context_->us_configuration.feedback_sound_state)
+	if (context_->us_configuration.feedback_sound_state)
 		str = _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_ON");
 	else
 		str = _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 
-	self->universal_switch_feedback_sound->chk_status = state;
-	elm_check_state_set(self->universal_switch_feedback_sound->eo_check, state);
-	self->universal_switch_feedback_sound->sub_desc = str ? str : std::string{};
-	elm_genlist_item_update(self->universal_switch_feedback_sound->item);
+	universal_switch_feedback_sound->chk_status = state;
+	elm_check_state_set(universal_switch_feedback_sound->eo_check, state);
+	universal_switch_feedback_sound->sub_desc = str ? str : std::string{};
+	elm_genlist_item_update(universal_switch_feedback_sound->item);
 }
 
 void UniversalSwitchSettingsPage::feedbackSoundCheckboxCb(void *data, Evas_Object *obj, void *event_info)
@@ -760,24 +762,24 @@ void UniversalSwitchSettingsPage::cursorColorCb(void *data, Evas_Object *obj, vo
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::RADIOS, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_CURSOR_CL"));
-	SetValuePage::addRadioItemChangedCb(self->context_, cursorColorListItemChangedCb, self);
+	self->setValuePage_->addRadioItemChangedCb([self](auto val) {
+		self->cursorColorListItemChangedCb(val);
+	});
 	elm_naviframe_item_pop_cb_set(elm_naviframe_top_item_get(self->context_->md.getNaviframe()->getObject()), NULL, NULL);
 
 	for (auto i = 0u; i < CURSOR_COLORS_COUNT; i++)
-		SetValuePage::addRadioItem(self->context_, _cursor_color[i].key, i, _cursor_color[i].id == self->context_->us_configuration.cursor_color);
+		self->setValuePage_->addRadioItem(_cursor_color[i].key, i, _cursor_color[i].id == self->context_->us_configuration.cursor_color);
 }
 
-void UniversalSwitchSettingsPage::cursorColorListItemChangedCb(void *data, int item_id)
+void UniversalSwitchSettingsPage::cursorColorListItemChangedCb(int item_id)
 {
-	retm_if(data == NULL, "Data argument is NULL");
 	retm_if(item_id < 0 || item_id >= CURSOR_COLORS_COUNT, "Invalid cursor color id");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 
-	self->context_->us_configuration.cursor_color = _cursor_color[item_id].id;
-	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_CURSOR_COLOR, NULL, &self->context_->us_configuration.cursor_color, NULL);
+	context_->us_configuration.cursor_color = _cursor_color[item_id].id;
+	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_CURSOR_COLOR, NULL, &context_->us_configuration.cursor_color, NULL);
 
-	self->universal_switch_feedback_cursor_cl->sub_desc = _cursor_color[item_id].key ? _cursor_color[item_id].key : std::string{};
-	elm_genlist_item_update(self->universal_switch_feedback_cursor_cl->item);
+	universal_switch_feedback_cursor_cl->sub_desc = _cursor_color[item_id].key ? _cursor_color[item_id].key : std::string{};
+	elm_genlist_item_update(universal_switch_feedback_cursor_cl->item);
 }
 
 void UniversalSwitchSettingsPage::autoTapKbdCheckboxCb(void *data, Evas_Object *obj, void *event_info)
@@ -799,27 +801,28 @@ void UniversalSwitchSettingsPage::autoMoveIntervalCb(void *data, Evas_Object *ob
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_AUTO_MOVE_INT"));
-	SetValuePage::setSwitch(self->context_, self->context_->us_configuration.auto_move_int_state);
-	SetValuePage::addValueChangedCb(self->context_, autoMoveIntervalValueChangedCb, self);
-	SetValuePage::addSwitchChangedCb(self->context_, autoMoveIntervalSwitchChangedCb, self);
-	SetValuePage::setDescription(self->context_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_MOVE_INT"));
-	SetValuePage::setRange(self->context_, RANGE_MIN_AUTO_MOVE_INT, RANGE_MAX_AUTO_MOVE_INT, STEP_AUTO_MOVE_INT);
-	SetValuePage::setValue(self->context_, self->context_->us_configuration.auto_move_int_value, "seconds");
+	self->setValuePage_->setSwitch(self->context_->us_configuration.auto_move_int_state);
+	self->setValuePage_->addValueChangedCb([self](auto val) {
+		self->autoMoveIntervalValueChangedCb(val);
+	});
+	self->setValuePage_->addSwitchChangedCb([self](auto state) {
+		self->autoMoveIntervalSwitchChangedCb(state);
+	});
+	self->setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_MOVE_INT"));
+	self->setValuePage_->setRange(RANGE_MIN_AUTO_MOVE_INT, RANGE_MAX_AUTO_MOVE_INT, STEP_AUTO_MOVE_INT);
+	self->setValuePage_->setValue(self->context_->us_configuration.auto_move_int_value, "seconds");
 }
 
-void UniversalSwitchSettingsPage::autoMoveIntervalSwitchChangedCb(void *data, bool state)
+void UniversalSwitchSettingsPage::autoMoveIntervalSwitchChangedCb(bool state)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.auto_move_int_state = state;
+	context_->us_configuration.auto_move_int_state = state;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_MOVE_INT_STATE, &state, NULL, NULL);
 
-	self->universal_switch_auto_move_int->chk_status = state;
-	elm_check_state_set(self->universal_switch_auto_move_int->eo_check, state);
-	self->universal_switch_auto_move_int->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.auto_move_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.auto_move_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_auto_move_int->item);
+	universal_switch_auto_move_int->chk_status = state;
+	elm_check_state_set(universal_switch_auto_move_int->eo_check, state);
+	universal_switch_auto_move_int->sub_desc = getValueUnitText(NULL, &context_->us_configuration.auto_move_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+			!context_->us_configuration.auto_move_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_auto_move_int->item);
 }
 
 void UniversalSwitchSettingsPage::autoTapCb(void *data, Evas_Object *obj, void *event_info)
@@ -828,40 +831,35 @@ void UniversalSwitchSettingsPage::autoTapCb(void *data, Evas_Object *obj, void *
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_AUTO_TAP"));
-	SetValuePage::setSwitch(self->context_, self->context_->us_configuration.auto_tap_state);
-	SetValuePage::addValueChangedCb(self->context_, autoTapValueChangedCb, self);
-	SetValuePage::addSwitchChangedCb(self->context_, autoTapSwitchChangedCb, self);
-	SetValuePage::setDescription(self->context_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_TAP"));
-	SetValuePage::setRange(self->context_, RANGE_MIN_AUTO_TAP, RANGE_MAX_AUTO_TAP, STEP_AUTO_TAP);
-	SetValuePage::setValue(self->context_, self->context_->us_configuration.auto_tap_value, "seconds");
+	self->setValuePage_->setSwitch(self->context_->us_configuration.auto_tap_state);
+	self->setValuePage_->addValueChangedCb([self](auto val) {
+		self->autoTapValueChangedCb(val);
+	});
+	self->setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_TAP"));
+	self->setValuePage_->setRange(RANGE_MIN_AUTO_TAP, RANGE_MAX_AUTO_TAP, STEP_AUTO_TAP);
+	self->setValuePage_->setValue(self->context_->us_configuration.auto_tap_value, "seconds");
 }
 
-void UniversalSwitchSettingsPage::autoTapSwitchChangedCb(void *data, bool state)
+void UniversalSwitchSettingsPage::autoTapSwitchChangedCb(bool state)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.auto_tap_state = state;
+	context_->us_configuration.auto_tap_state = state;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_TAP_STATE, &state, NULL, NULL);
 
-	self->universal_switch_auto_tap->chk_status = state;
-	elm_check_state_set(self->universal_switch_auto_tap->eo_check, state);
-	self->universal_switch_auto_tap->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.auto_tap_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.auto_tap_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_auto_tap->item);
+	universal_switch_auto_tap->chk_status = state;
+	elm_check_state_set(universal_switch_auto_tap->eo_check, state);
+	universal_switch_auto_tap->sub_desc = getValueUnitText(NULL, &context_->us_configuration.auto_tap_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+										  !context_->us_configuration.auto_tap_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_auto_tap->item);
 }
 
-void UniversalSwitchSettingsPage::autoTapValueChangedCb(void *data, double value)
+void UniversalSwitchSettingsPage::autoTapValueChangedCb(double value)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.auto_tap_value = value;
+	context_->us_configuration.auto_tap_value = value;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_TAP_VALUE, NULL, NULL, &value);
 
-	self->universal_switch_auto_tap->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.auto_tap_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.auto_tap_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_auto_tap->item);
+	universal_switch_auto_tap->sub_desc = getValueUnitText(NULL, &context_->us_configuration.auto_tap_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+										  !context_->us_configuration.auto_tap_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_auto_tap->item);
 }
 
 void UniversalSwitchSettingsPage::autoTapCheckboxCb(void *data, Evas_Object *obj, void *event_info)
@@ -886,40 +884,38 @@ void UniversalSwitchSettingsPage::sglInactionIntervalCb(void *data, Evas_Object
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_SGL_IACTION_INT"));
-	SetValuePage::setSwitch(self->context_, self->context_->us_configuration.sgl_iaction_int_state);
-	SetValuePage::addValueChangedCb(self->context_, sglInactionIntervalValueChangedCb, self);
-	SetValuePage::addSwitchChangedCb(self->context_, sglInactionIntervalSwitchChangedCb, self);
-	SetValuePage::setDescription(self->context_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_SGL_IACTION_INT"));
-	SetValuePage::setRange(self->context_, RANGE_MIN_SGL_IACTION_INT, RANGE_MAX_SGL_IACTION_INT, STEP_SGL_IACTION_INT);
-	SetValuePage::setValue(self->context_, self->context_->us_configuration.sgl_iaction_int_value, "seconds");
+	self->setValuePage_->setSwitch(self->context_->us_configuration.sgl_iaction_int_state);
+	self->setValuePage_->addValueChangedCb([self](auto val) {
+		self->sglInactionIntervalValueChangedCb(val);
+	});
+	self->setValuePage_->addSwitchChangedCb([self](auto state) {
+		self->sglInactionIntervalSwitchChangedCb(state);
+	});
+	self->setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_SGL_IACTION_INT"));
+	self->setValuePage_->setRange(RANGE_MIN_SGL_IACTION_INT, RANGE_MAX_SGL_IACTION_INT, STEP_SGL_IACTION_INT);
+	self->setValuePage_->setValue(self->context_->us_configuration.sgl_iaction_int_value, "seconds");
 }
 
-void UniversalSwitchSettingsPage::sglInactionIntervalSwitchChangedCb(void *data, bool state)
+void UniversalSwitchSettingsPage::sglInactionIntervalSwitchChangedCb(bool state)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.sgl_iaction_int_state = state;
+	context_->us_configuration.sgl_iaction_int_state = state;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SGL_IACTION_INT_STATE, &state, NULL, NULL);
 
-	self->universal_switch_sgl_iaction_int->chk_status = state;
-	elm_check_state_set(self->universal_switch_sgl_iaction_int->eo_check, state);
-	self->universal_switch_sgl_iaction_int->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.sgl_iaction_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.sgl_iaction_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_sgl_iaction_int->item);
+	universal_switch_sgl_iaction_int->chk_status = state;
+	elm_check_state_set(universal_switch_sgl_iaction_int->eo_check, state);
+	universal_switch_sgl_iaction_int->sub_desc = getValueUnitText(NULL, &context_->us_configuration.sgl_iaction_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+			!context_->us_configuration.sgl_iaction_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_sgl_iaction_int->item);
 }
 
-void UniversalSwitchSettingsPage::sglInactionIntervalValueChangedCb(void *data, double value)
+void UniversalSwitchSettingsPage::sglInactionIntervalValueChangedCb(double value)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.sgl_iaction_int_value = value;
+	context_->us_configuration.sgl_iaction_int_value = value;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SGL_IACTION_INT_VALUE, NULL, NULL, &value);
 
-	self->universal_switch_sgl_iaction_int->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.sgl_iaction_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.sgl_iaction_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_sgl_iaction_int->item);
+	universal_switch_sgl_iaction_int->sub_desc = getValueUnitText(NULL, &context_->us_configuration.sgl_iaction_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+			!context_->us_configuration.sgl_iaction_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_sgl_iaction_int->item);
 }
 
 void UniversalSwitchSettingsPage::sglInactionIntervalCheckboxCb(void *data, Evas_Object *obj, void *event_info)
@@ -944,40 +940,38 @@ void UniversalSwitchSettingsPage::tapDurationCb(void *data, Evas_Object *obj, vo
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_TAP_DURATION"));
-	SetValuePage::setSwitch(self->context_, self->context_->us_configuration.tap_duration_state);
-	SetValuePage::addValueChangedCb(self->context_, tapDurationValueChangedCb, self);
-	SetValuePage::addSwitchChangedCb(self->context_, tapDurationSwitchChangedCb, self);
-	SetValuePage::setDescription(self->context_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_TAP_DURATION"));
-	SetValuePage::setRange(self->context_, RANGE_MIN_TAP_DURATION, RANGE_MAX_TAP_DURATION, STEP_TAP_DURATION);
-	SetValuePage::setValue(self->context_, self->context_->us_configuration.tap_duration_value, "seconds");
+	self->setValuePage_->setSwitch(self->context_->us_configuration.tap_duration_state);
+	self->setValuePage_->addValueChangedCb([self](auto val) {
+		self->tapDurationValueChangedCb(val);
+	});
+	self->setValuePage_->addSwitchChangedCb([self](auto state) {
+		self->tapDurationSwitchChangedCb(state);
+	});
+	self->setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_TAP_DURATION"));
+	self->setValuePage_->setRange(RANGE_MIN_TAP_DURATION, RANGE_MAX_TAP_DURATION, STEP_TAP_DURATION);
+	self->setValuePage_->setValue(self->context_->us_configuration.tap_duration_value, "seconds");
 }
 
-void UniversalSwitchSettingsPage::tapDurationSwitchChangedCb(void *data, bool state)
+void UniversalSwitchSettingsPage::tapDurationSwitchChangedCb(bool state)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.tap_duration_state = state;
+	context_->us_configuration.tap_duration_state = state;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_TAP_DURATION_STATE, &state, NULL, NULL);
 
-	self->universal_switch_tap_duration->chk_status = state;
-	elm_check_state_set(self->universal_switch_tap_duration->eo_check, state);
-	self->universal_switch_tap_duration->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.tap_duration_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.tap_duration_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_tap_duration->item);
+	universal_switch_tap_duration->chk_status = state;
+	elm_check_state_set(universal_switch_tap_duration->eo_check, state);
+	universal_switch_tap_duration->sub_desc = getValueUnitText(NULL, &context_->us_configuration.tap_duration_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+			!context_->us_configuration.tap_duration_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_tap_duration->item);
 }
 
-void UniversalSwitchSettingsPage::tapDurationValueChangedCb(void *data, double value)
+void UniversalSwitchSettingsPage::tapDurationValueChangedCb(double value)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.tap_duration_value = value;
+	context_->us_configuration.tap_duration_value = value;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_TAP_DURATION_VALUE, NULL, NULL, &value);
 
-	self->universal_switch_tap_duration->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.tap_duration_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.tap_duration_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_tap_duration->item);
+	universal_switch_tap_duration->sub_desc = getValueUnitText(NULL, &context_->us_configuration.tap_duration_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+			!context_->us_configuration.tap_duration_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_tap_duration->item);
 }
 
 void UniversalSwitchSettingsPage::tapDurationCheckboxCb(void *data, Evas_Object *obj, void *event_info)
@@ -1009,40 +1003,38 @@ void UniversalSwitchSettingsPage::pauseOnFirstCb(void *data, Evas_Object *obj, v
 	}
 
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::NUMERIC_SWITCH, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_PAUSE_ON_FIRST"));
-	SetValuePage::setSwitch(self->context_, self->context_->us_configuration.pause_on_first_state);
-	SetValuePage::addValueChangedCb(self->context_, pauseOnFirstValueChangedCb, self);
-	SetValuePage::addSwitchChangedCb(self->context_, pauseOnFirstSwitchChangedCb, self);
-	SetValuePage::setDescription(self->context_, str);
-	SetValuePage::setRange(self->context_, RANGE_MIN_PAUSE_ON_FIRST, RANGE_MAX_PAUSE_ON_FIRST, STEP_PAUSE_ON_FIRST);
-	SetValuePage::setValue(self->context_, self->context_->us_configuration.pause_on_first_value, "seconds");
+	self->setValuePage_->setSwitch(self->context_->us_configuration.pause_on_first_state);
+	self->setValuePage_->addValueChangedCb([self](auto val) {
+		self->pauseOnFirstValueChangedCb(val);
+	});
+	self->setValuePage_->addSwitchChangedCb([self](auto state) {
+		self->pauseOnFirstSwitchChangedCb(state);
+	});
+	self->setValuePage_->setDescription(str);
+	self->setValuePage_->setRange(RANGE_MIN_PAUSE_ON_FIRST, RANGE_MAX_PAUSE_ON_FIRST, STEP_PAUSE_ON_FIRST);
+	self->setValuePage_->setValue(self->context_->us_configuration.pause_on_first_value, "seconds");
 }
 
-void UniversalSwitchSettingsPage::pauseOnFirstSwitchChangedCb(void *data, bool state)
+void UniversalSwitchSettingsPage::pauseOnFirstSwitchChangedCb(bool state)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.pause_on_first_state = state;
+	context_->us_configuration.pause_on_first_state = state;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_PAUSE_ON_FIRST_STATE, &state, NULL, NULL);
 
-	self->universal_switch_pause_on_first->chk_status = state;
-	elm_check_state_set(self->universal_switch_pause_on_first->eo_check, state);
-	self->universal_switch_pause_on_first->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.pause_on_first_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.pause_on_first_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_pause_on_first->item);
+	universal_switch_pause_on_first->chk_status = state;
+	elm_check_state_set(universal_switch_pause_on_first->eo_check, state);
+	universal_switch_pause_on_first->sub_desc = getValueUnitText(NULL, &context_->us_configuration.pause_on_first_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+			!context_->us_configuration.pause_on_first_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_pause_on_first->item);
 }
 
-void UniversalSwitchSettingsPage::pauseOnFirstValueChangedCb(void *data, double value)
+void UniversalSwitchSettingsPage::pauseOnFirstValueChangedCb(double value)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.pause_on_first_value = value;
+	context_->us_configuration.pause_on_first_value = value;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_PAUSE_ON_FIRST_VALUE, NULL, NULL, &value);
 
-	self->universal_switch_pause_on_first->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.pause_on_first_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.pause_on_first_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_pause_on_first->item);
+	universal_switch_pause_on_first->sub_desc = getValueUnitText(NULL, &context_->us_configuration.pause_on_first_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+			!context_->us_configuration.pause_on_first_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_pause_on_first->item);
 }
 
 void UniversalSwitchSettingsPage::pauseOnFirstCheckboxCb(void *data, Evas_Object *obj, void *event_info)
@@ -1067,23 +1059,23 @@ void UniversalSwitchSettingsPage::scanSpeedCb(void *data, Evas_Object *obj, void
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::NUMERIC, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_PT_SPEED"));
-	SetValuePage::addValueChangedCb(self->context_, scanSpeedChangedCb, self);
-	SetValuePage::setDescription(self->context_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_SCAN_SPEED"));
-	SetValuePage::setRange(self->context_, RANGE_MIN_SCAN_SPEED, RANGE_MAX_SCAN_SPEED, STEP_SCAN_SPEED);
-	SetValuePage::setValue(self->context_, self->context_->us_configuration.scan_pt_speed, "");
+	self->setValuePage_->addValueChangedCb([self](auto val) {
+		self->scanSpeedChangedCb(val);
+	});
+	self->setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_SCAN_SPEED"));
+	self->setValuePage_->setRange(RANGE_MIN_SCAN_SPEED, RANGE_MAX_SCAN_SPEED, STEP_SCAN_SPEED);
+	self->setValuePage_->setValue(self->context_->us_configuration.scan_pt_speed, "");
 }
 
-void UniversalSwitchSettingsPage::scanSpeedChangedCb(void *data, double value)
+void UniversalSwitchSettingsPage::scanSpeedChangedCb(double value)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 	int int_value = (int)value;
 
-	self->context_->us_configuration.scan_pt_speed = (int)value;
+	context_->us_configuration.scan_pt_speed = (int)value;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_SCAN_PT_SPEED, NULL, &int_value, NULL);
 
-	self->universal_switch_scan_speed->sub_desc = getValueUnitText(&int_value, NULL, NULL, false, NULL);
-	elm_genlist_item_update(self->universal_switch_scan_speed->item);
+	universal_switch_scan_speed->sub_desc = getValueUnitText(&int_value, NULL, NULL, false, NULL);
+	elm_genlist_item_update(universal_switch_scan_speed->item);
 }
 
 void UniversalSwitchSettingsPage::scanDirectionCb(void *data, Evas_Object *obj, void *event_info)
@@ -1184,23 +1176,23 @@ void UniversalSwitchSettingsPage::scanNumberCb(void *data, Evas_Object *obj, voi
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::NUMERIC, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_NUM_OF_SCANS"));
-	SetValuePage::addValueChangedCb(self->context_, scanNumberChangedCb, self);
-	SetValuePage::setDescription(self->context_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_NUM_OF_SCANS"));
-	SetValuePage::setRange(self->context_, RANGE_MIN_SCANS_NUM, RANGE_MAX_SCANS_NUM, STEP_SCANS_NUM);
-	SetValuePage::setValue(self->context_, self->context_->us_configuration.auto_scan_num, "times");
+	self->setValuePage_->addValueChangedCb([self](auto val) {
+		self->scanNumberChangedCb(val);
+	});
+	self->setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_NUM_OF_SCANS"));
+	self->setValuePage_->setRange(RANGE_MIN_SCANS_NUM, RANGE_MAX_SCANS_NUM, STEP_SCANS_NUM);
+	self->setValuePage_->setValue(self->context_->us_configuration.auto_scan_num, "times");
 }
 
-void UniversalSwitchSettingsPage::scanNumberChangedCb(void *data, double value)
+void UniversalSwitchSettingsPage::scanNumberChangedCb(double value)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
 	int int_value = (int)value;
 
-	self->context_->us_configuration.auto_scan_num = (int)value;
+	context_->us_configuration.auto_scan_num = (int)value;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_NUM_OF_SCANS, NULL, &int_value, NULL);
 
-	self->universal_switch_scans_num->sub_desc = getValueUnitText(&int_value, NULL, NULL, false, NULL);
-	elm_genlist_item_update(self->universal_switch_scans_num->item);
+	universal_switch_scans_num->sub_desc = getValueUnitText(&int_value, NULL, NULL, false, NULL);
+	elm_genlist_item_update(universal_switch_scans_num->item);
 }
 
 void UniversalSwitchSettingsPage::autoScanIntervalCb(void *data, Evas_Object *obj, void *event_info)
@@ -1209,22 +1201,21 @@ void UniversalSwitchSettingsPage::autoScanIntervalCb(void *data, Evas_Object *ob
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
 
 	self->setValuePage_ = std::make_unique<SetValuePage>(self->context_, ValueEditorType::NUMERIC, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_AUTO_SCAN_INT"));
-	SetValuePage::addValueChangedCb(self->context_, autoScanIntervalChangedCb, self);
-	SetValuePage::setDescription(self->context_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_SCAN_INT"));
-	SetValuePage::setRange(self->context_, RANGE_MIN_AUTO_SCAN_INTERVAL, RANGE_MAX_AUTO_SCAN_INTERVAL, STEP_AUTO_SCAN_INTERVAL);
-	SetValuePage::setValue(self->context_, self->context_->us_configuration.auto_scan_interval, "seconds");
+	self->setValuePage_->addValueChangedCb([self](auto val) {
+		self->autoScanIntervalChangedCb(val);
+	});
+	self->setValuePage_->setDescription(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_SCAN_INT"));
+	self->setValuePage_->setRange(RANGE_MIN_AUTO_SCAN_INTERVAL, RANGE_MAX_AUTO_SCAN_INTERVAL, STEP_AUTO_SCAN_INTERVAL);
+	self->setValuePage_->setValue(self->context_->us_configuration.auto_scan_interval, "seconds");
 }
 
-void UniversalSwitchSettingsPage::autoScanIntervalChangedCb(void *data, double value)
+void UniversalSwitchSettingsPage::autoScanIntervalChangedCb(double value)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.auto_scan_interval = value;
+	context_->us_configuration.auto_scan_interval = value;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_SCAN_INT, NULL, NULL, &value);
 
-	self->universal_switch_auto_scan_int->sub_desc = getValueUnitText(NULL, &value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"), false, NULL);
-	elm_genlist_item_update(self->universal_switch_auto_scan_int->item);
+	universal_switch_auto_scan_int->sub_desc = getValueUnitText(NULL, &value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"), false, NULL);
+	elm_genlist_item_update(universal_switch_auto_scan_int->item);
 }
 
 void UniversalSwitchSettingsPage::autoScanCheckboxCb(void *data, Evas_Object *obj, void *event_info)
@@ -1323,17 +1314,14 @@ void UniversalSwitchSettingsPage::autoMoveIntervalCheckboxCb(void *data, Evas_Ob
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_MOVE_INT_STATE, (bool *)&list_item->chk_status, NULL, NULL);
 }
 
-void UniversalSwitchSettingsPage::autoMoveIntervalValueChangedCb(void *data, double value)
+void UniversalSwitchSettingsPage::autoMoveIntervalValueChangedCb(double value)
 {
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<UniversalSwitchSettingsPage *>(data);
-
-	self->context_->us_configuration.auto_move_int_value = value;
+	context_->us_configuration.auto_move_int_value = value;
 	updateVconfValue(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_AUTO_MOVE_INT_VALUE, NULL, NULL, &value);
 
-	self->universal_switch_auto_move_int->sub_desc = getValueUnitText(NULL, &self->context_->us_configuration.auto_move_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
-			!self->context_->us_configuration.auto_move_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
-	elm_genlist_item_update(self->universal_switch_auto_move_int->item);
+	universal_switch_auto_move_int->sub_desc = getValueUnitText(NULL, &context_->us_configuration.auto_move_int_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
+			!context_->us_configuration.auto_move_int_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
+	elm_genlist_item_update(universal_switch_auto_move_int->item);
 }
 
 void UniversalSwitchSettingsPage::onAutoScanItemSelection(void *data, Evas_Object *obj, void *event_info)
diff --git a/src/UniversalSwitchSettingsPage.hpp b/src/UniversalSwitchSettingsPage.hpp
index 98ec005..4bc326f 100644
--- a/src/UniversalSwitchSettingsPage.hpp
+++ b/src/UniversalSwitchSettingsPage.hpp
@@ -43,7 +43,7 @@ public:
 	UniversalSwitchSettingsPage(SettingAccessibility *ad);
 
 private:
-	void createManageGroup(); //TODO:rename
+	void createManageGroup();
 	void createFeedbackGroup();
 	void createAdditionalSettingsGroup();
 	static void autoTapKBDMenuItemSelected(void *data, Evas_Object *obj, void *event_info);
@@ -67,47 +67,47 @@ private:
 	static void updateSwitchesCount(void *data);
 	static void manageOptionsCb(void *data, Evas_Object *obj, void *event_info);
 	static void manageOptionsItemSelected(void *data, Evas_Object *obj, void *event_info);
-	static void manageOptionsCheckboxCb(SettingAccessibility *ad, size_t item_id, bool state);
+	void manageOptionsCheckboxCb(size_t item_id, bool state);
 	static void feedbackVoiceCb(void *data, Evas_Object *obj, void *event_info);
-	static void feedbackVoiceItemOptionsRequestCb(void *data, int option_id);
-	static void feedbackVoiceSpeechVolumeChangedCb(void *data, int item_id);
-	static void feedbackVoiceSpeechRateChangedCb(void *data, int item_id);
-	static void feedbackVoiceSwitchChangedCb(void *data, bool state);
+	void feedbackVoiceItemOptionsRequestCb(int option_id);
+	void feedbackVoiceSpeechVolumeChangedCb(int item_id);
+	void feedbackVoiceSpeechRateChangedCb(int item_id);
+	void feedbackVoiceSwitchChangedCb(bool state);
 	static void feedbackVoiceCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	static void feedbackSoundCb(void *data, Evas_Object *obj, void *event_info);
-	static void feedbackSoundItemOptionsRequestCb(void *data, int option_id);
-	static void feedbackSoundVolumeChangedCb(void *data, int item_id);
-	static void feedbackSoundSwitchChangedCb(void *data, bool state);
+	void feedbackSoundItemOptionsRequestCb(int option_id);
+	void feedbackSoundVolumeChangedCb(int item_id);
+	void feedbackSoundSwitchChangedCb(bool state);
 	static void feedbackSoundCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	static void cursorColorCb(void *data, Evas_Object *obj, void *event_info);
-	static void cursorColorListItemChangedCb(void *ad, int item_id);
+	void cursorColorListItemChangedCb(int item_id);
 	static void autoTapKbdCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	static void autoMoveIntervalCb(void *data, Evas_Object *obj, void *event_info);
-	static void autoMoveIntervalSwitchChangedCb(void *data, bool state);
+	void autoMoveIntervalSwitchChangedCb(bool state);
 	static void autoTapCb(void *data, Evas_Object *obj, void *event_info);
-	static void autoTapSwitchChangedCb(void *data, bool state);
-	static void autoTapValueChangedCb(void *data, double value);
+	void autoTapSwitchChangedCb(bool state);
+	void autoTapValueChangedCb(double value);
 	static void autoTapCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	static void sglInactionIntervalCb(void *data, Evas_Object *obj, void *event_info);
-	static void sglInactionIntervalSwitchChangedCb(void *data, bool state);
-	static void sglInactionIntervalValueChangedCb(void *data, double value);
+	void sglInactionIntervalSwitchChangedCb(bool state);
+	void sglInactionIntervalValueChangedCb(double value);
 	static void sglInactionIntervalCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	static void tapDurationCb(void *data, Evas_Object *obj, void *event_info);
-	static void tapDurationSwitchChangedCb(void *data, bool state);
-	static void tapDurationValueChangedCb(void *ad, double value);
+	void tapDurationSwitchChangedCb(bool state);
+	void tapDurationValueChangedCb(double value);
 	static void tapDurationCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	static void pauseOnFirstCb(void *data, Evas_Object *obj, void *event_info);
-	static void pauseOnFirstSwitchChangedCb(void *data, bool state);
-	static void pauseOnFirstValueChangedCb(void *data, double value);
+	void pauseOnFirstSwitchChangedCb(bool state);
+	void pauseOnFirstValueChangedCb(double value);
 	static void pauseOnFirstCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	static void scanSpeedCb(void *data, Evas_Object *obj, void *event_info);
-	static void scanSpeedChangedCb(void *data, double value);
+	void scanSpeedChangedCb(double value);
 	static void scanDirectionCb(void *data, Evas_Object *obj, void *event_info);
 	static void scanMethodCb(void *data, Evas_Object *obj, void *event_info);
 	static void scanNumberCb(void *data, Evas_Object *obj, void *event_info);
-	static void scanNumberChangedCb(void *data, double value);
+	void scanNumberChangedCb(double value);
 	static void autoScanIntervalCb(void *data, Evas_Object *obj, void *event_info);
-	static void autoScanIntervalChangedCb(void *data, double value);
+	void autoScanIntervalChangedCb(double value);
 	static void autoScanCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchesClickCb(void *data, Evas_Object *obj, void *event_info);
 	static void ctxPopupDelCb(void *data, Evas_Object *obj, void *event_info);
@@ -118,12 +118,13 @@ private:
 	static void syncAutoScanWithVconf(keynode_t *node, void *user_data);
 	static void syncCheckboxWithVconf(keynode_t *node, void *user_data, SettingCallback cb_func);
 	static void autoMoveIntervalCheckboxCb(void *data, Evas_Object *obj, void *event_info);
-	static void autoMoveIntervalValueChangedCb(void *data, double value);
+	void autoMoveIntervalValueChangedCb(double value);
 
 	SettingAccessibility *context_ = nullptr;
 	Genlist *genlist_ = nullptr;
 	std::unique_ptr<SwitchesPage> switchesPage_;
 	std::unique_ptr<SetValuePage> setValuePage_;
+	std::unique_ptr<SetValuePage> nestedSetValuePage_;
 	GenGroupItemData *universal_switch_scan_dir;
 	GenGroupItemData *universal_switch_scan_method;
 	GenGroupItemData *universal_switch_feedback_cursor_cl;
diff --git a/src/UpdateSwitchPage.cpp b/src/UpdateSwitchPage.cpp
index e09322b..0933c2b 100644
--- a/src/UpdateSwitchPage.cpp
+++ b/src/UpdateSwitchPage.cpp
@@ -71,17 +71,18 @@ void UpdateSwitchPage::createUpdateAccessoriesSwitchPage()
 	elm_toolbar_item_append(tb, NULL, _("IDS_ACCS_UNIVERSAL_SWITCH_CANCEL"), NULL, NULL);
 	save_object_item = elm_toolbar_item_append(tb, NULL, _("IDS_ACCS_UNIVERSAL_SWITCH_SAVE"), NULL, NULL);
 
-	context_->set_value_layout.setLayout(createLayout(context_->md.getNaviframe(), GRP_SET_VALUE_UPDATE_ACCESSORIES_SWITCH));
+	auto naviframe = context_->md.getNaviframe();
+	layout_ = Widget::make<Layout>(naviframe, "edje/accessibility-settings-set-value.edj", GRP_SET_VALUE_UPDATE_ACCESSORIES_SWITCH);
 
-	entry_ = elm_entry_add(context_->set_value_layout.getLayout()->getObject());
+	entry_ = elm_entry_add(layout_->getObject());
 	elm_entry_entry_set(entry_, config_item_to_update_.user_name.c_str());
 	elm_entry_cursor_end_set(entry_);
 	evas_object_show(entry_);
-	elm_object_part_content_set(context_->set_value_layout.getLayout()->getObject(), PRT_SET_VALUE_ENTRY, entry_);
+	elm_object_part_content_set(layout_->getObject(), PRT_SET_VALUE_ENTRY, entry_);
 
-	context_->set_value_layout.getLayout()->setPartText(PRT_SET_VALUE_DESC, "IDS_ACCS_UNIVERSAL_SWITCH_NAME");
+	layout_->setPartText(PRT_SET_VALUE_DESC, "IDS_ACCS_UNIVERSAL_SWITCH_NAME");
 
-	update_accessories_action_genlist_ = createGenlist(context_->set_value_layout.getLayout(), NULL);
+	update_accessories_action_genlist_ = createGenlist(layout_, NULL);
 	createGendialGroupItem(update_accessories_action_genlist_->getObject(), &itc_1text,
 						   updateSwitchAction, this,
 						   SwallowType::INVALID, 0,
@@ -89,7 +90,7 @@ void UpdateSwitchPage::createUpdateAccessoriesSwitchPage()
 						   setting_accessibility_universal_switch_dbus_config_get_activity_name(&context_->config, config_item_to_update_.activity_type),
 						   NULL);
 
-	nf_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), "", NULL, NULL, context_->set_value_layout.getLayout()->getObject(), "tabbar/notitle");
+	nf_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), "", NULL, NULL, layout_->getObject(), "tabbar/notitle");
 	elm_object_item_domain_text_translatable_set(nf_it, PACKAGE, EINA_TRUE);
 	elm_object_item_part_content_set(nf_it, "tabbar", tb);
 }
diff --git a/src/UpdateSwitchPage.hpp b/src/UpdateSwitchPage.hpp
index 2b3888f..a117d56 100644
--- a/src/UpdateSwitchPage.hpp
+++ b/src/UpdateSwitchPage.hpp
@@ -54,6 +54,7 @@ private:
 	Elm_Object_Item *save_object_item = nullptr;
 	Evas_Object *entry_ = nullptr;
 	Genlist *update_accessories_action_genlist_ = nullptr;
+	Layout *layout_ = nullptr;
 };
 
 #endif
-- 
2.7.4


From 3baf4bbdf032bd7a4c6a4fcde60ff8ca490dc92f Mon Sep 17 00:00:00 2001
From: Tomasz Jeschke <t.jeschke@samsung.com>
Date: Mon, 18 Feb 2019 13:43:33 +0100
Subject: [PATCH 06/16] Refactor function used to create the app's window

Change-Id: I6045ce757cbb49364c9e090dcad2bb1c169a0c44
---
 src/MainData.cpp | 31 ++++++++-----------------------
 src/MainData.hpp |  4 +---
 src/Window.cpp   | 23 +++--------------------
 src/Window.hpp   |  5 +----
 4 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/src/MainData.cpp b/src/MainData.cpp
index ede896b..7bb8b18 100644
--- a/src/MainData.cpp
+++ b/src/MainData.cpp
@@ -31,10 +31,9 @@ int MainData::initApp(const std::string &name)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	createMainWindow(name);
-	setting_retvm_if(window->getObject() == NULL, SETTING_RETURN_FAIL, "window is null");
+	window_ = std::make_unique<Window>(name);
+	setting_retvm_if(window_->getObject() == NULL, SETTING_RETURN_FAIL, "window is null");
 
-	evas = evas_object_evas_get(window->getObject());
 	addRotateSupport();
 
 	return SETTING_RETURN_SUCCESS;
@@ -53,7 +52,7 @@ void MainData::initView(const TranslatedString &name, std::function<void()> back
 
 Window *MainData::getWindow() const
 {
-	return window.get();
+	return window_.get();
 }
 
 Naviframe *MainData::getNaviframe() const
@@ -68,10 +67,10 @@ Genlist *MainData::getGenlist() const
 
 int MainData::initViewWithoutGenlist(const TranslatedString &name, std::function<void()> backCb)
 {
-	auto conformant = Widget::make<Conformant>(window.get());
+	auto conformant = Widget::make<Conformant>(window_.get());
 	conformant->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	window->setConformant(true);
-	window->addResizeObject(conformant);
+	window_->setConformant(true);
+	window_->addResizeObject(conformant);
 
 	naviframe_ = Widget::make<Naviframe>(conformant);
 	naviframe_->createPrevBtnAutomatically(false);
@@ -95,9 +94,9 @@ int MainData::initViewWithoutGenlist(const TranslatedString &name, std::function
 
 void MainData::addRotateSupport()
 {
-	if (elm_win_wm_rotation_supported_get(window->getObject())) {
+	if (elm_win_wm_rotation_supported_get(window_->getObject())) {
 		int rots[4] = { 0, 90, 180, 270 };
-		elm_win_wm_rotation_available_rotations_set(window->getObject(), rots, 4);
+		elm_win_wm_rotation_available_rotations_set(window_->getObject(), rots, 4);
 	}
 }
 
@@ -106,18 +105,4 @@ void MainData::prepareViewList()
 	genlist_ = Widget::make<Genlist>(layout_);
 	genlist_->setMode(ELM_LIST_COMPRESS);
 	genlist_->setStyle("dialogue");
-}
-
-void MainData::createMainWindow(const std::string &name)
-{
-	window = std::make_unique<Window>();
-	if (!window) {
-		SETTING_TRACE_ERROR("Could not create main window");
-		return;
-	}
-
-	window->setTitle(name);
-	window->setIndicatorMode(ELM_WIN_INDICATOR_SHOW);
-	window->setOpacity(ELM_WIN_INDICATOR_OPAQUE);
-
 }
\ No newline at end of file
diff --git a/src/MainData.hpp b/src/MainData.hpp
index 0a23aff..f4fee90 100644
--- a/src/MainData.hpp
+++ b/src/MainData.hpp
@@ -45,10 +45,8 @@ private:
 	int initViewWithoutGenlist(const TranslatedString &name, std::function<void()> backCb);
 	void addRotateSupport();
 	void prepareViewList();
-	void createMainWindow(const std::string &name);
 
-	Evas *evas = nullptr;
-	std::unique_ptr<Window> window;
+	std::unique_ptr<Window> window_;
 	Naviframe *naviframe_ = nullptr;
 	Layout *layout_ = nullptr;
 	Genlist *genlist_ = nullptr;
diff --git a/src/Window.cpp b/src/Window.cpp
index a7c8f83..7e97eca 100644
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -1,30 +1,13 @@
 #include "Window.hpp"
 
-Window::Window()
+Window::Window(const std::string &title)
 {
 	uniqueObj_.reset(elm_win_add(NULL, NULL, ELM_WIN_BASIC));
 
-	//TODO: check if code below is necessary
-	int w = 0;
-	int h = 0;
-	elm_win_screen_size_get(uniqueObj_.get(), NULL, NULL, &w, &h);
-	evas_object_move(uniqueObj_.get(), 0, 0);
-	evas_object_resize(uniqueObj_.get(), w, h);
-}
-
-void Window::setTitle(const std::string &title)
-{
 	elm_win_title_set(uniqueObj_.get(), title.c_str());
-}
 
-void Window::setIndicatorMode(Elm_Win_Indicator_Mode mode)
-{
-	elm_win_indicator_mode_set(uniqueObj_.get(), mode);
-}
-
-void Window::setOpacity(Elm_Win_Indicator_Opacity_Mode mode)
-{
-	elm_win_indicator_opacity_set(uniqueObj_.get(), mode);
+	elm_win_indicator_mode_set(uniqueObj_.get(), ELM_WIN_INDICATOR_SHOW);
+	elm_win_indicator_opacity_set(uniqueObj_.get(), ELM_WIN_INDICATOR_OPAQUE);
 }
 
 void Window::setConformant(bool conformant)
diff --git a/src/Window.hpp b/src/Window.hpp
index 6c4e7fe..5c8a84b 100644
--- a/src/Window.hpp
+++ b/src/Window.hpp
@@ -6,11 +6,8 @@
 class Window : public Widget
 {
 public:
-	Window();
+	Window(const std::string &title);
 
-	void setTitle(const std::string &title);
-	void setIndicatorMode(Elm_Win_Indicator_Mode mode);
-	void setOpacity(Elm_Win_Indicator_Opacity_Mode mode);
 	void setConformant(bool conformant);
 	void addResizeObject(Widget *widget);
 
-- 
2.7.4


From 425d3953e20f58cb11faf9e0f047d10386a27f17 Mon Sep 17 00:00:00 2001
From: Oskar Chodowicz <o.chodowicz@samsung.com>
Date: Wed, 20 Feb 2019 12:03:07 +0100
Subject: [PATCH 07/16] Add Label class

Change-Id: Ibc26567d0d54005e052a30ee3e819bf4cd5883eb
---
 src/Label.cpp | 15 +++++++++++++++
 src/Label.hpp | 13 +++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 src/Label.cpp
 create mode 100644 src/Label.hpp

diff --git a/src/Label.cpp b/src/Label.cpp
new file mode 100644
index 0000000..b7262e7
--- /dev/null
+++ b/src/Label.cpp
@@ -0,0 +1,15 @@
+#include "Label.hpp"
+
+Label::Label(Widget *parent)
+	: Widget(parent)
+{
+	uniqueObj_.reset(elm_label_add(parent->getObject()));
+	show();
+}
+
+Label::Label(Widget *parent, const TranslatedString &caption)
+	: Label(parent)
+{
+	setText(caption);
+}
+
diff --git a/src/Label.hpp b/src/Label.hpp
new file mode 100644
index 0000000..ad863ad
--- /dev/null
+++ b/src/Label.hpp
@@ -0,0 +1,13 @@
+#ifndef LABEL_HPP
+#define LABEL_HPP
+
+#include "Widget.hpp"
+
+class Label : public Widget
+{
+public:
+	Label(Widget *parent);
+	Label(Widget *parent, const TranslatedString &caption);
+};
+
+#endif
-- 
2.7.4


From 929896f5c52c189e9bed459e65b324f22405268b Mon Sep 17 00:00:00 2001
From: Oskar Chodowicz <o.chodowicz@samsung.com>
Date: Wed, 20 Feb 2019 12:21:36 +0100
Subject: [PATCH 08/16] Remove code duplication

Change-Id: Ia02aa3a473ab2612448d5a0bd84d0153c461dd28
---
 src/Button.cpp   | 5 +----
 src/CtxPopup.cpp | 4 +---
 src/Layout.cpp   | 3 +--
 src/Popup.cpp    | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/Button.cpp b/src/Button.cpp
index 428f292..abc0ad6 100644
--- a/src/Button.cpp
+++ b/src/Button.cpp
@@ -11,13 +11,10 @@ Button::Button(Widget *parent)
 }
 
 Button::Button(Widget *parent, std::function<void()> onClick, const TranslatedString &text, const std::string &style)
+	: Button(parent)
 {
-	uniqueObj_.reset(elm_button_add(parent->getObject()));
-	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	setAlignHint(EVAS_HINT_FILL, 0.5);
 	setText(text);
 	if (!style.empty())
 		setStyle(style);
 	setEvasSmartCallback("clicked", onClick);
-	show();
 }
diff --git a/src/CtxPopup.cpp b/src/CtxPopup.cpp
index 2f15807..f476985 100644
--- a/src/CtxPopup.cpp
+++ b/src/CtxPopup.cpp
@@ -9,11 +9,9 @@ CtxPopup::CtxPopup(Widget *parent)
 }
 
 CtxPopup::CtxPopup(Widget *parent, bool disableAutoHide)
-	: Widget(parent)
+	: CtxPopup(parent)
 {
-	uniqueObj_.reset(elm_ctxpopup_add(parent->getObject()));
 	setAutoHide(disableAutoHide);
-	show();
 }
 
 void CtxPopup::setAutoHide(bool autoHide)
diff --git a/src/Layout.cpp b/src/Layout.cpp
index d3d5422..9f3b2c5 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -11,9 +11,8 @@ Layout::Layout(Widget *parent)
 }
 
 Layout::Layout(Widget *parent, const std::string &edjeFile, const std::string &group)
-	: Widget(parent)
+	: Layout(parent)
 {
-	uniqueObj_.reset(elm_layout_add(parent->getObject()));
 	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
 	std::string edjePath;
diff --git a/src/Popup.cpp b/src/Popup.cpp
index d21b49b..ee8cdb8 100644
--- a/src/Popup.cpp
+++ b/src/Popup.cpp
@@ -9,11 +9,9 @@ Popup::Popup(Widget *parent)
 }
 
 Popup::Popup(Widget *parent, const TranslatedString &title)
+	: Popup(parent)
 {
-	uniqueObj_.reset(elm_popup_add(parent->getObject()));
 	setPartText("title,text", title);
-	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	show();
 }
 
 void Popup::setOrientation(Elm_Popup_Orient orientation)
-- 
2.7.4


From cc00ac387fa8f7ed4c49ec42e2847802032f56d0 Mon Sep 17 00:00:00 2001
From: Tomasz Jeschke <t.jeschke@samsung.com>
Date: Wed, 20 Feb 2019 12:32:34 +0100
Subject: [PATCH 09/16] Use Box, Label and Scroller classes instead of
 Evas_Object

Change-Id: Ic4c81ffbc3024d903841c87ea5d0b20c9022f2ad
---
 src/Box.cpp                      |   1 +
 src/Label.cpp                    |   4 +-
 src/Label.hpp                    |   2 +-
 src/ScreenReaderSettingsPage.cpp |   1 -
 src/Scroller.cpp                 |  21 ++++++--
 src/Scroller.hpp                 |   2 +
 src/SetValuePage.cpp             | 100 +++++++++++----------------------------
 src/SetValuePage.hpp             |  11 ++---
 src/Widget.cpp                   |   5 ++
 src/Widget.hpp                   |   1 +
 10 files changed, 62 insertions(+), 86 deletions(-)

diff --git a/src/Box.cpp b/src/Box.cpp
index c35e4d3..37ab50c 100644
--- a/src/Box.cpp
+++ b/src/Box.cpp
@@ -4,6 +4,7 @@ Box::Box(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_box_add(parent->getObject()));
+	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	show();
 }
 
diff --git a/src/Label.cpp b/src/Label.cpp
index b7262e7..c8c95ad 100644
--- a/src/Label.cpp
+++ b/src/Label.cpp
@@ -7,9 +7,9 @@ Label::Label(Widget *parent)
 	show();
 }
 
-Label::Label(Widget *parent, const TranslatedString &caption)
+Label::Label(Widget *parent, const TranslatedString &text)
 	: Label(parent)
 {
-	setText(caption);
+	setText(text);
 }
 
diff --git a/src/Label.hpp b/src/Label.hpp
index ad863ad..eb265d2 100644
--- a/src/Label.hpp
+++ b/src/Label.hpp
@@ -7,7 +7,7 @@ class Label : public Widget
 {
 public:
 	Label(Widget *parent);
-	Label(Widget *parent, const TranslatedString &caption);
+	Label(Widget *parent, const TranslatedString &text);
 };
 
 #endif
diff --git a/src/ScreenReaderSettingsPage.cpp b/src/ScreenReaderSettingsPage.cpp
index f357fa0..3992c3d 100644
--- a/src/ScreenReaderSettingsPage.cpp
+++ b/src/ScreenReaderSettingsPage.cpp
@@ -243,7 +243,6 @@ void ScreenReaderSettingsPage::mouseUpGendialListCb(void *data, Evas_Object *obj
 	self->popup_->setEextEventCallback(EEXT_CALLBACK_BACK, removeCb);
 
 	auto box = Widget::make<Box>(self->popup_);
-	box->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
 	auto genlist = Widget::make<Genlist>(box);
 	genlist->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/Scroller.cpp b/src/Scroller.cpp
index 31f43b3..6daa9f1 100644
--- a/src/Scroller.cpp
+++ b/src/Scroller.cpp
@@ -4,6 +4,7 @@ Scroller::Scroller(Widget *parent)
 	: Widget(parent)
 {
 	uniqueObj_.reset(elm_scroller_add(parent->getObject()));
+	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	show();
 }
 
@@ -12,9 +13,9 @@ void Scroller::setScrollbarsVisibility(Elm_Scroller_Policy h, Elm_Scroller_Polic
 	elm_scroller_policy_set(uniqueObj_.get(), h, v);
 }
 
-void Scroller::setMinimumSizeLimit(bool w, bool h)
+void Scroller::setMinimumSizeLimit(bool h, bool v)
 {
-	elm_scroller_content_min_limit(uniqueObj_.get(), w ? EINA_TRUE : EINA_FALSE, h ? EINA_TRUE : EINA_FALSE);
+	elm_scroller_content_min_limit(uniqueObj_.get(), h ? EINA_TRUE : EINA_FALSE, v ? EINA_TRUE : EINA_FALSE);
 }
 
 void Scroller::blockScrolling(Elm_Scroller_Movement_Block direction)
@@ -22,12 +23,24 @@ void Scroller::blockScrolling(Elm_Scroller_Movement_Block direction)
 	elm_scroller_movement_block_set(uniqueObj_.get(), direction);
 }
 
-void Scroller::setRelativeSize(double w, double h)
+void Scroller::setRelativeSize(double h, double v)
 {
-	elm_scroller_page_relative_set(uniqueObj_.get(), h, w);
+	elm_scroller_page_relative_set(uniqueObj_.get(), h, v);
 }
 
 void Scroller::setPageScrollLimit(int h, int v)
 {
 	elm_scroller_page_scroll_limit_set(uniqueObj_.get(), h, v);
 }
+
+size_t Scroller::getCurrentVerticalPage()
+{
+	int pageNum;
+	elm_scroller_current_page_get(uniqueObj_.get(), NULL, &pageNum);
+	return static_cast<size_t>(pageNum);
+}
+
+void Scroller::showVerticalPage(size_t page)
+{
+	elm_scroller_page_show(uniqueObj_.get(), 0, page);
+}
\ No newline at end of file
diff --git a/src/Scroller.hpp b/src/Scroller.hpp
index b08d027..836acf4 100644
--- a/src/Scroller.hpp
+++ b/src/Scroller.hpp
@@ -13,6 +13,8 @@ public:
 	void blockScrolling(Elm_Scroller_Movement_Block direction);
 	void setRelativeSize(double w, double h);
 	void setPageScrollLimit(int h, int v);
+	size_t getCurrentVerticalPage();
+	void showVerticalPage(size_t page);
 
 protected:
 	Scroller() = default;
diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index 845ccda..177e9b2 100644
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -18,6 +18,7 @@
 
 #include "setting-accessibility.h"
 #include "WidgetFactory.hpp"
+#include "Label.hpp"
 
 #include <app.h>
 
@@ -66,17 +67,14 @@ SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const
 	}
 	auto naviframe = context_->md.getNaviframe();
 	layout_ = createLayout(naviframe, layout_grp);
+
 	switch (type) {
 	case ValueEditorType::NUMERIC:
-		scroller_ = createScroller(layout_->getObject());
-		box_ = createBox(scroller_);
-		evas_object_smart_callback_add(scroller_, "scroll,page,changed", scrollerScrollCb, this);
+		createScroller();
 		break;
 	case ValueEditorType::NUMERIC_SWITCH:
-		scroller_ = createScroller(layout_->getObject());
-		box_ = createBox(scroller_);
+		createScroller();
 		check_ = createCheck(layout_->getObject(), EINA_FALSE, checkStateChangedCb, this);
-		evas_object_smart_callback_add(scroller_, "scroll,page,changed", scrollerScrollCb, this);
 		break;
 	case ValueEditorType::RADIOS:
 		genlist_ = createGenlist(layout_, NULL);
@@ -116,8 +114,8 @@ void SetValuePage::setRange(double min, double max, double step)
 	maxVal_ = max;
 	step_ = step;
 
-	elm_box_pack_end(box_, createLabel(box_, ""));
-	elm_box_pack_end(box_, createLabel(box_, ""));
+	box_->packEnd(Widget::make<Label>(box_, ""));
+	box_->packEnd(Widget::make<Label>(box_, ""));
 
 	for (auto i = min; i < max + step / 2; i += step) {
 		std::ostringstream out;
@@ -128,12 +126,11 @@ void SetValuePage::setRange(double min, double max, double step)
 			out.precision(0);
 		out << std::fixed << i << "</font/>";
 
-		Evas_Object *label = createLabel(box_, out.str().c_str());
-		elm_box_pack_end(box_, label);
+		box_->packEnd(Widget::make<Label>(box_, out.str().c_str()));
 	}
 
-	elm_box_pack_end(box_, createLabel(box_, ""));
-	elm_box_pack_end(box_, createLabel(box_, ""));
+	box_->packEnd(Widget::make<Label>(box_, ""));
+	box_->packEnd(Widget::make<Label>(box_, ""));
 
 	std::ostringstream out;
 	if (step_ < 1.0)
@@ -152,7 +149,7 @@ void SetValuePage::setValue(double value, const std::string &units)
 	retm_if(value > maxVal_, "Invalid value");
 
 	units_ = units;
-	elm_scroller_page_show(scroller_, 0, (value - minVal_) / step_);
+	scroller_->showVerticalPage((value - minVal_) / step_);
 
 	displayValue(value);
 }
@@ -333,52 +330,23 @@ Evas_Object *SetValuePage::createCheck(Evas_Object *parent, bool state, Evas_Sma
 	return check;
 }
 
-Evas_Object *SetValuePage::createLabel(Evas_Object *parent, const char *caption)
+void SetValuePage::createScroller()
 {
-	retvm_if(parent == NULL || caption == NULL, NULL, "Input parameter is NULL");
-
-	Evas_Object *label = elm_label_add(parent);
-	elm_object_text_set(label, caption);
-	evas_object_show(label);
-
-
-	return label;
-}
-
-Evas_Object *SetValuePage::createBox(Evas_Object *parent)
-{
-	Evas_Object *box;
-	retvm_if(parent == NULL, NULL, "Input parameter is NULL");
-
-	box = elm_box_add(parent);
-	elm_box_horizontal_set(box, EINA_FALSE);
-	elm_box_homogeneous_set(box, EINA_TRUE);
-	evas_object_size_hint_align_set(box, 0.0, 0.0);
-	evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	elm_object_content_set(parent, box);
-	evas_object_show(box);
-
-
-	return box;
-}
-
-Evas_Object *SetValuePage::createScroller(Evas_Object *parent)
-{
-	Evas_Object *scroller;
-	retvm_if(parent == NULL, NULL, "Input parameter is NULL");
-
-	scroller = elm_scroller_add(parent);
-	elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-	elm_scroller_content_min_limit(scroller, EINA_FALSE, EINA_FALSE);
-	elm_scroller_movement_block_set(scroller, ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL);
-	elm_scroller_page_relative_set(scroller, 1.0, 0.2);
-	elm_scroller_page_scroll_limit_set(scroller, 1, 1);
-	elm_object_part_content_set(parent, PRT_SET_VALUE_SELECTOR, scroller);
-	evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-	evas_object_show(scroller);
-
-	return scroller;
+	scroller_ = Widget::make<Scroller>(layout_);
+	scroller_->setScrollbarsVisibility(ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+	scroller_->setMinimumSizeLimit(EINA_FALSE, EINA_FALSE);
+	scroller_->blockScrolling(ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL);
+	scroller_->setRelativeSize(1.0, 0.2);
+	scroller_->setPageScrollLimit(1, 1);
+	layout_->setPartContent(PRT_SET_VALUE_SELECTOR, scroller_);
+	box_ = Widget::make<Box>(scroller_);
+	box_->setHomogeneousDimensions();
+	box_->setAlignHint(0.0, 0.0);
+	scroller_->setContent(box_);
+	scroller_->setEvasSmartCallback("scroll,page,changed", [this]() {
+		auto pageNum = scroller_->getCurrentVerticalPage();
+		displayValue(static_cast<double>(pageNum) * step_ + minVal_);
+	});
 }
 
 Layout *SetValuePage::createLayout(Widget *parent, const std::string &layout_grp)
@@ -419,17 +387,6 @@ void SetValuePage::listItemClickCb(void *data, Evas_Object *obj, void *event_inf
 		opt_item->self->requestListItemOptionsCb_(opt_item->option_id);
 }
 
-void SetValuePage::scrollerScrollCb(void *data, Evas_Object *obj, void *event_info)
-{
-	int page_num = 0;
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<SetValuePage *>(data);
-
-	elm_scroller_current_page_get(self->scroller_, NULL, &page_num);
-
-	self->displayValue((double)page_num * self->step_ + self->minVal_);
-}
-
 void SetValuePage::checkStateChangedCb(void *data, Evas_Object *obj, void *event_info)
 {
 	bool state;
@@ -464,9 +421,8 @@ Eina_Bool SetValuePage::naviframePopCb(void *data, Elm_Object_Item *it)
 	vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_SETTINGS_FEEDBACK_SOUND_STATE, SetValuePage::syncPageWithVconf);
 
 	if (self->changeValueCb_) {
-		int page_num = 0;
-		elm_scroller_current_page_get(self->scroller_, NULL, &page_num);
-		self->changeValueCb_((double)page_num * self->step_ + self->minVal_);
+		auto pageNum = self->scroller_->getCurrentVerticalPage();
+		self->changeValueCb_(static_cast<double>(pageNum) * self->step_ + self->minVal_);
 	}
 
 	if (!self->options_data.empty()) {
diff --git a/src/SetValuePage.hpp b/src/SetValuePage.hpp
index a2e6322..9cdcd1c 100644
--- a/src/SetValuePage.hpp
+++ b/src/SetValuePage.hpp
@@ -19,6 +19,8 @@
 
 #include "SettingAccessibility.hpp"
 #include "GenGroupItemData.hpp"
+#include "Box.hpp"
+#include "Scroller.hpp"
 
 #include <vconf.h>
 
@@ -72,13 +74,10 @@ private:
 	static void switchItemCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	Genlist *createGenlist(Widget *parent, const char *title);
 	static Evas_Object *createCheck(Evas_Object *parent, bool state, Evas_Smart_Cb onChanged, void *cbData);
-	static Evas_Object *createLabel(Evas_Object *parent, const char *caption);
-	static Evas_Object *createBox(Evas_Object *parent);
-	static Evas_Object *createScroller(Evas_Object *parent);
+	void createScroller();
 	Layout *createLayout(Widget *parent, const std::string &layout_grp);
 	void displayValue(double value);
 	static void listItemClickCb(void *data, Evas_Object *obj, void *event_info);
-	static void scrollerScrollCb(void *data, Evas_Object *obj, void *event_info);
 	static void checkStateChangedCb(void *data, Evas_Object *obj, void *event_info);
 	static Eina_Bool naviframePopCb(void *data, Elm_Object_Item *it);
 	static void backCb(void *data, Evas_Object *obj, void *event_info);
@@ -86,8 +85,8 @@ private:
 	SettingAccessibility *context_ = nullptr;
 
 	Layout *layout_ = nullptr;
-	Evas_Object *scroller_ = nullptr;
-	Evas_Object *box_ = nullptr;
+	Scroller *scroller_ = nullptr;
+	Box *box_ = nullptr;
 	Evas_Object *check_ = nullptr;
 	Genlist *genlist_ = nullptr;
 	std::vector<OptionsItem *> options_data;
diff --git a/src/Widget.cpp b/src/Widget.cpp
index a480ad7..0f32f3b 100644
--- a/src/Widget.cpp
+++ b/src/Widget.cpp
@@ -90,6 +90,11 @@ void Widget::setPartContent(const std::string &part, Widget *content)
 	elm_object_part_content_set(uniqueObj_.get(), part.c_str(), content->getObject());
 }
 
+void Widget::setHomogeneousDimensions()
+{
+	elm_box_homogeneous_set(uniqueObj_.get(), EINA_TRUE);
+}
+
 void Widget::disable(bool disable)
 {
 	disable ? elm_object_disabled_set(uniqueObj_.get(), EINA_TRUE) : elm_object_disabled_set(uniqueObj_.get(), EINA_FALSE);
diff --git a/src/Widget.hpp b/src/Widget.hpp
index 23a54d7..b3b3236 100644
--- a/src/Widget.hpp
+++ b/src/Widget.hpp
@@ -50,6 +50,7 @@ public:
 	void setColor(int r, int g, int b, int a);
 	void setContent(Widget *widget);
 	void setPartContent(const std::string &part, Widget *content);
+	void setHomogeneousDimensions();
 	void disable(bool disable);
 	void emitSignal(const std::string &signal);
 	void show();
-- 
2.7.4


From 2b4aa283fbb61b041ab597942191091c13e4c0e3 Mon Sep 17 00:00:00 2001
From: Lukasz Wlazly <l.wlazly@partner.samsung.com>
Date: Mon, 18 Feb 2019 14:00:00 +0100
Subject: [PATCH 10/16] Wrap genlist item with class

This patch introduce new approach to creating genlist items.
In this commit there is first use case included.

Change-Id: Ifec07b7a5be13a10611d684a2074ec0c1cce561b
---
 src/CameraSwitchesPage.cpp          |  3 +-
 src/Genlist.cpp                     | 16 +++++++
 src/Genlist.hpp                     |  5 +++
 src/GenlistItem.cpp                 | 76 +++++++++++++++++++++++++++++++++
 src/GenlistItem.hpp                 | 46 ++++++++++++++++++++
 src/MainPage.cpp                    | 83 +++++++++++--------------------------
 src/MainPage.hpp                    |  8 +---
 src/SetValuePage.cpp                |  2 +-
 src/UniversalSwitchSettingsPage.cpp | 10 ++---
 src/UpdateSwitchPage.cpp            |  3 +-
 src/setting-common-draw-genlist.cpp | 22 ----------
 src/setting-common-draw-widget.h    |  8 ----
 src/utils.hpp                       |  9 ++++
 13 files changed, 186 insertions(+), 105 deletions(-)
 create mode 100644 src/GenlistItem.cpp
 create mode 100644 src/GenlistItem.hpp

diff --git a/src/CameraSwitchesPage.cpp b/src/CameraSwitchesPage.cpp
index 3391477..6d471e3 100644
--- a/src/CameraSwitchesPage.cpp
+++ b/src/CameraSwitchesPage.cpp
@@ -42,8 +42,7 @@ CameraSwitchesPage::CameraSwitchesPage(SettingAccessibility *ad)
 		return;
 
 	elm_genlist_item_select_mode_set(universal_switch_camera_comment->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-	createGendialTitleItem(genlist->getObject(), &itc_group_item, "IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_CAMERA_GROUP_HEAD");
-
+	genlist->appendItem({"group_index", "IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_CAMERA_GROUP_HEAD"});
 
 	auto switches = setting_accessibility_universal_switch_dbus_config_get_switches(&context_->config, ACCESSIBILITY_UNIVERSAL_SWITCH_CAMERA_SWITCH_PROVIDER);
 	for (auto &it : switches) {
diff --git a/src/Genlist.cpp b/src/Genlist.cpp
index 87f575a..c45c0b5 100644
--- a/src/Genlist.cpp
+++ b/src/Genlist.cpp
@@ -22,3 +22,19 @@ size_t Genlist::size()
 {
 	return elm_genlist_items_count(uniqueObj_.get());
 }
+
+GenlistItem *Genlist::appendItem(GenlistItem item, GenlistItem *parent)
+{
+	auto itemPtr = std::make_unique<GenlistItem>(std::move(item));
+	auto itc = itemPtr->generateITCObject();
+	auto type = itemPtr->getItemType();
+	auto parentPtr = parent ? parent->objItem_ : nullptr;
+
+	itemPtr->objItem_ = elm_genlist_item_append(uniqueObj_.get(), itc.get(), itemPtr.get(), parentPtr, type, GenlistItem::onItemSelection, itemPtr.get());
+
+	if (!itemPtr->onSelection_)
+		elm_genlist_item_select_mode_set(itemPtr->objItem_, ELM_OBJECT_SELECT_MODE_NONE);
+
+	items_.push_back(std::move(itemPtr));
+	return items_.back().get();
+}
\ No newline at end of file
diff --git a/src/Genlist.hpp b/src/Genlist.hpp
index 81a0092..0f713d4 100644
--- a/src/Genlist.hpp
+++ b/src/Genlist.hpp
@@ -2,6 +2,7 @@
 #define GENLIST_HPP
 
 #include "Scroller.hpp"
+#include "GenlistItem.hpp"
 
 class Genlist : public Scroller
 {
@@ -11,6 +12,10 @@ public:
 	void setMode(Elm_List_Mode mode);
 	void clear();
 	size_t size();
+	GenlistItem *appendItem(GenlistItem item, GenlistItem *parent = nullptr);
+
+private:
+	std::vector<std::unique_ptr<GenlistItem>> items_;
 };
 
 #endif
diff --git a/src/GenlistItem.cpp b/src/GenlistItem.cpp
new file mode 100644
index 0000000..4b11a16
--- /dev/null
+++ b/src/GenlistItem.cpp
@@ -0,0 +1,76 @@
+#include "GenlistItem.hpp"
+
+#include "setting-debug.h"
+
+GenlistItem::GenlistItem(std::string style, TranslatedString text, TranslatedString desc, Type type)
+	: style_(std::move(style)), text_(std::move(text)), description_(std::move(desc)), type_(type)
+{}
+
+GenlistItem::GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, Type type)
+	: style_(std::move(style)), text_(std::move(text)), description_(std::move(desc)), onSelection_(onSelection), type_(type)
+{}
+
+void GenlistItem::setDescription(const TranslatedString &desc)
+{
+	description_ = desc;
+}
+
+void GenlistItem::update()
+{
+	elm_genlist_item_update(objItem_);
+}
+
+GenlistItem::ElmGenlistItemClassPtr GenlistItem::generateITCObject()
+{
+	auto *itc = elm_genlist_item_class_new();
+	itc->item_style = style_.c_str();
+	itc->func.text_get = textRealizator;
+	itc->func.content_get = contentRealizator;
+	itc->func.del = nullptr;
+
+	return ElmGenlistItemClassPtr{itc};
+}
+
+Elm_Genlist_Item_Type GenlistItem::getItemType()
+{
+	switch (type_) {
+	case Type::regular:
+		return ELM_GENLIST_ITEM_NONE;
+
+	case Type::group:
+		return ELM_GENLIST_ITEM_GROUP;
+
+	case Type::tree:
+		return ELM_GENLIST_ITEM_TREE;
+
+	default:
+		return ELM_GENLIST_ITEM_NONE;
+	}
+}
+
+char *GenlistItem::textRealizator(void *data, Evas_Object *obj, const char *part)
+{
+	auto self = static_cast<GenlistItem *>(data);
+	using namespace std::string_literals;
+
+	if (part == "elm.text"s && !self->text_.empty())
+		return strdup(self->text_.c_str());
+
+	if ((part == "elm.text.sub"s || part == "elm.text.multiline"s) && !self->description_.empty())
+		return strdup(self->description_.c_str());
+
+	return nullptr;
+}
+
+Evas_Object *GenlistItem::contentRealizator(void *data, Evas_Object *obj, const char *part)
+{
+	return nullptr;
+}
+
+void GenlistItem::onItemSelection(void *data, Evas_Object *obj, void *event_info)
+{
+	auto self = static_cast<GenlistItem *>(data);
+	if (self->onSelection_)
+		self->onSelection_(self);
+	elm_genlist_item_selected_set(self->objItem_, EINA_FALSE);
+}
\ No newline at end of file
diff --git a/src/GenlistItem.hpp b/src/GenlistItem.hpp
new file mode 100644
index 0000000..00ea945
--- /dev/null
+++ b/src/GenlistItem.hpp
@@ -0,0 +1,46 @@
+#ifndef GENLIST_ITEM_HPP
+#define GENLIST_ITEM_HPP
+
+#include "TranslatedString.hpp"
+
+#include <Elementary.h>
+
+#include <functional>
+#include <memory>
+#include "utils.hpp"
+
+class GenlistItem
+{
+	friend class Genlist;
+
+public:
+	enum class Type {regular, group, tree};
+	enum class WidgetType {none, check, toggle, radio, icon};
+
+	GenlistItem(std::string style, TranslatedString text, TranslatedString desc = {}, Type type = Type::group);
+	GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, Type type = Type::regular);
+
+	void setDescription(const TranslatedString &desc);
+	void update();
+
+
+private:
+	using ElmGenlistItemClassPtr = std::unique_ptr<Elm_Genlist_Item_Class, utils::ElmGenlistItemClassDeleter>;
+	ElmGenlistItemClassPtr generateITCObject();
+	Elm_Genlist_Item_Type getItemType();
+
+	static char *textRealizator(void *data, Evas_Object *obj, const char *part);
+	static Evas_Object *contentRealizator(void *data, Evas_Object *obj, const char *part);
+	static void onItemSelection(void *data, Evas_Object *obj, void *event_info);
+
+	std::string style_;
+	TranslatedString text_;
+	TranslatedString description_;
+	std::function<void(GenlistItem *)> onSelection_;
+
+	Elm_Object_Item *objItem_ = nullptr;
+	Type type_ = Type::regular;
+	WidgetType widgetType_ = WidgetType::none;
+};
+
+#endif
\ No newline at end of file
diff --git a/src/MainPage.cpp b/src/MainPage.cpp
index fc5dfd4..5cc3b27 100644
--- a/src/MainPage.cpp
+++ b/src/MainPage.cpp
@@ -14,78 +14,43 @@ MainPage::MainPage(SettingAccessibility *ad)
 	});
 	context_->md.getGenlist()->setStyle("dialogue");
 
-	Evas_Object *scroller = context_->md.getGenlist()->getObject();
-	createGendialTitleItem(scroller, &(itc_group_item), "IDS_ST_HEADER_VISION");
+	auto grp = context_->md.getGenlist()->appendItem({"group_index", "IDS_ST_HEADER_VISION"});
 
 	int screen_reader = 0;
 	auto r = vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &screen_reader);
 	if (!r)
 		SETTING_TRACE_ERROR("Could not get value for key: %s", VCONFKEY_SETAPPL_ACCESSIBILITY_TTS);
 
-	screenReaderItem_ = createGendialGroupItem(
-							scroller, &itc_2text,
-							onScreenReaderItemClicked,
-							this, SwallowType::INVALID, 1,
-							"IDS_ST_MBODY_SCREEN_READER_HTTS",
-							screen_reader ? "IDS_ST_BODY_ON" : "IDS_ST_BODY_OFF",
-							NULL);
-	if (screenReaderItem_)
-		screenReaderItem_->userdata = context_;
-
-	universalSwitchItem_ = createGendialGroupItem(
-							   scroller, &context_->itc_multiline_sub,
-							   onUniversalSwitchItemClicked,
-							   this, SwallowType::INVALID, 1,
-							   "IDS_ACCS_UNIVERSAL_SWITCH",
-							   "IDS_ACCS_UNIVERSAL_SWITCH_HINT",
-							   NULL);
-	if (universalSwitchItem_)
-		universalSwitchItem_->userdata = context_;
-
-	accessibilityLauncherItem_ = createGendialGroupItem(
-									 scroller, &context_->itc_multiline_sub,
-									 onAccessibilityLauncherItemClicked,
-									 this, SwallowType::INVALID, 1,
-									 "IDS_ACCS_ACCESSIBILITY_LAUNCHER",
-									 "IDS_ACCS_ACCESSIBILITY_LAUNCHER_HINT",
-									 NULL);
-	if (accessibilityLauncherItem_)
-		accessibilityLauncherItem_->userdata = context_;
+	auto screenReaderItem = context_->md.getGenlist()->appendItem({"type1", "IDS_ST_MBODY_SCREEN_READER_HTTS", screen_reader ? "IDS_ST_BODY_ON" : "IDS_ST_BODY_OFF",
+							[this](auto item)
+	{
+		screenReaderPage_ = std::make_unique<ScreenReaderPage>(context_);
+	}
+																  }, grp);
 
-	int vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, onScreenReaderVconfKeyChanged, screenReaderItem_);
+	int vconf_ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, onScreenReaderVconfKeyChanged, screenReaderItem);
 	if (vconf_ret != 0) {
 		SETTING_TRACE("FAIL: vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS)");
 	}
-}
 
-void MainPage::onScreenReaderVconfKeyChanged(keynode_t *key, void *user_data)
-{
-	auto screen_reader_item = static_cast<GenGroupItemData *>(user_data);
-	screen_reader_item->sub_desc = vconf_keynode_get_bool(key) ? _("IDS_ST_BODY_ON") : _("IDS_ST_BODY_OFF");
-
-	elm_genlist_item_update(screen_reader_item->item);
-}
-
-void MainPage::onScreenReaderItemClicked(void *data, Evas_Object *obj, void *event_info)
-{
-	Elm_Object_Item *item = static_cast<Elm_Object_Item *>(event_info);
-	auto self = static_cast<MainPage *>(data);
-	elm_genlist_item_selected_set(item, EINA_FALSE);
-	self->screenReaderPage_ = std::make_unique<ScreenReaderPage>(self->context_);
-}
+	context_->md.getGenlist()->appendItem({"multiline", "IDS_ACCS_UNIVERSAL_SWITCH", "IDS_ACCS_UNIVERSAL_SWITCH_HINT",
+										   [this](auto item)
+	{
+		universalSwitchPage_ = std::make_unique<UniversalSwitchPage>(context_);
+	}
+										  }, grp);
 
-void MainPage::onUniversalSwitchItemClicked(void *data, Evas_Object *obj, void *event_info)
-{
-	Elm_Object_Item *item = static_cast<Elm_Object_Item *>(event_info);
-	auto self = static_cast<MainPage *>(data);
-	elm_genlist_item_selected_set(item, EINA_FALSE);
-	self->universalSwitchPage_ = std::make_unique<UniversalSwitchPage>(self->context_);
+	context_->md.getGenlist()->appendItem({"multiline", "IDS_ACCS_ACCESSIBILITY_LAUNCHER", "IDS_ACCS_ACCESSIBILITY_LAUNCHER_HINT",
+										   [this](auto item)
+	{
+		accessibilityLauncherPage_ = std::make_unique<AccessibilityLauncherPage>(context_);
+	}
+										  }, grp);
 }
 
-void MainPage::onAccessibilityLauncherItemClicked(void *data, Evas_Object *obj, void *event_info)
+void MainPage::onScreenReaderVconfKeyChanged(keynode_t *key, void *user_data)
 {
-	Elm_Object_Item *item = static_cast<Elm_Object_Item *>(event_info);
-	auto self = static_cast<MainPage *>(data);
-	elm_genlist_item_selected_set(item, EINA_FALSE);
-	self->accessibilityLauncherPage_ = std::make_unique<AccessibilityLauncherPage>(self->context_);
+	auto screenReaderItem = static_cast<GenlistItem *>(user_data);
+	screenReaderItem->setDescription(vconf_keynode_get_bool(key) ? "IDS_ST_BODY_ON" : "IDS_ST_BODY_OFF");
+	screenReaderItem->update();
 }
diff --git a/src/MainPage.hpp b/src/MainPage.hpp
index 16584a2..e3e9d2e 100644
--- a/src/MainPage.hpp
+++ b/src/MainPage.hpp
@@ -16,17 +16,11 @@ public:
 
 private:
 	static void onScreenReaderVconfKeyChanged(keynode_t *key, void *user_data);
-	static void onScreenReaderItemClicked(void *data, Evas_Object *obj, void *event_info);
-	static void onUniversalSwitchItemClicked(void *data, Evas_Object *obj, void *event_info);
-	static void onAccessibilityLauncherItemClicked(void *data, Evas_Object *obj, void *event_info);
 
-	SettingAccessibility *context_ = nullptr; //TODO remove, it's just temporary solution
+	SettingAccessibility *context_ = nullptr;
 	std::unique_ptr<ScreenReaderPage> screenReaderPage_;
 	std::unique_ptr<UniversalSwitchPage> universalSwitchPage_;
 	std::unique_ptr<AccessibilityLauncherPage> accessibilityLauncherPage_;
-	GenGroupItemData *screenReaderItem_;
-	GenGroupItemData *universalSwitchItem_;
-	GenGroupItemData *accessibilityLauncherItem_;
 };
 
 #endif
diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index 177e9b2..a12aa96 100644
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -313,7 +313,7 @@ Genlist *SetValuePage::createGenlist(Widget *parent, const char *title)
 	genlist->setStyle("dialogue");
 
 	if (title)
-		createGendialTitleItem(genlist->getObject(), &itc_group_item, title);
+		genlist->appendItem({"group_index", title});
 
 	parent->setPartContent(PRT_SET_VALUE_LIST, genlist);
 
diff --git a/src/UniversalSwitchSettingsPage.cpp b/src/UniversalSwitchSettingsPage.cpp
index ab11899..a3ad414 100644
--- a/src/UniversalSwitchSettingsPage.cpp
+++ b/src/UniversalSwitchSettingsPage.cpp
@@ -171,7 +171,7 @@ void UniversalSwitchSettingsPage::createManageGroup()
 void UniversalSwitchSettingsPage::createFeedbackGroup()
 {
 	const char *str = "Undefined";
-	createGendialTitleItem(genlist_->getObject(), &itc_group_item, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK");
+	genlist_->appendItem({"group_index", "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK"});
 
 	for (auto i = 0u; i < CURSOR_COLORS_COUNT; i++)
 		if (_cursor_color[i].id == context_->us_configuration.cursor_color) {
@@ -204,7 +204,7 @@ void UniversalSwitchSettingsPage::createFeedbackGroup()
 void UniversalSwitchSettingsPage::createAdditionalSettingsGroup()
 {
 	std::string str;
-	createGendialTitleItem(genlist_->getObject(), &itc_group_item, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS");
+	genlist_->appendItem({"group_index", "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS"});
 
 	str = getValueUnitText(NULL, &context_->us_configuration.pause_on_first_value, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SECONDS"),
 						   !context_->us_configuration.pause_on_first_state, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF"));
@@ -265,7 +265,7 @@ void UniversalSwitchSettingsPage::autoTapKBDMenuItemSelected(void *data, Evas_Ob
 void UniversalSwitchSettingsPage::createScanningGroup()
 {
 	std::string str;
-	createGendialTitleItem(genlist_->getObject(), &itc_group_item, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING");
+	genlist_->appendItem({"group_index", "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING"});
 
 	GenGroupItemData *item = addMenuItem(_("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SCANNING_AUTO_SCAN"), {}, onAutoScanItemSelection, true, context_->us_configuration.auto_scan, autoScanCheckboxCb);
 	item->userdata = this;
@@ -1109,7 +1109,7 @@ void UniversalSwitchSettingsPage::createScanDirectionCtxPopup()
 	evas_pointer_output_xy_get(evas_object_evas_get(context_->md.getWindow()->getObject()), NULL, &y);
 
 	auto geometry = ctxPopup->getGeometry();
-	ctxPopup->setPosition({-1, y + geometry.size.height/2});
+	ctxPopup->setPosition({-1, y + geometry.size.height / 2});
 
 }
 
@@ -1156,7 +1156,7 @@ void UniversalSwitchSettingsPage::createScanMethodCtxPopup()
 	evas_pointer_output_xy_get(evas_object_evas_get(context_->md.getWindow()->getObject()), NULL, &y);
 
 	auto geometry = ctxPopup->getGeometry();
-	ctxPopup->setPosition({-1, y + geometry.size.height/2});
+	ctxPopup->setPosition({-1, y + geometry.size.height / 2});
 }
 
 void UniversalSwitchSettingsPage::scanMethodCtxPopupItemClicked(ScanMethod scan_method)
diff --git a/src/UpdateSwitchPage.cpp b/src/UpdateSwitchPage.cpp
index 0933c2b..ab8df1f 100644
--- a/src/UpdateSwitchPage.cpp
+++ b/src/UpdateSwitchPage.cpp
@@ -133,7 +133,8 @@ Genlist *UpdateSwitchPage::createGenlist(Widget *parent, const char *title)
 	genlist->setStyle("dialogue");
 
 	if (title)
-		createGendialTitleItem(genlist->getObject(), &itc_group_item, title);
+		genlist->appendItem({"group_index", title});
+
 
 	parent->setPartContent(PRT_SET_VALUE_LIST, genlist);
 
diff --git a/src/setting-common-draw-genlist.cpp b/src/setting-common-draw-genlist.cpp
index 0a621d6..8f75e9f 100644
--- a/src/setting-common-draw-genlist.cpp
+++ b/src/setting-common-draw-genlist.cpp
@@ -301,28 +301,6 @@ static void _gl_Gendial_del(void *data, Evas_Object *obj)
 }
 
 /**
- * Create separator style item with title
- *
- * @return a pointer to GenGroupItemData
- */
-GenGroupItemData *createGendialTitleItem(
-	Evas_Object *genlist, const Elm_Genlist_Item_Class *itc,
-	const std::string &keyStr)
-{
-	auto item_data = new GenGroupItemData;
-	setting_retvm_if(!item_data, NULL, "new failed");
-	item_data->keyStr = keyStr;
-	if (itc && itc->item_style)
-		item_data->itc = itc->item_style;
-
-	item_data->item = elm_genlist_item_append(genlist, itc, item_data, NULL, ELM_GENLIST_ITEM_NONE, _gl_Gendial_sel, NULL);
-
-	elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_NONE);
-
-	return item_data;
-}
-
-/**
  * Create common style item with menu icon
  *
  * @return a pointer to GenGroupItemData
diff --git a/src/setting-common-draw-widget.h b/src/setting-common-draw-widget.h
index 0e17eef..ca2fbf7 100755
--- a/src/setting-common-draw-widget.h
+++ b/src/setting-common-draw-widget.h
@@ -40,14 +40,6 @@ extern const Elm_Genlist_Item_Class itc_group_item;
 extern const Elm_Genlist_Item_Class itc_multiline_2text;
 
 /**
- * Create separator style item with title
- * @return a pointer to GenGroupItemData
- */
-extern GenGroupItemData *createGendialTitleItem(
-	Evas_Object *genlist, const Elm_Genlist_Item_Class *itc,
-	const std::string &keyStr);
-
-/**
  * Common function to create a genlist item
  * @return a pointer to GenGroupItemData
  */
diff --git a/src/utils.hpp b/src/utils.hpp
index 870e0e8..46d21ce 100644
--- a/src/utils.hpp
+++ b/src/utils.hpp
@@ -19,6 +19,8 @@
 
 #include "Elementary.h"
 
+#include <memory>
+
 using SettingCallback = void (*)(void *, Evas_Object *, void *);
 
 namespace utils
@@ -35,6 +37,13 @@ namespace utils
 			if (t) evas_object_del(t);
 		}
 	};
+
+	struct ElmGenlistItemClassDeleter {
+		void operator()(Elm_Genlist_Item_Class *it) const
+		{
+			if (it) elm_genlist_item_class_free(it);
+		}
+	};
 }
 
 
-- 
2.7.4


From e5cb08fda42ce462c7a0f404ec699713fd2a4d65 Mon Sep 17 00:00:00 2001
From: Lukasz Wlazly <l.wlazly@partner.samsung.com>
Date: Mon, 25 Feb 2019 11:14:34 +0100
Subject: [PATCH 11/16] Add new type of GenlistItem - Toggle

This change introduce new type of GenlistItem
and use it in AccessibilityLauncherPage

Change-Id: If33d96ea7bde36cd5947435f5223b9e2c5e76b86
---
 src/AccessibilityLauncherPage.cpp | 169 +++++++++++---------------------------
 src/AccessibilityLauncherPage.hpp |  21 +----
 src/Genlist.cpp                   |   1 +
 src/GenlistItem.cpp               |  69 +++++++++++++++-
 src/GenlistItem.hpp               |   9 ++
 5 files changed, 132 insertions(+), 137 deletions(-)

diff --git a/src/AccessibilityLauncherPage.cpp b/src/AccessibilityLauncherPage.cpp
index d309e1e..1c69fce 100644
--- a/src/AccessibilityLauncherPage.cpp
+++ b/src/AccessibilityLauncherPage.cpp
@@ -26,154 +26,85 @@
 
 #include <string>
 
-namespace
-{
-	const std::string LAUNCHER_NAMES[3] = {
-		"IDS_ST_BODY_ACCESSIBILITY",
-		"IDS_ST_MBODY_SCREEN_READER_HTTS",
-		"IDS_ACCS_UNIVERSAL_SWITCH"
-	};
-}
-
-
 AccessibilityLauncherPage::AccessibilityLauncherPage(SettingAccessibility *ad)
 {
-	auto items = new ItemWrapper[utils::lenOf(LAUNCHER_NAMES)];
-
-	retm_if(items == NULL, "new failed");
-	for (auto i = 0u; i < utils::lenOf(LAUNCHER_NAMES); ++i)
-		items[i].name = LAUNCHER_NAMES[i];
-
+	items_.resize(3);
 	int state = 0;
 
 	auto naviframe = ad->md.getNaviframe();
 	auto genlist = Widget::make<Genlist>(naviframe);
 	genlist->setMode(ELM_LIST_COMPRESS);
 	genlist->setStyle("dialogue");
-	genlist->clear(); // TODO check if necessary
 
 	auto ret = vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_STATE, &state);
 	if (ret != VCONF_OK) {
 		SETTING_TRACE("FAIL: vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_STATE)");
 	}
 
-	auto item = createGendialGroupItem(
-					genlist->getObject(), &itc_1text_1icon, onMouseUpGendialListCb, items, SwallowType::ICON_RADIO, state,
-					state ? "IDS_ACCS_ACCESSIBILITY_LAUNCHER_ON" : "IDS_ACCS_ACCESSIBILITY_LAUNCHER_OFF",
-					{}, checkboxCb);
+	auto item = genlist->appendItem({"type1", state ? "IDS_ACCS_ACCESSIBILITY_LAUNCHER_ON" : "IDS_ACCS_ACCESSIBILITY_LAUNCHER_OFF", {},
+									 [this](auto item)
+	{
+		SETTING_TRACE_ERROR("onSelection_ lambda");
+		item->setText(item->getState() ? "IDS_ACCS_ACCESSIBILITY_LAUNCHER_ON" : "IDS_ACCS_ACCESSIBILITY_LAUNCHER_OFF");
 
-	if (item)
-		item->userdata = items;
+		vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_STATE, item->getState());
 
-	item = createGendialGroupItem(
-			   genlist->getObject(), &ad->itc_multiline_sub,
-			   NULL, ad, SwallowType::INVALID, 0,
-			   {},
-			   "IDS_ACCS_ACCESSIBILITY_LAUNCHER_COMMENT",
-			   NULL);
+		if (item->getState())
+			for (auto it : items_) it->enable();
+		else
+			for (auto it : items_) it->disable();
 
-	if (item) {
-		elm_genlist_item_select_mode_set(item->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-	}
+		item->update();
+	}, GenlistItem::WidgetType::toggle
+									});
+
+	genlist->appendItem({"multiline", {}, "IDS_ACCS_ACCESSIBILITY_LAUNCHER_COMMENT"});
 
 	int vconf_state;
 	ret = vconf_get_int(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_LAUNCH, &vconf_state);
 	if (ret != VCONF_OK) {
 		SETTING_TRACE("FAIL: vconf_get_int(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_LAUNCH)");
 	}
-	for (auto i = 0u; i < utils::lenOf(LAUNCHER_NAMES); i++) {
-		GenGroupItemData *item = createGendialGroupItem(
-									 genlist->getObject(), &itc_1text_1icon,
-									 onItemSelectedCb, ad, SwallowType::ICON_RADIO, vconf_state & (1 << i),
-									 items[i].name,
-									 {}, onCheckboxChangeCb);
-
-		if (item) {
-			item->userdata = items;
-			item->chk_id = i;
-			items[i].item = item;
-			elm_object_item_disabled_set(item->item, state ? EINA_FALSE : EINA_TRUE);
-		}
 
-	}
+	items_[0] = genlist->appendItem({"type1", "IDS_ST_BODY_ACCESSIBILITY", {}, [this](auto item)
+	{
+		int value = 0;
+		for (auto i = 0u; i < items_.size(); i++)
+			if (items_[i]->getState())
+				value = value | (1 << i);
+		vconf_set_int(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_LAUNCH, value);
+	}, GenlistItem::WidgetType::toggle
+									});
+
+	items_[1] = genlist->appendItem({"type1", "IDS_ST_MBODY_SCREEN_READER_HTTS", {}, [this](auto item)
+	{
+		int value = 0;
+		for (auto i = 0u; i < items_.size(); i++)
+			if (items_[i]->getState())
+				value = value | (1 << i);
+		vconf_set_int(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_LAUNCH, value);
+	}, GenlistItem::WidgetType::toggle
+									});
+
+	items_[2] = genlist->appendItem({"type1", "IDS_ACCS_UNIVERSAL_SWITCH", {}, [this](auto item)
+	{
+		int value = 0;
+		for (auto i = 0u; i < items_.size(); i++)
+			if (items_[i]->getState())
+				value = value | (1 << i);
+		vconf_set_int(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_LAUNCH, value);
+	}, GenlistItem::WidgetType::toggle
+									});
+
+	if (item->getState())
+		for (auto it : items_) it->enable();
+	else
+		for (auto it : items_) it->disable();
 
 	ad->md.naviframe_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_ACCESSIBILITY_LAUNCHER"), NULL, NULL, genlist->getObject(), NULL);
-	elm_naviframe_item_pop_cb_set(ad->md.naviframe_it, onNaviframePopCb, items);
-	elm_object_item_domain_text_translatable_set(ad->md.naviframe_it, PACKAGE, EINA_TRUE);
 
 	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
 		naviframe->popBack();
 	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
 	naviframe->setPartContent("prev_btn", prevBtn);
-
-}
-
-Eina_Bool AccessibilityLauncherPage::onNaviframePopCb(void *data, Elm_Object_Item *it)
-{
-	retv_if(data == NULL, EINA_TRUE);
-	auto items = static_cast<ItemWrapper *>(data);
-	delete[] items;
-
-	return EINA_TRUE;
-}
-
-void AccessibilityLauncherPage::updateVconf(ItemWrapper *items)
-{
-	int value = 0;
-	for (auto i = 0u; i < utils::lenOf(LAUNCHER_NAMES); i++)
-		if (items[i].item->chk_status)
-			value = value | (1 << i);
-	vconf_set_int(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_LAUNCH, value);
-}
-
-void AccessibilityLauncherPage::onCheckboxChangeCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Input parameter is NULL");
-	auto list_item = static_cast<GenGroupItemData *>(data);
-	list_item->chk_status = !list_item->chk_status;
-	updateVconf(static_cast<ItemWrapper *>(list_item->userdata));
-}
-
-void AccessibilityLauncherPage::onItemSelectedCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(event_info == NULL, "Invalid argument: event_info is NULL");
-	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-	elm_genlist_item_selected_set(item, EINA_FALSE);
-	auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
-	setting_update_gl_item_chk_status(list_item, list_item->chk_status ? 0 : 1);
-	updateVconf(static_cast<ItemWrapper *>(list_item->userdata));
-}
-
-void AccessibilityLauncherPage::updateName(GenGroupItemData *item)
-{
-	item->keyStr = item->chk_status ? _("IDS_ACCS_ACCESSIBILITY_LAUNCHER_ON") : _("IDS_ACCS_ACCESSIBILITY_LAUNCHER_OFF");
-	elm_genlist_item_update(item->item);
-}
-
-void AccessibilityLauncherPage::updateMainSwitch(GenGroupItemData *list_item)
-{
-	retm_if(list_item == NULL, "Data parameter is NULL");
-	updateName(list_item);
-	vconf_set_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_ACCESSIBILITY_LAUNCHER_STATE, list_item->chk_status);
-	auto items = static_cast<ItemWrapper *>(list_item->userdata);
-	for (auto i = 0u; i < utils::lenOf(LAUNCHER_NAMES); i++)
-		elm_object_item_disabled_set(items[i].item->item, list_item->chk_status ? EINA_FALSE : EINA_TRUE);
-}
-
-void AccessibilityLauncherPage::checkboxCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data parameter is NULL");
-	auto list_item = static_cast<GenGroupItemData *>(data);
-	list_item->chk_status = !list_item->chk_status;
-	updateMainSwitch(list_item);
-}
-
-void AccessibilityLauncherPage::onMouseUpGendialListCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Invalid argument: data is NULL");
-	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-	elm_genlist_item_selected_set(item, EINA_FALSE);
-	auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
-	setting_update_gl_item_chk_status(list_item, list_item->chk_status ? 0 : 1);
-	updateMainSwitch(list_item);
 }
diff --git a/src/AccessibilityLauncherPage.hpp b/src/AccessibilityLauncherPage.hpp
index de1f36d..52a4e2c 100644
--- a/src/AccessibilityLauncherPage.hpp
+++ b/src/AccessibilityLauncherPage.hpp
@@ -18,23 +18,17 @@
 #define ACCESSIBILITY_LAUNCHER_PAGE_HPP
 
 #include <Elementary.h>
-#include "GenGroupItemData.hpp"
+#include "GenlistItem.hpp"
 
-class SettingAccessibility;
+#include <vector>
 
-struct ItemWrapper {
-	std::string name;
-	GenGroupItemData *item;
-};
+class SettingAccessibility;
 
 /**
  * View allowing to turn on/off Accessibility Launcher and to start configuration of its options
  *
  * @param ad global context of application
  *
- * TODO:
- *  1. extract from ad fields related only with this class
- *  2. replace classical callbacks with lambda expressions
  */
 class AccessibilityLauncherPage
 {
@@ -42,14 +36,7 @@ public:
 	AccessibilityLauncherPage(SettingAccessibility *ad);
 
 private:
-	static Eina_Bool onNaviframePopCb(void *data, Elm_Object_Item *it);
-	static void updateVconf(ItemWrapper *items);
-	static void onCheckboxChangeCb(void *data, Evas_Object *obj, void *event_info);
-	static void onItemSelectedCb(void *data, Evas_Object *obj, void *event_info);
-	static void updateName(GenGroupItemData *item);
-	static void updateMainSwitch(GenGroupItemData *list_item);
-	static void checkboxCb(void *data, Evas_Object *obj, void *event_info);
-	static void onMouseUpGendialListCb(void *data, Evas_Object *obj, void *event_info);
+	std::vector<GenlistItem *> items_;
 };
 
 #endif
diff --git a/src/Genlist.cpp b/src/Genlist.cpp
index c45c0b5..f1ad159 100644
--- a/src/Genlist.cpp
+++ b/src/Genlist.cpp
@@ -30,6 +30,7 @@ GenlistItem *Genlist::appendItem(GenlistItem item, GenlistItem *parent)
 	auto type = itemPtr->getItemType();
 	auto parentPtr = parent ? parent->objItem_ : nullptr;
 
+	itemPtr->genlist_ = this;
 	itemPtr->objItem_ = elm_genlist_item_append(uniqueObj_.get(), itc.get(), itemPtr.get(), parentPtr, type, GenlistItem::onItemSelection, itemPtr.get());
 
 	if (!itemPtr->onSelection_)
diff --git a/src/GenlistItem.cpp b/src/GenlistItem.cpp
index 4b11a16..59fdfa0 100644
--- a/src/GenlistItem.cpp
+++ b/src/GenlistItem.cpp
@@ -1,15 +1,26 @@
 #include "GenlistItem.hpp"
 
 #include "setting-debug.h"
+#include "Check.hpp"
+#include "Genlist.hpp"
 
 GenlistItem::GenlistItem(std::string style, TranslatedString text, TranslatedString desc, Type type)
 	: style_(std::move(style)), text_(std::move(text)), description_(std::move(desc)), type_(type)
 {}
 
 GenlistItem::GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, Type type)
-	: style_(std::move(style)), text_(std::move(text)), description_(std::move(desc)), onSelection_(onSelection), type_(type)
+	: style_(std::move(style)), text_(std::move(text)), description_(std::move(desc)), onSelection_(std::move(onSelection)), type_(type)
 {}
 
+GenlistItem::GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, WidgetType type)
+	: style_(std::move(style)), text_(std::move(text)), description_(std::move(desc)), onSelection_(std::move(onSelection)), widgetType_(type)
+{}
+
+void GenlistItem::setText(const TranslatedString &text)
+{
+	text_ = text;
+}
+
 void GenlistItem::setDescription(const TranslatedString &desc)
 {
 	description_ = desc;
@@ -20,6 +31,21 @@ void GenlistItem::update()
 	elm_genlist_item_update(objItem_);
 }
 
+bool GenlistItem::getState()
+{
+	return state_;
+}
+
+void GenlistItem::disable()
+{
+	elm_object_item_disabled_set(objItem_, EINA_TRUE);
+}
+
+void GenlistItem::enable()
+{
+	elm_object_item_disabled_set(objItem_, EINA_FALSE);
+}
+
 GenlistItem::ElmGenlistItemClassPtr GenlistItem::generateITCObject()
 {
 	auto *itc = elm_genlist_item_class_new();
@@ -64,12 +90,53 @@ char *GenlistItem::textRealizator(void *data, Evas_Object *obj, const char *part
 
 Evas_Object *GenlistItem::contentRealizator(void *data, Evas_Object *obj, const char *part)
 {
+	auto self = static_cast<GenlistItem *>(data);
+	switch (self->widgetType_) {
+	case WidgetType::toggle:
+		return self->realizeToggle(part);
+
+	default:
+		break;
+	}
 	return nullptr;
 }
 
+Evas_Object *GenlistItem::realizeToggle(const std::string &part)
+{
+	if (part != "elm.swallow.end") return nullptr;
+
+	SETTING_TRACE_ERROR(".");
+
+	auto check = Widget::make<Check>(genlist_);
+	check->setStyle("on&off");
+
+	//TODO replace with class method
+	elm_check_state_pointer_set(check->getObject(), &state_);
+	evas_object_propagate_events_set(check->getObject(), 0);
+	evas_object_pass_events_set(check->getObject(), 0);
+
+	elm_atspi_accessible_relationship_append(check->getObject(), ELM_ATSPI_RELATION_CONTROLLED_BY, objItem_);
+	elm_atspi_accessible_relationship_append(objItem_, ELM_ATSPI_RELATION_DESCRIBED_BY, check->getObject());
+	elm_atspi_accessible_relationship_append(objItem_, ELM_ATSPI_RELATION_CONTROLLER_FOR, check->getObject());
+
+	check->setEvasSmartCallback("changed", [this]() {
+		SETTING_TRACE_ERROR("smart callback \"changed\"");
+		onSelection_(this);
+	});
+
+	return check->getObject();
+}
+
 void GenlistItem::onItemSelection(void *data, Evas_Object *obj, void *event_info)
 {
+	SETTING_TRACE_ERROR(".");
 	auto self = static_cast<GenlistItem *>(data);
+
+	if (self->widgetType_ == WidgetType::toggle) {
+		self->state_ = !self->state_;
+		elm_genlist_item_fields_update(self->objItem_, "*", ELM_GENLIST_ITEM_FIELD_CONTENT);
+	}
+
 	if (self->onSelection_)
 		self->onSelection_(self);
 	elm_genlist_item_selected_set(self->objItem_, EINA_FALSE);
diff --git a/src/GenlistItem.hpp b/src/GenlistItem.hpp
index 00ea945..448ed6d 100644
--- a/src/GenlistItem.hpp
+++ b/src/GenlistItem.hpp
@@ -9,6 +9,7 @@
 #include <memory>
 #include "utils.hpp"
 
+class Genlist;
 class GenlistItem
 {
 	friend class Genlist;
@@ -19,15 +20,21 @@ public:
 
 	GenlistItem(std::string style, TranslatedString text, TranslatedString desc = {}, Type type = Type::group);
 	GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, Type type = Type::regular);
+	GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, WidgetType type);
 
+	void setText(const TranslatedString &text);
 	void setDescription(const TranslatedString &desc);
 	void update();
+	bool getState();
+	void disable();
+	void enable();
 
 
 private:
 	using ElmGenlistItemClassPtr = std::unique_ptr<Elm_Genlist_Item_Class, utils::ElmGenlistItemClassDeleter>;
 	ElmGenlistItemClassPtr generateITCObject();
 	Elm_Genlist_Item_Type getItemType();
+	Evas_Object *realizeToggle(const std::string &part);
 
 	static char *textRealizator(void *data, Evas_Object *obj, const char *part);
 	static Evas_Object *contentRealizator(void *data, Evas_Object *obj, const char *part);
@@ -37,6 +44,8 @@ private:
 	TranslatedString text_;
 	TranslatedString description_;
 	std::function<void(GenlistItem *)> onSelection_;
+	Genlist *genlist_ = nullptr;
+	Eina_Bool state_ = EINA_FALSE;
 
 	Elm_Object_Item *objItem_ = nullptr;
 	Type type_ = Type::regular;
-- 
2.7.4


From 5dbda862f613af2b2f44c94536ac99c5e1489bf0 Mon Sep 17 00:00:00 2001
From: Tomasz Jeschke <t.jeschke@samsung.com>
Date: Wed, 27 Feb 2019 13:04:47 +0100
Subject: [PATCH 12/16] Use Check class instead of Evas_Object

Change-Id: I0e81c2e108d04cddc9c97050b4fb5845092397a2
---
 src/Button.cpp           |  3 +--
 src/Check.cpp            | 26 ++++++++++++++++++++++----
 src/Check.hpp            |  7 +++++--
 src/GenlistItem.cpp      |  8 ++++----
 src/Layout.cpp           |  5 +++++
 src/Layout.hpp           |  4 ++++
 src/Naviframe.cpp        |  3 ++-
 src/Naviframe.hpp        |  4 ++--
 src/RemoveSwitchPage.cpp | 42 +++++++++++++++++++-----------------------
 src/RemoveSwitchPage.hpp |  4 ++--
 src/SetValuePage.cpp     | 48 +++++++++++++++++++-----------------------------
 src/SetValuePage.hpp     |  6 +++---
 src/Widget.cpp           |  5 +++++
 src/Widget.hpp           |  1 +
 src/WidgetFactory.cpp    |  1 +
 src/WidgetFactory.hpp    |  1 +
 16 files changed, 96 insertions(+), 72 deletions(-)

diff --git a/src/Button.cpp b/src/Button.cpp
index abc0ad6..2a3711f 100644
--- a/src/Button.cpp
+++ b/src/Button.cpp
@@ -14,7 +14,6 @@ Button::Button(Widget *parent, std::function<void()> onClick, const TranslatedSt
 	: Button(parent)
 {
 	setText(text);
-	if (!style.empty())
-		setStyle(style);
+	setStyle(style);
 	setEvasSmartCallback("clicked", onClick);
 }
diff --git a/src/Check.cpp b/src/Check.cpp
index 7ef4854..75ee2e4 100644
--- a/src/Check.cpp
+++ b/src/Check.cpp
@@ -7,12 +7,30 @@ Check::Check(Widget *parent)
 	show();
 }
 
-void Check::setState(Eina_Bool state)
+Check::Check(Widget *parent, bool state, const std::string &style, std::function<void()> onChanged)
+	: Check(parent)
 {
-	elm_check_state_set(uniqueObj_.get(), state);
+	setState(state);
+	setStyle(style);
+	setEvasSmartCallback("changed", std::move(onChanged));
 }
 
-Eina_Bool Check::getState() const
+void Check::setState(bool state)
 {
-	return elm_check_state_get(uniqueObj_.get());
+	elm_check_state_set(uniqueObj_.get(), state ? EINA_TRUE : EINA_FALSE);
 }
+
+bool Check::getState() const
+{
+	return elm_check_state_get(uniqueObj_.get()) ? true : false;
+}
+
+void Check::setStatePointer(Eina_Bool *statePtr)
+{
+	if (statePtr) elm_check_state_pointer_set (uniqueObj_.get(), statePtr);
+}
+
+void Check::setPassEvents(bool pass)
+{
+	evas_object_pass_events_set(uniqueObj_.get(), pass ? EINA_TRUE : EINA_FALSE);
+}
\ No newline at end of file
diff --git a/src/Check.hpp b/src/Check.hpp
index 7da63c5..cfc37fe 100644
--- a/src/Check.hpp
+++ b/src/Check.hpp
@@ -7,9 +7,12 @@ class Check : public Widget
 {
 public:
 	Check(Widget *parent);
+	Check(Widget *parent, bool state, const std::string &style, std::function<void()> onChanged);
 
-	void setState(Eina_Bool state);
-	Eina_Bool getState() const;
+	void setState(bool state);
+	bool getState() const;
+	void setStatePointer(Eina_Bool *statePtr);
+	void setPassEvents(bool pass);
 };
 
 #endif
diff --git a/src/GenlistItem.cpp b/src/GenlistItem.cpp
index 59fdfa0..00856a6 100644
--- a/src/GenlistItem.cpp
+++ b/src/GenlistItem.cpp
@@ -110,11 +110,11 @@ Evas_Object *GenlistItem::realizeToggle(const std::string &part)
 	auto check = Widget::make<Check>(genlist_);
 	check->setStyle("on&off");
 
-	//TODO replace with class method
-	elm_check_state_pointer_set(check->getObject(), &state_);
-	evas_object_propagate_events_set(check->getObject(), 0);
-	evas_object_pass_events_set(check->getObject(), 0);
+	check->setStatePointer(&state_);
+	check->setPropagateEvents(false);
+	check->setPassEvents(false);
 
+	//TODO replace with class method
 	elm_atspi_accessible_relationship_append(check->getObject(), ELM_ATSPI_RELATION_CONTROLLED_BY, objItem_);
 	elm_atspi_accessible_relationship_append(objItem_, ELM_ATSPI_RELATION_DESCRIBED_BY, check->getObject());
 	elm_atspi_accessible_relationship_append(objItem_, ELM_ATSPI_RELATION_CONTROLLER_FOR, check->getObject());
diff --git a/src/Layout.cpp b/src/Layout.cpp
index 9f3b2c5..49af82e 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -23,6 +23,11 @@ Layout::Layout(Widget *parent, const std::string &edjeFile, const std::string &g
 	setFile(edjePath, group);
 }
 
+void Layout::setContent(const std::string &swallow, Widget *widget)
+{
+	elm_layout_content_set(uniqueObj_.get(), swallow.c_str(), widget->getObject());
+}
+
 void Layout::setFile(const std::string &edjeFile, const std::string &group)
 {
 	elm_layout_file_set(uniqueObj_.get(), edjeFile.c_str(), group.c_str());
diff --git a/src/Layout.hpp b/src/Layout.hpp
index 6e0420e..a1e0e86 100644
--- a/src/Layout.hpp
+++ b/src/Layout.hpp
@@ -8,9 +8,13 @@ class Layout : public Widget
 public:
 	Layout(Widget *parent);
 	Layout(Widget *parent, const std::string &edjeFile, const std::string &group);
+	void setContent(const std::string &swallow, Widget *widget);
 	void setFile(const std::string &edjeFile, const std::string &group);
 	void setTheme(const std::string &klass, const std::string &group, const std::string &style);
 	void setText(const std::string &part, const TranslatedString &text);
+
+protected:
+	Layout() = default;
 };
 
 #endif
diff --git a/src/Naviframe.cpp b/src/Naviframe.cpp
index 5bfa42e..384d532 100644
--- a/src/Naviframe.cpp
+++ b/src/Naviframe.cpp
@@ -5,9 +5,10 @@
 #include <efl_extension.h>
 
 Naviframe::Naviframe(Widget *parent)
-	: Widget(parent)
+	: Layout()
 {
 	uniqueObj_.reset(elm_naviframe_add(parent->getObject()));
+	parent_ = parent;
 	eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
 	eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL);
 	elm_naviframe_content_preserve_on_pop_set(uniqueObj_.get(), EINA_TRUE);
diff --git a/src/Naviframe.hpp b/src/Naviframe.hpp
index acb85dd..6fb861f 100644
--- a/src/Naviframe.hpp
+++ b/src/Naviframe.hpp
@@ -1,11 +1,11 @@
 #ifndef NAVIFRAME_HPP
 #define NAVIFRAME_HPP
 
-#include "Widget.hpp"
+#include "Layout.hpp"
 #include <stack>
 #include <utility>
 
-class Naviframe : public Widget
+class Naviframe : public Layout
 {
 public:
 	Naviframe(Widget *parent);
diff --git a/src/RemoveSwitchPage.cpp b/src/RemoveSwitchPage.cpp
index 3e52aa6..181ef1b 100644
--- a/src/RemoveSwitchPage.cpp
+++ b/src/RemoveSwitchPage.cpp
@@ -39,8 +39,24 @@ RemoveSwitchPage::RemoveSwitchPage(SettingAccessibility *ad)
 
 	elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_SELECT_ITEMS"), NULL, NULL, layout_->getObject(), NULL);
 
-	all_checkbox = WidgetFactory::createCheck(naviframe->getObject(), EINA_FALSE, nullptr, {}, onAllButtonsClicked, this);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", all_checkbox);
+	allCheckbox_ = Widget::make<Check>(naviframe, false, std::string{}, [this]() {
+		retm_if(genlist_ == NULL, "No genlist provided");
+
+		auto genlist_size = genlist_->size();
+		bool all_selected = (switchesToRemoveCounter_ == genlist_size);
+
+		Elm_Object_Item *item = elm_genlist_first_item_get(genlist_->getObject());
+		while (item != NULL) {
+			auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
+			setting_update_gl_item_chk_status(list_item, !all_selected);
+			item = elm_genlist_item_next_get(item);
+		}
+
+		switchesToRemoveCounter_ = all_selected ? 0 : genlist_size;
+		useNaviframeTitleAsCounter(static_cast<RemoveSwitchPage *>(this));
+	});
+
+	naviframe->setContent("prev_btn", allCheckbox_);
 
 	removeSwitchPopupBtn_ = Widget::make<Button>(naviframe, [this]() {
 		createPopupForSwitchesRemoving();
@@ -103,30 +119,10 @@ void RemoveSwitchPage::attachCallback(UniversalSwitchCb cb, void *cbData)
 	switch_removed_cb_data = cbData;
 }
 
-void RemoveSwitchPage::onAllButtonsClicked(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Input parameter is NULL");
-	auto self = static_cast<RemoveSwitchPage *>(data);
-	retm_if(self->genlist_ == NULL, "No genlist provided");
-
-	auto genlist_size = self->genlist_->size();
-	bool all_selected = (self->switchesToRemoveCounter_ == genlist_size);
-
-	Elm_Object_Item *item = elm_genlist_first_item_get(self->genlist_->getObject());
-	while (item != NULL) {
-		auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
-		setting_update_gl_item_chk_status(list_item, !all_selected);
-		item = elm_genlist_item_next_get(item);
-	}
-
-	self->switchesToRemoveCounter_ = all_selected ? 0 : genlist_size;
-	useNaviframeTitleAsCounter(self);
-}
-
 void RemoveSwitchPage::useNaviframeTitleAsCounter(RemoveSwitchPage *self)
 {
 	Eina_Bool state = self->switchesToRemoveCounter_ == self->genlist_->size();
-	elm_check_state_set(self->all_checkbox, state);
+	self->allCheckbox_->setState(state);
 
 	std::string title;
 	if (self->switchesToRemoveCounter_ > SWITCH_COUNTER_MAX) {
diff --git a/src/RemoveSwitchPage.hpp b/src/RemoveSwitchPage.hpp
index 50dc7e4..edff62b 100644
--- a/src/RemoveSwitchPage.hpp
+++ b/src/RemoveSwitchPage.hpp
@@ -21,6 +21,7 @@
 #include "SetValuePage.hpp"
 #include "Popup.hpp"
 #include "Button.hpp"
+#include "Check.hpp"
 
 class SetValuePage;
 
@@ -42,7 +43,6 @@ public:
 	static void useNaviframeTitleAsCounter(RemoveSwitchPage *self);
 
 private:
-	static void onAllButtonsClicked(void *data, Evas_Object *obj, void *event_info);
 	void createPopupForSwitchesRemoving();
 	static void onRemoveSelectedSwitches(void *data, Evas_Object *obj, void *event_info);
 	static void onRemovePopup(void *data, Evas_Object *obj, void *event_info);
@@ -55,7 +55,7 @@ private:
 	UniversalSwitchCb switch_removed_cb;
 	void *switch_removed_cb_data = nullptr;
 	Button *removeSwitchPopupBtn_ = nullptr;
-	Evas_Object *all_checkbox = nullptr;
+	Check *allCheckbox_ = nullptr;
 	Layout *layout_ = nullptr;
 	Genlist *genlist_ = nullptr;
 	size_t switchesToRemoveCounter_ = 0;
diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index a12aa96..1e29edb 100644
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -74,7 +74,9 @@ SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const
 		break;
 	case ValueEditorType::NUMERIC_SWITCH:
 		createScroller();
-		check_ = createCheck(layout_->getObject(), EINA_FALSE, checkStateChangedCb, this);
+		check_ = Widget::make<Check>(layout_, false, "on&off", [this]() { checkStateChangedCb(); });
+		layout_->setPartContent(PRT_SET_VALUE_SWITCH, check_);
+		check_->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		break;
 	case ValueEditorType::RADIOS:
 		genlist_ = createGenlist(layout_, NULL);
@@ -83,7 +85,9 @@ SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const
 		genlist_ = createGenlist(layout_, NULL);
 		break;
 	case ValueEditorType::LIST_SWITCH:
-		check_ = createCheck(layout_->getObject(), EINA_FALSE, checkStateChangedCb, this);
+		check_ = Widget::make<Check>(layout_, false, "on&off", [this]() { checkStateChangedCb(); });
+		layout_->setPartContent(PRT_SET_VALUE_SWITCH, check_);
+		check_->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		genlist_ = createGenlist(layout_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS"));
 		break;
 	default:
@@ -156,7 +160,7 @@ void SetValuePage::setValue(double value, const std::string &units)
 
 void SetValuePage::setSwitch(bool state)
 {
-	elm_check_state_set(check_, (Eina_Bool)state);
+	check_->setState(state);
 
 	if (state)
 		layout_->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_ON");
@@ -211,7 +215,7 @@ GenGroupItemData *SetValuePage::addRadioListItem(const char *main_text, const ch
 							 sub_text ? sub_text : std::string{},
 							 NULL);
 	if (item)
-		elm_object_item_disabled_set(item->item, !elm_check_state_get(check_));
+		elm_object_item_disabled_set(item->item, !check_->getState());
 
 
 	return item;
@@ -249,9 +253,9 @@ void SetValuePage::syncPageWithVconf(keynode_t *node, void *user_data)
 	auto self = static_cast<SetValuePage *>(user_data);
 	int ret = vconf_keynode_get_bool(node);
 	retm_if(ret < 0, "FAIL: vconf_keynode_get_bool");
-	if (elm_check_state_get(self->check_) != ret) {
-		elm_check_state_set(self->check_, ret);
-		checkStateChangedCb(self, self->check_, NULL);
+	if (self->check_->getState() != ret) {
+		self->check_->setState(ret);
+		self->checkStateChangedCb();
 	}
 }
 
@@ -320,16 +324,6 @@ Genlist *SetValuePage::createGenlist(Widget *parent, const char *title)
 	return genlist;
 }
 
-Evas_Object *SetValuePage::createCheck(Evas_Object *parent, bool state, Evas_Smart_Cb onChanged, void *cbData)
-{
-	retvm_if(parent == NULL, NULL, "Input parameter is NULL");
-	auto check = WidgetFactory::createCheck(parent, state, nullptr, "on&off", onChanged, cbData);
-	elm_object_part_content_set(parent, PRT_SET_VALUE_SWITCH, check);
-	evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-	return check;
-}
-
 void SetValuePage::createScroller()
 {
 	scroller_ = Widget::make<Scroller>(layout_);
@@ -387,29 +381,25 @@ void SetValuePage::listItemClickCb(void *data, Evas_Object *obj, void *event_inf
 		opt_item->self->requestListItemOptionsCb_(opt_item->option_id);
 }
 
-void SetValuePage::checkStateChangedCb(void *data, Evas_Object *obj, void *event_info)
+void SetValuePage::checkStateChangedCb()
 {
-	bool state;
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<SetValuePage *>(data);
-
-	state = elm_check_state_get(obj);
+	auto state = check_->getState();
 
 	if (state)
-		self->layout_->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_ON");
+		layout_->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_ON");
 	else
-		self->layout_->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
+		layout_->setPartText(PRT_SET_VALUE_SWITCH_LABEL, "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_OFF");
 
-	if (self->genlist_) {
-		Elm_Object_Item *item = elm_genlist_first_item_get(self->genlist_->getObject());
+	if (genlist_) {
+		Elm_Object_Item *item = elm_genlist_first_item_get(genlist_->getObject());
 		do {
 			elm_object_item_disabled_set(item, !state);
 			item = elm_genlist_item_next_get(item);
 		} while (item != NULL);
 	}
 
-	if (self->changeSwitchCb_)
-		self->changeSwitchCb_(state);
+	if (changeSwitchCb_)
+		changeSwitchCb_(state);
 }
 
 Eina_Bool SetValuePage::naviframePopCb(void *data, Elm_Object_Item *it)
diff --git a/src/SetValuePage.hpp b/src/SetValuePage.hpp
index 9cdcd1c..292fe7c 100644
--- a/src/SetValuePage.hpp
+++ b/src/SetValuePage.hpp
@@ -20,6 +20,7 @@
 #include "SettingAccessibility.hpp"
 #include "GenGroupItemData.hpp"
 #include "Box.hpp"
+#include "Check.hpp"
 #include "Scroller.hpp"
 
 #include <vconf.h>
@@ -73,12 +74,11 @@ private:
 	void callRadioItemChangeCbAndPopNaviframe(GenGroupItemData *list_item);
 	static void switchItemCheckboxCb(void *data, Evas_Object *obj, void *event_info);
 	Genlist *createGenlist(Widget *parent, const char *title);
-	static Evas_Object *createCheck(Evas_Object *parent, bool state, Evas_Smart_Cb onChanged, void *cbData);
 	void createScroller();
 	Layout *createLayout(Widget *parent, const std::string &layout_grp);
 	void displayValue(double value);
 	static void listItemClickCb(void *data, Evas_Object *obj, void *event_info);
-	static void checkStateChangedCb(void *data, Evas_Object *obj, void *event_info);
+	void checkStateChangedCb();
 	static Eina_Bool naviframePopCb(void *data, Elm_Object_Item *it);
 	static void backCb(void *data, Evas_Object *obj, void *event_info);
 
@@ -87,7 +87,7 @@ private:
 	Layout *layout_ = nullptr;
 	Scroller *scroller_ = nullptr;
 	Box *box_ = nullptr;
-	Evas_Object *check_ = nullptr;
+	Check *check_ = nullptr;
 	Genlist *genlist_ = nullptr;
 	std::vector<OptionsItem *> options_data;
 	double minVal_ = 0.0;
diff --git a/src/Widget.cpp b/src/Widget.cpp
index 0f32f3b..5cc000b 100644
--- a/src/Widget.cpp
+++ b/src/Widget.cpp
@@ -95,6 +95,11 @@ void Widget::setHomogeneousDimensions()
 	elm_box_homogeneous_set(uniqueObj_.get(), EINA_TRUE);
 }
 
+void Widget::setPropagateEvents(bool prop)
+{
+	evas_object_propagate_events_set(uniqueObj_.get(), prop ? EINA_TRUE : EINA_FALSE);
+}
+
 void Widget::disable(bool disable)
 {
 	disable ? elm_object_disabled_set(uniqueObj_.get(), EINA_TRUE) : elm_object_disabled_set(uniqueObj_.get(), EINA_FALSE);
diff --git a/src/Widget.hpp b/src/Widget.hpp
index b3b3236..a1f1854 100644
--- a/src/Widget.hpp
+++ b/src/Widget.hpp
@@ -51,6 +51,7 @@ public:
 	void setContent(Widget *widget);
 	void setPartContent(const std::string &part, Widget *content);
 	void setHomogeneousDimensions();
+	void setPropagateEvents(bool prop);
 	void disable(bool disable);
 	void emitSignal(const std::string &signal);
 	void show();
diff --git a/src/WidgetFactory.cpp b/src/WidgetFactory.cpp
index 410cdd7..5c370c6 100644
--- a/src/WidgetFactory.cpp
+++ b/src/WidgetFactory.cpp
@@ -35,6 +35,7 @@ Evas_Object *WidgetFactory::createRadio(Evas_Object *parent, int value, Elm_Radi
 	return radio;
 }
 
+/* TODO: remove after createCheck is replaced in setting-common-draw-genlist.cpp */
 Evas_Object *WidgetFactory::createCheck(Evas_Object *parent, Eina_Bool state, Eina_Bool *statePtr, const std::string &style, Evas_Smart_Cb onChanged, void *cbData)
 {
 	auto check = elm_check_add(parent);
diff --git a/src/WidgetFactory.hpp b/src/WidgetFactory.hpp
index f801d22..ba8d139 100644
--- a/src/WidgetFactory.hpp
+++ b/src/WidgetFactory.hpp
@@ -14,6 +14,7 @@ public:
 	static Evas_Object *createButton(Evas_Object *parent, const std::string &btn_str,
 									 const std::string &btn_style, Evas_Smart_Cb onClicked, void *cbData);
 	static Evas_Object *createRadio(Evas_Object *parent, int value, Elm_Radio *group, Evas_Smart_Cb onChanged, void *cbData);
+	/* TODO: remove after createCheck is replaced in setting-common-draw-genlist.cpp */
 	static Evas_Object *createCheck(Evas_Object *parent, Eina_Bool state, Eina_Bool *statePtr, const std::string &style, Evas_Smart_Cb onChanged, void *cbData);
 
 };
-- 
2.7.4


From d9b90afc8126023163876123556bd40a29b00744 Mon Sep 17 00:00:00 2001
From: Lukasz Wlazly <l.wlazly@partner.samsung.com>
Date: Mon, 4 Mar 2019 09:34:44 +0100
Subject: [PATCH 13/16] Add new type of GenlistItem - Check

This change introduce new type of GenlistItem
and use it in RemoveSwitchPage

Change-Id: I413f1e2d8ee53f11d9c2ed10f9f8db6291704258
---
 src/Check.cpp            |   2 +-
 src/Genlist.cpp          |  12 ++++++
 src/Genlist.hpp          |   2 +
 src/GenlistItem.cpp      |  55 +++++++++++++++++++++++--
 src/GenlistItem.hpp      |   5 +++
 src/RemoveSwitchPage.cpp | 104 +++++++++++++----------------------------------
 src/RemoveSwitchPage.hpp |   3 --
 src/SetValuePage.cpp     |   8 +++-
 8 files changed, 106 insertions(+), 85 deletions(-)

diff --git a/src/Check.cpp b/src/Check.cpp
index 75ee2e4..5ad73df 100644
--- a/src/Check.cpp
+++ b/src/Check.cpp
@@ -27,7 +27,7 @@ bool Check::getState() const
 
 void Check::setStatePointer(Eina_Bool *statePtr)
 {
-	if (statePtr) elm_check_state_pointer_set (uniqueObj_.get(), statePtr);
+	if (statePtr) elm_check_state_pointer_set(uniqueObj_.get(), statePtr);
 }
 
 void Check::setPassEvents(bool pass)
diff --git a/src/Genlist.cpp b/src/Genlist.cpp
index f1ad159..e84a32c 100644
--- a/src/Genlist.cpp
+++ b/src/Genlist.cpp
@@ -38,4 +38,16 @@ GenlistItem *Genlist::appendItem(GenlistItem item, GenlistItem *parent)
 
 	items_.push_back(std::move(itemPtr));
 	return items_.back().get();
+}
+
+GenlistItem *Genlist::getFirst()
+{
+	auto raw = elm_genlist_first_item_get(uniqueObj_.get());
+	return GenlistItem::fromRawItem(raw);
+}
+
+GenlistItem *Genlist::getLast()
+{
+	auto raw = elm_genlist_last_item_get(uniqueObj_.get());
+	return GenlistItem::fromRawItem(raw);
 }
\ No newline at end of file
diff --git a/src/Genlist.hpp b/src/Genlist.hpp
index 0f713d4..0e6b376 100644
--- a/src/Genlist.hpp
+++ b/src/Genlist.hpp
@@ -13,6 +13,8 @@ public:
 	void clear();
 	size_t size();
 	GenlistItem *appendItem(GenlistItem item, GenlistItem *parent = nullptr);
+	GenlistItem *getFirst();
+	GenlistItem *getLast();
 
 private:
 	std::vector<std::unique_ptr<GenlistItem>> items_;
diff --git a/src/GenlistItem.cpp b/src/GenlistItem.cpp
index 00856a6..df1e612 100644
--- a/src/GenlistItem.cpp
+++ b/src/GenlistItem.cpp
@@ -36,6 +36,16 @@ bool GenlistItem::getState()
 	return state_;
 }
 
+void GenlistItem::setState(bool state)
+{
+	if (state)
+		state_ = EINA_TRUE;
+	else
+		state_ = EINA_FALSE;
+
+	update();
+}
+
 void GenlistItem::disable()
 {
 	elm_object_item_disabled_set(objItem_, EINA_TRUE);
@@ -46,6 +56,26 @@ void GenlistItem::enable()
 	elm_object_item_disabled_set(objItem_, EINA_FALSE);
 }
 
+GenlistItem *GenlistItem::next()
+{
+	auto raw = elm_genlist_item_next_get(objItem_);
+	return fromRawItem(raw);
+}
+
+GenlistItem *GenlistItem::prev()
+{
+	auto raw = elm_genlist_item_prev_get(objItem_);
+	return fromRawItem(raw);
+}
+
+GenlistItem *GenlistItem::fromRawItem(Elm_Object_Item *raw)
+{
+	if (raw)
+		return static_cast<GenlistItem *>(elm_object_item_data_get(raw));
+	else
+		return nullptr;
+}
+
 GenlistItem::ElmGenlistItemClassPtr GenlistItem::generateITCObject()
 {
 	auto *itc = elm_genlist_item_class_new();
@@ -95,6 +125,9 @@ Evas_Object *GenlistItem::contentRealizator(void *data, Evas_Object *obj, const
 	case WidgetType::toggle:
 		return self->realizeToggle(part);
 
+	case WidgetType::check:
+		return self->realizeCheck(part);
+
 	default:
 		break;
 	}
@@ -105,8 +138,6 @@ Evas_Object *GenlistItem::realizeToggle(const std::string &part)
 {
 	if (part != "elm.swallow.end") return nullptr;
 
-	SETTING_TRACE_ERROR(".");
-
 	auto check = Widget::make<Check>(genlist_);
 	check->setStyle("on&off");
 
@@ -120,6 +151,24 @@ Evas_Object *GenlistItem::realizeToggle(const std::string &part)
 	elm_atspi_accessible_relationship_append(objItem_, ELM_ATSPI_RELATION_CONTROLLER_FOR, check->getObject());
 
 	check->setEvasSmartCallback("changed", [this]() {
+		onSelection_(this);
+	});
+
+	return check->getObject();
+}
+
+Evas_Object *GenlistItem::realizeCheck(const std::string &part)
+{
+	if (part != "elm.swallow.icon") return nullptr;
+
+	SETTING_TRACE_ERROR(".");
+
+	auto check = Widget::make<Check>(genlist_);
+	check->setStatePointer(&state_);
+	check->setPropagateEvents(false);
+	check->setPassEvents(true);
+
+	check->setEvasSmartCallback("changed", [this]() {
 		SETTING_TRACE_ERROR("smart callback \"changed\"");
 		onSelection_(this);
 	});
@@ -132,7 +181,7 @@ void GenlistItem::onItemSelection(void *data, Evas_Object *obj, void *event_info
 	SETTING_TRACE_ERROR(".");
 	auto self = static_cast<GenlistItem *>(data);
 
-	if (self->widgetType_ == WidgetType::toggle) {
+	if (self->widgetType_ == WidgetType::toggle || self->widgetType_ == WidgetType::check) {
 		self->state_ = !self->state_;
 		elm_genlist_item_fields_update(self->objItem_, "*", ELM_GENLIST_ITEM_FIELD_CONTENT);
 	}
diff --git a/src/GenlistItem.hpp b/src/GenlistItem.hpp
index 448ed6d..5190c25 100644
--- a/src/GenlistItem.hpp
+++ b/src/GenlistItem.hpp
@@ -26,15 +26,20 @@ public:
 	void setDescription(const TranslatedString &desc);
 	void update();
 	bool getState();
+	void setState(bool state);
 	void disable();
 	void enable();
+	GenlistItem *next();
+	GenlistItem *prev();
 
 
 private:
+	static GenlistItem *fromRawItem(Elm_Object_Item *raw);
 	using ElmGenlistItemClassPtr = std::unique_ptr<Elm_Genlist_Item_Class, utils::ElmGenlistItemClassDeleter>;
 	ElmGenlistItemClassPtr generateITCObject();
 	Elm_Genlist_Item_Type getItemType();
 	Evas_Object *realizeToggle(const std::string &part);
+	Evas_Object *realizeCheck(const std::string &part);
 
 	static char *textRealizator(void *data, Evas_Object *obj, const char *part);
 	static Evas_Object *contentRealizator(void *data, Evas_Object *obj, const char *part);
diff --git a/src/RemoveSwitchPage.cpp b/src/RemoveSwitchPage.cpp
index 181ef1b..61135a2 100644
--- a/src/RemoveSwitchPage.cpp
+++ b/src/RemoveSwitchPage.cpp
@@ -40,20 +40,17 @@ RemoveSwitchPage::RemoveSwitchPage(SettingAccessibility *ad)
 	elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_SELECT_ITEMS"), NULL, NULL, layout_->getObject(), NULL);
 
 	allCheckbox_ = Widget::make<Check>(naviframe, false, std::string{}, [this]() {
-		retm_if(genlist_ == NULL, "No genlist provided");
-
 		auto genlist_size = genlist_->size();
 		bool all_selected = (switchesToRemoveCounter_ == genlist_size);
 
-		Elm_Object_Item *item = elm_genlist_first_item_get(genlist_->getObject());
-		while (item != NULL) {
-			auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
-			setting_update_gl_item_chk_status(list_item, !all_selected);
-			item = elm_genlist_item_next_get(item);
+		auto item = genlist_->getFirst();
+		while (item) {
+			item->setState(!all_selected);
+			item = item->next();
 		}
 
 		switchesToRemoveCounter_ = all_selected ? 0 : genlist_size;
-		useNaviframeTitleAsCounter(static_cast<RemoveSwitchPage *>(this));
+		removeSwitchPopupBtn_->disable(switchesToRemoveCounter_ ? false : true);
 	});
 
 	naviframe->setContent("prev_btn", allCheckbox_);
@@ -66,76 +63,30 @@ RemoveSwitchPage::RemoveSwitchPage(SettingAccessibility *ad)
 
 	for (auto i = 0u; i < context_->config.configuration_items.size(); ++i) {
 		auto activity_name = setting_accessibility_universal_switch_dbus_config_get_activity_name(&context_->config, context_->config.configuration_items[i]->activity_type);
-		auto item = createGendialGroupItem(genlist_->getObject(), &itc_1text_1icon_3,
-										   gendialRemoveSelectedItemCb, NULL,
-										   SwallowType::CHECK, false,
-										   context_->config.configuration_items[i]->user_name,
-										   activity_name,
-										   gendialRemoveCheckboxItemCb);
-
-		if (item) {
-			item->userdata = this;
-			item->chk_id = i;
-		}
+		genlist_->appendItem({"type1", context_->config.configuration_items[i]->user_name, activity_name,
+							  [this](auto item)
+		{
+			if (item->getState())
+				switchesToRemoveCounter_++;
+			else
+				switchesToRemoveCounter_--;
+
+			auto state = switchesToRemoveCounter_ == genlist_->size();
+			allCheckbox_->setState(state);
+
+			removeSwitchPopupBtn_->disable(switchesToRemoveCounter_ ? false : true);
+			item->update();
+		}, GenlistItem::WidgetType::check
+							 });
 	}
 }
 
-void RemoveSwitchPage::gendialRemoveSelectedItemCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(event_info == NULL, "Invalid argument: event_info is NULL");
-	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
-
-	elm_genlist_item_selected_set(item, 0);
-
-	auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
-	setting_update_gl_item_chk_status(list_item, list_item->chk_status ? 0 : 1);
-
-	auto self = static_cast<RemoveSwitchPage *>(list_item->userdata);
-
-	if (elm_check_state_get(list_item->eo_check))
-		self->switchesToRemoveCounter_++;
-	else
-		self->switchesToRemoveCounter_--;
-
-	useNaviframeTitleAsCounter(self);
-}
-
-void RemoveSwitchPage::gendialRemoveCheckboxItemCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Input parameter is NULL");
-	auto list_item = static_cast<GenGroupItemData *>(data);
-	auto self = static_cast<RemoveSwitchPage *>(list_item->userdata);
-	if (elm_check_state_get(list_item->eo_check))
-		self->switchesToRemoveCounter_++;
-	else
-		self->switchesToRemoveCounter_--;
-
-	useNaviframeTitleAsCounter(self);
-}
-
 void RemoveSwitchPage::attachCallback(UniversalSwitchCb cb, void *cbData)
 {
 	switch_removed_cb = cb;
 	switch_removed_cb_data = cbData;
 }
 
-void RemoveSwitchPage::useNaviframeTitleAsCounter(RemoveSwitchPage *self)
-{
-	Eina_Bool state = self->switchesToRemoveCounter_ == self->genlist_->size();
-	self->allCheckbox_->setState(state);
-
-	std::string title;
-	if (self->switchesToRemoveCounter_ > SWITCH_COUNTER_MAX) {
-		title = std::to_string(SWITCH_COUNTER_MAX);
-	} else if (self->switchesToRemoveCounter_ > 0) {
-		title = std::to_string(self->switchesToRemoveCounter_);
-	} else {
-		title = TranslatedString{"IDS_ACCS_SELECT_ITEMS"} .str();
-	}
-	self->removeSwitchPopupBtn_->disable(self->switchesToRemoveCounter_ ? false : true);
-	elm_layout_text_set(self->context_->md.getNaviframe()->getObject(), "default", title.c_str());
-}
-
 void RemoveSwitchPage::createPopupForSwitchesRemoving()
 {
 	auto popup = Widget::make<Popup>(context_->md.getNaviframe(), "IDS_ACCS_UNIVERSAL_SWITCH_DELETE_SWITCHES");
@@ -166,12 +117,14 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 
 	auto removeSwitchCb = [removeCb, this]() {
 
-		Elm_Object_Item *item = elm_genlist_last_item_get(genlist_->getObject());
-		while (item != NULL) {
-			auto list_item = static_cast<GenGroupItemData *>(elm_object_item_data_get(item));
-			item = elm_genlist_item_prev_get(item);
-			if (list_item->chk_status)
-				removeSwitch(list_item->chk_id);
+		auto item = genlist_->getLast();
+		size_t i = genlist_->size() - 1;
+		while (item) {
+			if (item->getState())
+				removeSwitch(i);
+
+			item = item->prev();
+			--i;
 		}
 
 		removeCb();
@@ -190,7 +143,6 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 
 void RemoveSwitchPage::removeSwitch(size_t item_id)
 {
-
 	if (item_id >= context_->config.configuration_items.size()) {
 		SETTING_TRACE_END;
 		return;
diff --git a/src/RemoveSwitchPage.hpp b/src/RemoveSwitchPage.hpp
index edff62b..47d1638 100644
--- a/src/RemoveSwitchPage.hpp
+++ b/src/RemoveSwitchPage.hpp
@@ -40,15 +40,12 @@ class RemoveSwitchPage
 public:
 	RemoveSwitchPage(SettingAccessibility *ad);
 	void attachCallback(UniversalSwitchCb cb, void *cbData);
-	static void useNaviframeTitleAsCounter(RemoveSwitchPage *self);
 
 private:
 	void createPopupForSwitchesRemoving();
 	static void onRemoveSelectedSwitches(void *data, Evas_Object *obj, void *event_info);
 	static void onRemovePopup(void *data, Evas_Object *obj, void *event_info);
 	void removeSwitch(size_t item_id);
-	static void gendialRemoveSelectedItemCb(void *data, Evas_Object *obj, void *event_info);
-	static void gendialRemoveCheckboxItemCb(void *data, Evas_Object *obj, void *event_info);
 
 	SettingAccessibility *context_ = nullptr;
 	std::unique_ptr<SetValuePage> setValuePage_;
diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index 1e29edb..8356a65 100644
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -74,7 +74,9 @@ SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const
 		break;
 	case ValueEditorType::NUMERIC_SWITCH:
 		createScroller();
-		check_ = Widget::make<Check>(layout_, false, "on&off", [this]() { checkStateChangedCb(); });
+		check_ = Widget::make<Check>(layout_, false, "on&off", [this]() {
+			checkStateChangedCb();
+		});
 		layout_->setPartContent(PRT_SET_VALUE_SWITCH, check_);
 		check_->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		break;
@@ -85,7 +87,9 @@ SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const
 		genlist_ = createGenlist(layout_, NULL);
 		break;
 	case ValueEditorType::LIST_SWITCH:
-		check_ = Widget::make<Check>(layout_, false, "on&off", [this]() { checkStateChangedCb(); });
+		check_ = Widget::make<Check>(layout_, false, "on&off", [this]() {
+			checkStateChangedCb();
+		});
 		layout_->setPartContent(PRT_SET_VALUE_SWITCH, check_);
 		check_->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		genlist_ = createGenlist(layout_, _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS"));
-- 
2.7.4


From 0ba6c83cfc848dd7b76fc16830b8ce6718238c2c Mon Sep 17 00:00:00 2001
From: Lukasz Wlazly <l.wlazly@partner.samsung.com>
Date: Tue, 5 Mar 2019 08:32:58 +0100
Subject: [PATCH 14/16] Add new type of GenlistItem - Icon

This change introduce new type of GenlistItem
and use it in SwitchesPage

Change-Id: I76a7d4303da2aad76d75492a0466005e6563e909
---
 src/GenlistItem.cpp  | 20 ++++++++++++++++++++
 src/GenlistItem.hpp  |  3 +++
 src/Icon.cpp         |  5 +++++
 src/Icon.hpp         |  2 ++
 src/SwitchesPage.cpp | 33 +++++++--------------------------
 src/SwitchesPage.hpp |  2 --
 src/Widget.cpp       |  5 +++++
 src/Widget.hpp       |  1 +
 8 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/src/GenlistItem.cpp b/src/GenlistItem.cpp
index df1e612..6db26a3 100644
--- a/src/GenlistItem.cpp
+++ b/src/GenlistItem.cpp
@@ -3,6 +3,7 @@
 #include "setting-debug.h"
 #include "Check.hpp"
 #include "Genlist.hpp"
+#include "Icon.hpp"
 
 GenlistItem::GenlistItem(std::string style, TranslatedString text, TranslatedString desc, Type type)
 	: style_(std::move(style)), text_(std::move(text)), description_(std::move(desc)), type_(type)
@@ -16,6 +17,10 @@ GenlistItem::GenlistItem(std::string style, TranslatedString text, TranslatedStr
 	: style_(std::move(style)), text_(std::move(text)), description_(std::move(desc)), onSelection_(std::move(onSelection)), widgetType_(type)
 {}
 
+GenlistItem::GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, std::string iconPath, WidgetType type)
+	: style_(std::move(style)), text_(std::move(text)), description_(std::move(desc)), onSelection_(std::move(onSelection)), iconPath_(std::move(iconPath)), widgetType_(type)
+{}
+
 void GenlistItem::setText(const TranslatedString &text)
 {
 	text_ = text;
@@ -128,6 +133,9 @@ Evas_Object *GenlistItem::contentRealizator(void *data, Evas_Object *obj, const
 	case WidgetType::check:
 		return self->realizeCheck(part);
 
+	case WidgetType::icon:
+		return self->realizeIcon(part);
+
 	default:
 		break;
 	}
@@ -176,6 +184,18 @@ Evas_Object *GenlistItem::realizeCheck(const std::string &part)
 	return check->getObject();
 }
 
+Evas_Object *GenlistItem::realizeIcon(const std::string &part)
+{
+	if (part != "elm.swallow.icon") return nullptr;
+
+	auto icon = Widget::make<Icon>(genlist_);
+	icon->setColor(15, 41, 73, 255);
+	icon->setImageFile(iconPath_);
+	icon->setAspectHint(EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+
+	return icon->getObject();
+}
+
 void GenlistItem::onItemSelection(void *data, Evas_Object *obj, void *event_info)
 {
 	SETTING_TRACE_ERROR(".");
diff --git a/src/GenlistItem.hpp b/src/GenlistItem.hpp
index 5190c25..2738c7d 100644
--- a/src/GenlistItem.hpp
+++ b/src/GenlistItem.hpp
@@ -21,6 +21,7 @@ public:
 	GenlistItem(std::string style, TranslatedString text, TranslatedString desc = {}, Type type = Type::group);
 	GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, Type type = Type::regular);
 	GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, WidgetType type);
+	GenlistItem(std::string style, TranslatedString text, TranslatedString desc, std::function<void(GenlistItem *)> onSelection, std::string iconPath, WidgetType type = WidgetType::icon);
 
 	void setText(const TranslatedString &text);
 	void setDescription(const TranslatedString &desc);
@@ -40,6 +41,7 @@ private:
 	Elm_Genlist_Item_Type getItemType();
 	Evas_Object *realizeToggle(const std::string &part);
 	Evas_Object *realizeCheck(const std::string &part);
+	Evas_Object *realizeIcon(const std::string &part);
 
 	static char *textRealizator(void *data, Evas_Object *obj, const char *part);
 	static Evas_Object *contentRealizator(void *data, Evas_Object *obj, const char *part);
@@ -51,6 +53,7 @@ private:
 	std::function<void(GenlistItem *)> onSelection_;
 	Genlist *genlist_ = nullptr;
 	Eina_Bool state_ = EINA_FALSE;
+	std::string iconPath_;
 
 	Elm_Object_Item *objItem_ = nullptr;
 	Type type_ = Type::regular;
diff --git a/src/Icon.cpp b/src/Icon.cpp
index 9f02098..494f421 100644
--- a/src/Icon.cpp
+++ b/src/Icon.cpp
@@ -6,3 +6,8 @@ Icon::Icon(Widget *parent)
 	uniqueObj_.reset(elm_icon_add(parent->getObject()));
 	show();
 }
+
+void Icon::setImageFile(std::string path)
+{
+	elm_image_file_set(uniqueObj_.get(), path.c_str(), nullptr);
+}
\ No newline at end of file
diff --git a/src/Icon.hpp b/src/Icon.hpp
index 4988e8e..334b559 100644
--- a/src/Icon.hpp
+++ b/src/Icon.hpp
@@ -8,6 +8,8 @@ class Icon : public Widget
 public:
 	Icon(Widget *parent);
 
+	void setImageFile(std::string path);
+
 };
 
 #endif
diff --git a/src/SwitchesPage.cpp b/src/SwitchesPage.cpp
index 724dfd7..e419f25 100644
--- a/src/SwitchesPage.cpp
+++ b/src/SwitchesPage.cpp
@@ -58,25 +58,16 @@ void SwitchesPage::updateSwitchesList()
 {
 	switches_->clear();
 	createSwitchesGroup();
-	createAddButton();
+	switches_->appendItem({"type1", "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SWITCHES_ADD_SWITCH", {},
+						   [this](auto item)
+	{
+		addSwitchPage_ = std::make_unique<AddSwitchPage>(context_);
+		addSwitchPage_->attachCallbackOnSwitchAttach(addSwitchCb, this);
+	}, ACCESSIBILITY_UNIVERSAL_SWITCH_PLUS_ICON
+						  });
 	removeSwitchesPageBtn_->disable(context_->config.configuration_items.size() == 0);
 }
 
-void SwitchesPage::createAddButton()
-{
-	GenGroupItemData *item = createGendialGroupItem(switches_->getObject(), &itc_1text_1icon_3,
-							 addSwitchClickedCb, this,
-							 SwallowType::ICON_IMAGE, 0,
-							 "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SWITCHES_ADD_SWITCH",
-							 {},
-							 NULL);
-
-	if (item) {
-		item->l_swallow_path = ACCESSIBILITY_UNIVERSAL_SWITCH_PLUS_ICON;
-		item->userdata = context_;
-	}
-}
-
 void SwitchesPage::createSwitchesGroup()
 {
 	for (auto &it : context_->config.configuration_items) {
@@ -85,16 +76,6 @@ void SwitchesPage::createSwitchesGroup()
 	}
 }
 
-void SwitchesPage::addSwitchClickedCb(void *data, Evas_Object *obj, void *event_info)
-{
-	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<SwitchesPage *>(data);
-
-	self->addSwitchPage_ = std::make_unique<AddSwitchPage>(self->context_);
-	self->addSwitchPage_->attachCallbackOnSwitchAttach(addSwitchCb, self);
-}
-
 void SwitchesPage::switchClickCb(void *data, Evas_Object *obj, void *event_info)
 {
 	Elm_Object_Item *item = (Elm_Object_Item *)event_info;
diff --git a/src/SwitchesPage.hpp b/src/SwitchesPage.hpp
index 2f1394a..87ce7dd 100644
--- a/src/SwitchesPage.hpp
+++ b/src/SwitchesPage.hpp
@@ -48,9 +48,7 @@ public:
 
 private:
 	void updateSwitchesList();
-	void createAddButton();
 	void createSwitchesGroup();
-	static void addSwitchClickedCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchClickCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchUpdatedCb(void *data, const std::string &switch_id, const std::string &switch_action, const std::string &switch_name);
 	static void switchRemovedCb(void *data, const std::string &switch_id, const std::string &switch_action, const std::string &switch_name);
diff --git a/src/Widget.cpp b/src/Widget.cpp
index 5cc000b..c45f432 100644
--- a/src/Widget.cpp
+++ b/src/Widget.cpp
@@ -36,6 +36,11 @@ void Widget::setMaxSizeHint(Evas_Coord v, Evas_Coord h)
 	evas_object_size_hint_max_set(uniqueObj_.get(), v, h);
 }
 
+void Widget::setAspectHint(Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h)
+{
+	evas_object_size_hint_aspect_set(uniqueObj_.get(), aspect, w, h);
+}
+
 Rectangle Widget::getGeometry()
 {
 	int x, y, w, h;
diff --git a/src/Widget.hpp b/src/Widget.hpp
index a1f1854..682ad84 100644
--- a/src/Widget.hpp
+++ b/src/Widget.hpp
@@ -41,6 +41,7 @@ public:
 	void setAlignHint(double x, double y);
 	void setMinSizeHint(Evas_Coord v, Evas_Coord h);
 	void setMaxSizeHint(Evas_Coord v, Evas_Coord h);
+	void setAspectHint(Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h);
 	Rectangle getGeometry();
 	void setPosition(Point anchor);
 	void setEvasSmartCallback(const std::string &eventName, std::function<void()> callback);
-- 
2.7.4


From 882f369aaf6c6f509c80c8b9009c0711e4526484 Mon Sep 17 00:00:00 2001
From: Tomasz Jeschke <t.jeschke@samsung.com>
Date: Tue, 5 Mar 2019 15:22:23 +0100
Subject: [PATCH 15/16] Use Entry class instead of Evas_Object in
 UpdateSwitchPage

Change-Id: I5a8c60eee86abfcafd3491afb049ad3f8c9887f8
---
 src/Entry.cpp            |  6 ++++++
 src/Entry.hpp            |  1 +
 src/SetValuePage.cpp     |  3 ---
 src/UpdateSwitchPage.cpp | 11 ++++-------
 src/UpdateSwitchPage.hpp |  3 ++-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Entry.cpp b/src/Entry.cpp
index c559d5f..7a2f526 100644
--- a/src/Entry.cpp
+++ b/src/Entry.cpp
@@ -7,6 +7,12 @@ Entry::Entry(Widget *parent)
 	show();
 }
 
+Entry::Entry(Widget *parent, const std::string &text)
+	: Entry(parent)
+{
+	setEntryText(text);
+}
+
 void Entry::setEntryText(const TranslatedString &text)
 {
 	elm_entry_entry_set(uniqueObj_.get(), text.c_str());
diff --git a/src/Entry.hpp b/src/Entry.hpp
index 7ba86bb..dbf8c4b 100644
--- a/src/Entry.hpp
+++ b/src/Entry.hpp
@@ -7,6 +7,7 @@ class Entry : public Widget
 {
 public:
 	Entry(Widget *parent);
+	Entry(Widget *parent, const std::string &text);
 
 	void setEntryText(const TranslatedString &text);
 	std::string getEntryText();
diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index 8356a65..3c91f9c 100644
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -27,10 +27,8 @@
 #define EDJ_SET_VALUE "edje/accessibility-settings-set-value.edj"
 #define GRP_SET_VALUE_NUMERIC "set-value-numeric"
 #define GRP_SET_VALUE_NUMERIC_SWITCH "set-value-numeric-switch"
-#define GRP_SET_VALUE_RADIOS "set-value-radios"
 #define GRP_SET_VALUE_SWITCHES "set-value-switches"
 #define GRP_SET_VALUE_LIST_SWITCH "set-value-list-switch"
-#define GRP_SET_VALUE_UPDATE_ACCESSORIES_SWITCH "set-value-update-accessories-switch"
 #define PRT_SET_VALUE_LIST "set-value-list"
 #define PRT_SET_VALUE_SWITCH_LABEL "set-value-switch-label"
 #define PRT_SET_VALUE_SWITCH "set-value-switch"
@@ -38,7 +36,6 @@
 #define PRT_SET_VALUE_SELECTOR "set-value-selector"
 #define PRT_SET_VALUE_RANGE "set-value-range"
 #define PRT_SET_VALUE_DESC "set-value-desc"
-#define PRT_SET_VALUE_ENTRY "set-value-entry"
 
 SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const char *title)
 	: context_(ad)
diff --git a/src/UpdateSwitchPage.cpp b/src/UpdateSwitchPage.cpp
index ab8df1f..99ef5da 100644
--- a/src/UpdateSwitchPage.cpp
+++ b/src/UpdateSwitchPage.cpp
@@ -74,12 +74,9 @@ void UpdateSwitchPage::createUpdateAccessoriesSwitchPage()
 	auto naviframe = context_->md.getNaviframe();
 	layout_ = Widget::make<Layout>(naviframe, "edje/accessibility-settings-set-value.edj", GRP_SET_VALUE_UPDATE_ACCESSORIES_SWITCH);
 
-	entry_ = elm_entry_add(layout_->getObject());
-	elm_entry_entry_set(entry_, config_item_to_update_.user_name.c_str());
-	elm_entry_cursor_end_set(entry_);
-	evas_object_show(entry_);
-	elm_object_part_content_set(layout_->getObject(), PRT_SET_VALUE_ENTRY, entry_);
-
+	entry_ = Widget::make<Entry>(layout_, config_item_to_update_.user_name);
+	entry_->moveCursorToEnd();
+	layout_->setPartContent(PRT_SET_VALUE_ENTRY, entry_);
 	layout_->setPartText(PRT_SET_VALUE_DESC, "IDS_ACCS_UNIVERSAL_SWITCH_NAME");
 
 	update_accessories_action_genlist_ = createGenlist(layout_, NULL);
@@ -101,7 +98,7 @@ void UpdateSwitchPage::closeUpdateAccessoriesSwitchPage(void *data, Evas_Object
 
 	if (event_info == self->save_object_item) {
 		if (self->switch_updated_cb) {
-			self->switch_updated_cb(self->switch_updated_cb_data, self->config_item_to_update_.switch_id, self->config_item_to_update_.activity_type, elm_entry_entry_get(self->entry_));
+			self->switch_updated_cb(self->switch_updated_cb_data, self->config_item_to_update_.switch_id, self->config_item_to_update_.activity_type, self->entry_->getEntryText());
 		}
 	}
 
diff --git a/src/UpdateSwitchPage.hpp b/src/UpdateSwitchPage.hpp
index a117d56..09215d4 100644
--- a/src/UpdateSwitchPage.hpp
+++ b/src/UpdateSwitchPage.hpp
@@ -19,6 +19,7 @@
 
 #include "SettingAccessibility.hpp"
 #include "ActionPage.hpp"
+#include "Entry.hpp"
 #include "Layout.hpp"
 #include "Genlist.hpp"
 
@@ -52,7 +53,7 @@ private:
 	UniversalSwitchConfigurationItem config_item_to_update_;
 	std::unique_ptr<ActionPage> actionPage_;
 	Elm_Object_Item *save_object_item = nullptr;
-	Evas_Object *entry_ = nullptr;
+	Entry *entry_ = nullptr;
 	Genlist *update_accessories_action_genlist_ = nullptr;
 	Layout *layout_ = nullptr;
 };
-- 
2.7.4


From bcccc3dd773b5896f73ae27af76ad57082c38019 Mon Sep 17 00:00:00 2001
From: Lukasz Wlazly <l.wlazly@partner.samsung.com>
Date: Mon, 11 Mar 2019 10:49:54 +0100
Subject: [PATCH 16/16] Add required privilege for access to vconf keys

Change-Id: I79e2db9d16004e49e4f4b03688c5ca67e2fb896d
---
 org.tizen.accessibility-setting.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.tizen.accessibility-setting.xml b/org.tizen.accessibility-setting.xml
index 5e50b41..ccfda92 100644
--- a/org.tizen.accessibility-setting.xml
+++ b/org.tizen.accessibility-setting.xml
@@ -6,4 +6,7 @@
 		<label>Accessibility Setting</label>
 		<label xml:lang="en-us">Accessibility Setting</label>
 	</ui-application>
+	<privileges>
+        <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
+    </privileges>
 </manifest>
-- 
2.7.4