From: Igor Nazarov <i.nazarov@samsung.com>
Date: Mon, 12 Jun 2017 10:35:12 +0000 (+0300)
Subject: TizenRefApp-8667 [Gallery] Replace forward declaration on header include
X-Git-Tag: submit/tizen/20170703.071445~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58d7c696f309230e2e7ba6a1265df81fa88f291f;p=profile%2Fwearable%2Fapps%2Fnative%2Fgallery.git

TizenRefApp-8667 [Gallery] Replace forward declaration on header include

Change-Id: I8e6781dae1e7f350609e9f64468cdc1c35ea2c33
---

diff --git a/inc/model/Gallery.h b/inc/model/Gallery.h
index e3f994d..1a711f9 100644
--- a/inc/model/Gallery.h
+++ b/inc/model/Gallery.h
@@ -17,10 +17,12 @@
 #ifndef __GALLERY_MODEL_GALLERY_H__
 #define __GALLERY_MODEL_GALLERY_H__
 
-#include "types.h"
+#include "IMediaAlbum.h"
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(Gallery);
+
 	class Gallery final : public ucl::NonCopyable {
 	public:
 		static GallerySRef newInstance();
diff --git a/inc/model/IJob.h b/inc/model/IJob.h
index 66fc5ce..8c7d56e 100644
--- a/inc/model/IJob.h
+++ b/inc/model/IJob.h
@@ -21,6 +21,8 @@
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(IJob);
+
 	class IJob : public ucl::Polymorphic {
 	public:
 		virtual ucl::Result getResult() const = 0;
diff --git a/inc/model/IMediaAlbum.h b/inc/model/IMediaAlbum.h
index 81db759..80eb222 100644
--- a/inc/model/IMediaAlbum.h
+++ b/inc/model/IMediaAlbum.h
@@ -17,10 +17,12 @@
 #ifndef __GALLERY_MODEL_I_MEDIA_ALBUM_H__
 #define __GALLERY_MODEL_I_MEDIA_ALBUM_H__
 
-#include "types.h"
+#include "MediaItem.h"
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(IMediaAlbum);
+
 	class IMediaAlbum : public ucl::Polymorphic {
 	public:
 		using EachCb = ucl::Delegate<bool(MediaItemSRef &&media)>;
diff --git a/inc/model/MediaItem.h b/inc/model/MediaItem.h
index 16ce969..20d2a3f 100644
--- a/inc/model/MediaItem.h
+++ b/inc/model/MediaItem.h
@@ -17,10 +17,20 @@
 #ifndef __GALLERY_MODEL_MEDIA_ITEM_H__
 #define __GALLERY_MODEL_MEDIA_ITEM_H__
 
-#include "types.h"
+#include <vector>
+
+#include <media_content.h>
+
+#include "ucl/misc/AutoHandle.h"
+
+#include "IJob.h"
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(MediaItem);
+
+	using MediaItems = std::vector<MediaItemSRef>;
+
 	class MediaItem : public ucl::Polymorphic {
 	public:
 		using ThumbnailPathGetCb =
diff --git a/inc/model/types.h b/inc/model/types.h
index 181b26b..87beb8f 100644
--- a/inc/model/types.h
+++ b/inc/model/types.h
@@ -17,12 +17,6 @@
 #ifndef __GALLERY_MODEL_TYPES_H__
 #define __GALLERY_MODEL_TYPES_H__
 
-#include <vector>
-
-#include <media_content.h>
-
-#include "ucl/misc/AutoHandle.h"
-
 #include "../types.h"
 
 namespace gallery {
@@ -34,16 +28,6 @@ namespace gallery {
 		MUSIC,
 		OTHERS
 	};
-
-	UCL_DECLARE_REF_ALIASES(IJob);
-
-	UCL_DECLARE_REF_ALIASES(Gallery);
-
-	UCL_DECLARE_REF_ALIASES(IMediaAlbum);
-
-	UCL_DECLARE_REF_ALIASES(MediaItem);
-
-	using MediaItems = std::vector<MediaItemSRef>;
 }
 
 #endif // __GALLERY_MODEL_TYPES_H__
diff --git a/inc/presenters/AlertDialog.h b/inc/presenters/AlertDialog.h
index 7b8e843..59274a2 100644
--- a/inc/presenters/AlertDialog.h
+++ b/inc/presenters/AlertDialog.h
@@ -24,6 +24,8 @@
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(AlertDialog);
+
 	class AlertDialog final : public Presenter,
 			public ucl::IDisposable {
 	public:
diff --git a/inc/presenters/IMoreOptionsListener.h b/inc/presenters/IMoreOptionsListener.h
deleted file mode 100644
index e8e61b6..0000000
--- a/inc/presenters/IMoreOptionsListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * 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 __GALLERY_PRESENTERS_MORE_OPTIONS_LISTENER_H__
-#define __GALLERY_PRESENTERS_MORE_OPTIONS_LISTENER_H__
-
-#include "types.h"
-
-namespace gallery {
-
-	class IMoreOptionsListener : public ucl::Polymorphic {
-	public:
-		virtual void onMoreOptionClicked(MoreOptionsPresenter &sender,
-				const MoreOption &option) = 0;
-		virtual void onMoreOptionSelected(MoreOptionsPresenter &sender,
-				const MoreOption &option) {};
-		virtual void onMoreOptionsOpened(MoreOptionsPresenter &sender) {};
-		virtual void onMoreOptionsClosed(MoreOptionsPresenter &sender) {};
-	};
-}
-
-#endif // __GALLERY_PRESENTERS_MORE_OPTIONS_LISTENER_H__
diff --git a/inc/presenters/ISelectModeListener.h b/inc/presenters/ISelectModeListener.h
deleted file mode 100644
index 35fef58..0000000
--- a/inc/presenters/ISelectModeListener.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2017 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * 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 __GALLERY_PRESENTERS_SELECT_MODE_LISTENER_H__
-#define __GALLERY_PRESENTERS_SELECT_MODE_LISTENER_H__
-
-#include "types.h"
-
-namespace gallery {
-
-	class ISelectModeListener : public ucl::Polymorphic {
-	public:
-		virtual void onSelectModeEvent(int event) = 0;
-	};
-}
-
-#endif // __GALLERY_PRESENTERS_SELECT_MODE_LISTENER_H__
diff --git a/inc/presenters/Instance.h b/inc/presenters/Instance.h
index a9c949a..bdd20f6 100644
--- a/inc/presenters/Instance.h
+++ b/inc/presenters/Instance.h
@@ -19,11 +19,13 @@
 
 #include "ucl/appfw/IInstance.h"
 #include "ucl/appfw/IInstanceAppControlExt.h"
+#include "ucl/appfw/SysEventProvider.h"
 
 #include "ucl/gui/Theme.h"
 #include "ucl/gui/Naviframe.h"
 
-#include "types.h"
+#include "model/Gallery.h"
+#include "Page.h"
 
 namespace gallery {
 
diff --git a/inc/presenters/MoreOptionsPresenter.h b/inc/presenters/MoreOptionsPresenter.h
index 8b34e68..c959b3c 100644
--- a/inc/presenters/MoreOptionsPresenter.h
+++ b/inc/presenters/MoreOptionsPresenter.h
@@ -17,28 +17,53 @@
 #ifndef __GALLERY_PRESENTERS_MORE_OPTIONS_PRESENTER_H__
 #define __GALLERY_PRESENTERS_MORE_OPTIONS_PRESENTER_H__
 
+#include <list>
+
 #include "ucl/misc/HashMap.h"
 
 #include "Presenter.h"
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(MoreOptionsPresenter);
+
 	class MoreOptionsPresenter final : public Presenter {
 	public:
+		UCL_DECLARE_REF_ALIASES(IListener);
+
+		struct Option {
+			int id;
+			ucl::TString text;
+			ucl::TString subText;
+			ucl::LayoutTheme iconTheme;
+		};
+
+		using MoreOptions = std::list<Option>;
+
 		class Builder {
 		public:
 			Builder();
 			~Builder();
 			bool isEmpty() const;
 			Builder &clear();
-			Builder &addOption(MoreOption option);
+			Builder &addOption(Option option);
 			MoreOptionsPresenterSRef build(ucl::ElmWidget &parent) const;
 		private:
 			ucl::SharedRef<MoreOptions> m_options;
 		};
 
+		class IListener : public ucl::Polymorphic {
+		public:
+			virtual void onMoreOptionClicked(MoreOptionsPresenter &sender,
+					const Option &option) = 0;
+			virtual void onMoreOptionSelected(MoreOptionsPresenter &sender,
+					const Option &option) {};
+			virtual void onMoreOptionsOpened(MoreOptionsPresenter &sender) {};
+			virtual void onMoreOptionsClosed(MoreOptionsPresenter &sender) {};
+		};
+
 	public:
-		void setListener(const IMoreOptionsListenerWRef &listener);
+		void setListener(const IListenerWRef &listener);
 
 		ucl::Widget &getWidget();
 
@@ -57,7 +82,7 @@ namespace gallery {
 		virtual ~MoreOptionsPresenter();
 
 		ucl::Result prepare(ucl::ElmWidget &parent);
-		ucl::Result addItem(const MoreOption &option);
+		ucl::Result addItem(const Option &option);
 
 		bool resetTimer(double timeout);
 		void stopTimer();
@@ -71,9 +96,9 @@ namespace gallery {
 
 	private:
 		const MoreOptionsCSRef m_options;
-		ucl::HashMap<void *, const MoreOption *> m_map;
+		ucl::HashMap<void *, const Option *> m_map;
 		ucl::ElmWidgetSRef m_widget;
-		IMoreOptionsListenerWRef m_listener;
+		IListenerWRef m_listener;
 		Ecore_Timer *m_timer;
 		bool m_newOpenedState;
 	};
diff --git a/inc/presenters/NoContentPage.h b/inc/presenters/NoContentPage.h
index 639feb2..c107a8e 100644
--- a/inc/presenters/NoContentPage.h
+++ b/inc/presenters/NoContentPage.h
@@ -21,6 +21,8 @@
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(NoContentPage);
+
 	class NoContentPage final : public Page {
 	public:
 		class Builder {
diff --git a/inc/presenters/Page.h b/inc/presenters/Page.h
index 915a1be..efeded6 100644
--- a/inc/presenters/Page.h
+++ b/inc/presenters/Page.h
@@ -23,6 +23,8 @@
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(Page);
+
 	class Page : public Presenter {
 	public:
 		using ExitRequestHandler = ucl::Delegate<void(Page &page)>;
diff --git a/inc/presenters/Presenter.h b/inc/presenters/Presenter.h
index b0fe70e..4ed3530 100644
--- a/inc/presenters/Presenter.h
+++ b/inc/presenters/Presenter.h
@@ -25,6 +25,8 @@
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(Presenter);
+
 	class Presenter : public ucl::RefCountAware {
 	public:
 		struct DeactivatorInfo {
diff --git a/inc/presenters/PreviewPage.h b/inc/presenters/PreviewPage.h
index fe05dec..076d4c8 100644
--- a/inc/presenters/PreviewPage.h
+++ b/inc/presenters/PreviewPage.h
@@ -19,18 +19,25 @@
 
 #include "Page.h"
 
-#include "view/IImageGridListener.h"
+#include "model/IMediaAlbum.h"
 
+#include "view/PageContent.h"
+#include "view/ImageGrid.h"
+
+#include "MoreOptionsPresenter.h"
+#include "SelectModePresenter.h"
+#include "AlertDialog.h"
+#include "ProcessingPresenter.h"
 #include "AtspiHighlightHelper.h"
-#include "IMoreOptionsListener.h"
-#include "ISelectModeListener.h"
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(PreviewPage);
+
 	class PreviewPage final : public Page,
-			private IImageGridListener,
-			private IMoreOptionsListener,
-			private ISelectModeListener {
+			private ImageGrid::IListener,
+			private MoreOptionsPresenter::IListener,
+			private SelectModePresenter::IListener {
 	public:
 		class Builder {
 		public:
@@ -95,24 +102,25 @@ namespace gallery {
 
 		virtual void onBackKey() final override;
 
-		// IImageGridListener //
+		// ImageGrid::IListener //
 
 		virtual void onItemRealized(int itemIndex) final override;
 		virtual void onItemUnrealized(int itemIndex) final override;
 		virtual void onItemEvent(int itemIndex,
-				int event, int x, int y) final override;
+				ImageGrid::ItemEvent event, int x, int y) final override;
 		virtual void onTransitionFinished() final override;
 		virtual Elm_Interface_Atspi_Accessible *onAccessObjectRequest(
 				bool isFlowsTo) final override;
 
-		// IMoreOptionsListener //
+		// MoreOptionsPresenter::IListener //
 
 		virtual void onMoreOptionClicked(MoreOptionsPresenter &sender,
-				const MoreOption &option) final override;
+				const MoreOptionsPresenter::Option &option) final override;
 
-		// ISelectModeListener //
+		// SelectModePresenter::IListener //
 
-		virtual void onSelectModeEvent(int event) final override;
+		virtual void onSelectModeEvent(
+				SelectModePresenter::Event event) final override;
 
 	private:
 		class Item;
diff --git a/inc/presenters/ProcessingPresenter.h b/inc/presenters/ProcessingPresenter.h
index 4cb2999..59ff50f 100644
--- a/inc/presenters/ProcessingPresenter.h
+++ b/inc/presenters/ProcessingPresenter.h
@@ -24,6 +24,8 @@
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(ProcessingPresenter);
+
 	class ProcessingPresenter final : public Presenter {
 	public:
 		enum class IconType {
diff --git a/inc/presenters/SelectModePresenter.h b/inc/presenters/SelectModePresenter.h
index 2fe4546..b7de8bf 100644
--- a/inc/presenters/SelectModePresenter.h
+++ b/inc/presenters/SelectModePresenter.h
@@ -21,10 +21,16 @@
 
 #include "Presenter.h"
 
+#include "view/PageContent.h"
+
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(SelectModePresenter);
+
 	class SelectModePresenter final : public Presenter {
 	public:
+		UCL_DECLARE_REF_ALIASES(IListener);
+
 		enum {
 			FLAG_NO_BOTTOM_BUTTON = 1,
 			FLAG_NO_MORE_OPTIONS = 2,
@@ -41,14 +47,19 @@ namespace gallery {
 			int m_flags;
 		};
 
-		enum Event {
-			EVENT_SELECT_ALL,
-			EVENT_DESELECT_ALL,
-			EVENT_BOTTOM_BUTTON_CLICK
+		enum class Event {
+			SELECT_ALL,
+			DESELECT_ALL,
+			BOTTOM_BUTTON_CLICK
+		};
+
+		class IListener : public ucl::Polymorphic {
+		public:
+			virtual void onSelectModeEvent(Event event) = 0;
 		};
 
 	public:
-		void setListener(const ISelectModeListenerWRef &listener);
+		void setListener(const IListenerWRef &listener);
 
 		void setVisible(bool value);
 		bool isVisible() const;
@@ -96,7 +107,7 @@ namespace gallery {
 		ucl::StyledWidgetSRef m_selectButton;
 		ucl::StyledWidgetSRef m_bottomButton;
 		ucl::StyledWidgetSRef m_popup;
-		ISelectModeListenerWRef m_listener;
+		IListenerWRef m_listener;
 		int m_totalCount;
 		int m_selectCount;
 		bool m_isVisible;
diff --git a/inc/presenters/ThumbnailPage.h b/inc/presenters/ThumbnailPage.h
index 626ab18..26fead4 100644
--- a/inc/presenters/ThumbnailPage.h
+++ b/inc/presenters/ThumbnailPage.h
@@ -19,16 +19,21 @@
 
 #include "Page.h"
 
-#include "view/IImageGridListener.h"
+#include "model/IMediaAlbum.h"
 
+#include "view/PageContent.h"
+#include "view/ImageGrid.h"
+
+#include "MoreOptionsPresenter.h"
 #include "AtspiHighlightHelper.h"
-#include "IMoreOptionsListener.h"
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(ThumbnailPage);
+
 	class ThumbnailPage final : public Page,
-			private IImageGridListener,
-			private IMoreOptionsListener {
+			private ImageGrid::IListener,
+			private MoreOptionsPresenter::IListener {
 	public:
 		class Builder {
 		public:
@@ -67,17 +72,17 @@ namespace gallery {
 		virtual void onActivateBy(const DeactivatorInfo &info) final override;
 		virtual void onDeactivateBy(const DeactivatorInfo &info) final override;
 
-		// IImageGridListener //
+		// ImageGrid::IListener //
 
 		virtual void onItemRealized(int itemIndex) final override;
 		virtual void onItemUnrealized(int itemIndex) final override;
 		virtual void onItemEvent(int itemIndex,
-				int event, int x, int y) final override;
+				ImageGrid::ItemEvent event, int x, int y) final override;
 
-		// IMoreOptionsListener //
+		// MoreOptionsPresenter::IListener //
 
 		virtual void onMoreOptionClicked(MoreOptionsPresenter &sender,
-				const MoreOption &option) final override;
+				const MoreOptionsPresenter::Option &option) final override;
 
 	private:
 		class RealizedItem;
diff --git a/inc/presenters/VideoPlayerPage.h b/inc/presenters/VideoPlayerPage.h
index e7d1794..3750f38 100644
--- a/inc/presenters/VideoPlayerPage.h
+++ b/inc/presenters/VideoPlayerPage.h
@@ -24,9 +24,14 @@
 #include "Page.h"
 
 #include "model/SoundManager.h"
+#include "model/MediaItem.h"
+
+#include "view/TouchParser.h"
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(VideoPlayerPage);
+
 	class VideoPlayerPage final : public Page {
 	public:
 		class Builder {
diff --git a/inc/presenters/ViewerPage.h b/inc/presenters/ViewerPage.h
index c685909..caffed4 100644
--- a/inc/presenters/ViewerPage.h
+++ b/inc/presenters/ViewerPage.h
@@ -19,12 +19,21 @@
 
 #include "Page.h"
 
-#include "IMoreOptionsListener.h"
+#include "model/MediaItem.h"
+
+#include "view/PageContent.h"
+#include "view/ImageViewer.h"
+#include "view/TouchParser.h"
+
+#include "MoreOptionsPresenter.h"
+#include "ProcessingPresenter.h"
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(ViewerPage);
+
 	class ViewerPage final : public Page,
-			private IMoreOptionsListener {
+			private MoreOptionsPresenter::IListener {
 	public:
 		class Builder {
 		public:
@@ -75,10 +84,10 @@ namespace gallery {
 
 		virtual void onBackKey() final override;
 
-		// IMoreOptionsListener //
+		// MoreOptionsPresenter::IListener //
 
 		virtual void onMoreOptionClicked(MoreOptionsPresenter &sender,
-				const MoreOption &option) final override;
+				const MoreOptionsPresenter::Option &option) final override;
 
 	private:
 		const MediaItemSRef m_media;
diff --git a/inc/presenters/types.h b/inc/presenters/types.h
index 2cc1e31..86e3572 100644
--- a/inc/presenters/types.h
+++ b/inc/presenters/types.h
@@ -17,42 +17,7 @@
 #ifndef __GALLERY_PRESENTERS_TYPES_H__
 #define __GALLERY_PRESENTERS_TYPES_H__
 
-#include <list>
-
-#include "../types.h"
 #include "view/types.h"
 #include "model/types.h"
 
-namespace gallery {
-
-	struct MoreOption {
-		int id;
-		ucl::TString text;
-		ucl::TString subText;
-		ucl::LayoutTheme iconTheme;
-	};
-
-	using MoreOptions = std::list<MoreOption>;
-
-	UCL_DECLARE_REF_ALIASES(Presenter);
-
-	UCL_DECLARE_REF_ALIASES(IMoreOptionsListener);
-	UCL_DECLARE_REF_ALIASES(MoreOptionsPresenter);
-
-	UCL_DECLARE_REF_ALIASES(ISelectModeListener);
-	UCL_DECLARE_REF_ALIASES(SelectModePresenter);
-
-	UCL_DECLARE_REF_ALIASES(ProcessingPresenter);
-
-	UCL_DECLARE_REF_ALIASES(AlertDialog);
-
-	UCL_DECLARE_REF_ALIASES(Page);
-
-	UCL_DECLARE_REF_ALIASES(NoContentPage);
-	UCL_DECLARE_REF_ALIASES(ThumbnailPage);
-	UCL_DECLARE_REF_ALIASES(PreviewPage);
-	UCL_DECLARE_REF_ALIASES(ViewerPage);
-	UCL_DECLARE_REF_ALIASES(VideoPlayerPage);
-}
-
 #endif // __GALLERY_PRESENTERS_TYPES_H__
diff --git a/inc/view/IImageGridListener.h b/inc/view/IImageGridListener.h
deleted file mode 100644
index 3a7d2b9..0000000
--- a/inc/view/IImageGridListener.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * 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 __GALLERY_VIEW_I_IMAGE_GRID_LISTENER_H__
-#define __GALLERY_VIEW_I_IMAGE_GRID_LISTENER_H__
-
-#include "types.h"
-
-namespace gallery {
-
-	class IImageGridListener : public ucl::Polymorphic {
-	public:
-		virtual void onItemRealized(int itemIndex) = 0;
-		virtual void onItemUnrealized(int itemIndex) = 0;
-		virtual void onItemEvent(int itemIndex, int event, int x, int y) = 0;
-		virtual void onTransitionFinished() {}
-		virtual Elm_Interface_Atspi_Accessible *onAccessObjectRequest(
-				bool isFlowsTo) { return nullptr; }
-	};
-}
-
-#endif // __GALLERY_VIEW_I_IMAGE_GRID_LISTENER_H__
diff --git a/inc/view/ImageGrid.h b/inc/view/ImageGrid.h
index 054f880..31aa0a5 100644
--- a/inc/view/ImageGrid.h
+++ b/inc/view/ImageGrid.h
@@ -23,12 +23,14 @@
 
 #include "ucl/misc/Timeout.h"
 
-#include "types.h"
-
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(ImageGrid);
+
 	class ImageGrid : public ucl::ElmWidget {
 	public:
+		UCL_DECLARE_REF_ALIASES(IListener);
+
 		enum class Type {
 			HCOMB_3X3,
 			LINEAR
@@ -38,19 +40,30 @@ namespace gallery {
 		public:
 			Builder();
 			Builder &setType(Type value);
-			Builder &setListener(IImageGridListener *value);
+			Builder &setListener(const IListenerWRef &value);
 			Builder &setSelectModeStartup(bool value);
 			ImageGridSRef build(ElmWidget &parent) const;
 		private:
 			Type m_type;
-			IImageGridListener *m_listener;
+			IListenerWRef m_listener;
 			bool m_selectModeStartup;
 		};
 
-		enum ItemEvent {
-			ITEM_EVENT_CLICK,
-			ITEM_EVENT_DOUBLE_TAP,
-			ITEM_EVENT_TAP_AND_HOLD
+		enum class ItemEvent {
+			CLICK,
+			DOUBLE_TAP,
+			TAP_AND_HOLD
+		};
+
+		class IListener : public ucl::Polymorphic {
+		public:
+			virtual void onItemRealized(int itemIndex) = 0;
+			virtual void onItemUnrealized(int itemIndex) = 0;
+			virtual void onItemEvent(int itemIndex,
+					ItemEvent event, int x, int y) = 0;
+			virtual void onTransitionFinished() {}
+			virtual Elm_Interface_Atspi_Accessible *onAccessObjectRequest(
+					bool isFlowsTo) { return nullptr; }
 		};
 
 		enum {
@@ -83,7 +96,7 @@ namespace gallery {
 		};
 
 	public:
-		void setListener(IImageGridListener *listener);
+		void setListener(const IListenerWRef &listener);
 
 		ucl::Result setItemCount(int count);
 
@@ -142,7 +155,8 @@ namespace gallery {
 		void addUnrealizeLock();
 		void removeUnrealizeLock();
 
-		void handleItemEvent(int itemIndex, int event, int x, int y) const;
+		void handleItemEvent(int itemIndex,
+				ItemEvent event, int x, int y) const;
 
 		// Accessibility
 
@@ -235,7 +249,7 @@ namespace gallery {
 		ucl::Widget m_rect2;
 		Evas_Object *m_circleScroller;
 
-		IImageGridListener *m_listener;
+		IListenerWRef m_listener;
 		int m_itemCount;
 
 		std::deque<SlotUPtr> m_slots;
diff --git a/inc/view/ImageViewer.h b/inc/view/ImageViewer.h
index 73395db..5b6f215 100644
--- a/inc/view/ImageViewer.h
+++ b/inc/view/ImageViewer.h
@@ -26,6 +26,8 @@ namespace gallery {
 
 	constexpr ucl::SmartEvent IMAGE_VIEWER_ZOOM_END {"gallery,zoom,end"};
 
+	UCL_DECLARE_REF_ALIASES(ImageViewer);
+
 	class ImageViewer final : public ucl::ElmWidget {
 	public:
 		class Builder {
diff --git a/inc/view/PageContent.h b/inc/view/PageContent.h
index 3995ccc..9e581b4 100644
--- a/inc/view/PageContent.h
+++ b/inc/view/PageContent.h
@@ -23,6 +23,8 @@
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(PageContent);
+
 	class PageContent : public ucl::ElmWidget {
 	public:
 		class Builder {
diff --git a/inc/view/TouchParser.h b/inc/view/TouchParser.h
index 6551e3c..659a512 100644
--- a/inc/view/TouchParser.h
+++ b/inc/view/TouchParser.h
@@ -23,6 +23,8 @@
 
 namespace gallery {
 
+	UCL_DECLARE_REF_ALIASES(TouchParser);
+
 	class TouchParser final : public ucl::RefCountAware {
 	public:
 		using TapHandler = ucl::Delegate<void(int x, int y)>;
diff --git a/inc/view/types.h b/inc/view/types.h
index f11e5c3..d458dc3 100644
--- a/inc/view/types.h
+++ b/inc/view/types.h
@@ -23,16 +23,4 @@
 
 #include "../types.h"
 
-namespace gallery {
-
-	class IImageGridListener;
-
-	UCL_DECLARE_REF_ALIASES(TouchParser);
-
-	UCL_DECLARE_REF_ALIASES(PageContent);
-
-	UCL_DECLARE_REF_ALIASES(ImageGrid);
-	UCL_DECLARE_REF_ALIASES(ImageViewer);
-}
-
 #endif // __GALLERY_VIEW_TYPES_H__
diff --git a/src/model/BaseJob.h b/src/model/BaseJob.h
index 939d88e..33c28cd 100644
--- a/src/model/BaseJob.h
+++ b/src/model/BaseJob.h
@@ -22,7 +22,6 @@
 #include "ucl/util/threading/Thread.h"
 
 #include "model/IJob.h"
-#include "types.h"
 
 namespace gallery {
 
diff --git a/src/model/GalleryAlbum.cpp b/src/model/GalleryAlbum.cpp
index b0eb5f0..a560e63 100644
--- a/src/model/GalleryAlbum.cpp
+++ b/src/model/GalleryAlbum.cpp
@@ -21,8 +21,6 @@
 
 #include "ucl/misc/TString.h"
 
-#include "model/MediaItem.h"
-
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/model/internal.h b/src/model/internal.h
index 788e2dd..61a9176 100644
--- a/src/model/internal.h
+++ b/src/model/internal.h
@@ -17,6 +17,8 @@
 #ifndef __GALLERY_MODEL_INTERNAL_H__
 #define __GALLERY_MODEL_INTERNAL_H__
 
+#include <media_content.h>
+
 #include "ucl/util/threading.h"
 
 #include "model/types.h"
diff --git a/src/presenters/Instance.cpp b/src/presenters/Instance.cpp
index 137e4e6..f060c0f 100644
--- a/src/presenters/Instance.cpp
+++ b/src/presenters/Instance.cpp
@@ -18,13 +18,8 @@
 
 #include <system_settings.h>
 
-#include "ucl/appfw/SysEventProvider.h"
 #include "ucl/appfw/helpers.h"
 
-#include "model/Gallery.h"
-#include "model/MediaItem.h"
-#include "model/IMediaAlbum.h"
-
 #include "presenters/NoContentPage.h"
 #include "presenters/ThumbnailPage.h"
 #include "presenters/ViewerPage.h"
@@ -47,6 +42,7 @@ namespace gallery {
 			SysEventProvider &sysEventProvider) :
 		RefCountAware(&rc),
 		m_sysEventProvider(sysEventProvider),
+		m_context(nullptr),
 		m_isScanInProgress(false),
 		m_isGroupMode(false)
 	{
diff --git a/src/presenters/MoreOptionsPresenter.cpp b/src/presenters/MoreOptionsPresenter.cpp
index 351ceda..067753a 100644
--- a/src/presenters/MoreOptionsPresenter.cpp
+++ b/src/presenters/MoreOptionsPresenter.cpp
@@ -18,8 +18,6 @@
 
 #include "ucl/gui/Layout.h"
 
-#include "presenters/IMoreOptionsListener.h"
-
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
@@ -75,7 +73,7 @@ namespace gallery {
 	}
 
 	MoreOptionsPresenter::Builder &MoreOptionsPresenter::Builder::addOption(
-			MoreOption option)
+			Option option)
 	{
 		if (!m_options) {
 			m_options = makeShared<MoreOptions>();
@@ -152,7 +150,7 @@ namespace gallery {
 		return RES_OK;
 	}
 
-	Result MoreOptionsPresenter::addItem(const MoreOption &option)
+	Result MoreOptionsPresenter::addItem(const Option &option)
 	{
 		const auto item = eext_more_option_item_append(*m_widget);
 		if (!item) {
@@ -258,7 +256,7 @@ namespace gallery {
 	}
 
 	void MoreOptionsPresenter::setListener(
-			const IMoreOptionsListenerWRef &listener)
+			const IListenerWRef &listener)
 	{
 		m_listener = listener;
 	}
diff --git a/src/presenters/Page.cpp b/src/presenters/Page.cpp
index c3d4f7b..24c6bbd 100644
--- a/src/presenters/Page.cpp
+++ b/src/presenters/Page.cpp
@@ -97,7 +97,7 @@ namespace gallery {
 
 	void Page::exit()
 	{
-		if (isAtTop() && !isAtBottom()) {
+		if (isAtTop() && !isAtBottom() && !m_navi->isInTransition()) {
 			m_navi->pop();
 			m_item = nullptr;
 		} else {
diff --git a/src/presenters/PreviewPage.cpp b/src/presenters/PreviewPage.cpp
index 283ec7a..13f96ae 100644
--- a/src/presenters/PreviewPage.cpp
+++ b/src/presenters/PreviewPage.cpp
@@ -16,17 +16,6 @@
 
 #include "presenters/PreviewPage.h"
 
-#include "model/IMediaAlbum.h"
-#include "model/MediaItem.h"
-#include "model/IJob.h"
-
-#include "view/PageContent.h"
-#include "view/ImageGrid.h"
-
-#include "presenters/MoreOptionsPresenter.h"
-#include "presenters/SelectModePresenter.h"
-#include "presenters/AlertDialog.h"
-#include "presenters/ProcessingPresenter.h"
 #include "presenters/ViewerPage.h"
 
 #include "resources.h"
@@ -294,7 +283,7 @@ namespace gallery {
 		}
 
 		m_imageGrid = ImageGrid::Builder().
-				setListener(this).
+				setListener(asWeakThis<ImageGrid::IListener>(this)).
 				setType(ImageGrid::Type::LINEAR).
 				setSelectModeStartup(m_selectModeStartup).
 				build(*m_content);
@@ -345,8 +334,8 @@ namespace gallery {
 		m_album->addChangeHandler(WEAK_DELEGATE(
 				PreviewPage::onAlbumChanged, asWeak(*this)));
 
-		m_more->setListener(asWeakThis<IMoreOptionsListener>(this));
-		m_smp->setListener(asWeakThis<ISelectModeListener>(this));
+		m_more->setListener(asWeakThis<MoreOptionsPresenter::IListener>(this));
+		m_smp->setListener(asWeakThis<SelectModePresenter::IListener>(this));
 
 		m_atspiHelper->setEventHandler(WEAK_DELEGATE(
 				PreviewPage::onAtspiHighlight, asWeak(*this)));
@@ -465,14 +454,14 @@ namespace gallery {
 	}
 
 	void PreviewPage::onItemEvent(const int itemIndex,
-			const int event, const int x, const int y)
+			const ImageGrid::ItemEvent event, const int x, const int y)
 	{
 		if (!isActive() || m_more->isOpened()) {
 			return;
 		}
 
 		if (m_isInSelectMode) {
-			if (event == ImageGrid::ITEM_EVENT_CLICK) {
+			if (event == ImageGrid::ItemEvent::CLICK) {
 				toggleItemSelected(itemIndex);
 				m_imageGrid->bringInItem(itemIndex);
 			}
@@ -480,13 +469,15 @@ namespace gallery {
 		}
 
 		switch (event) {
-		case ImageGrid::ITEM_EVENT_TAP_AND_HOLD:
+		case ImageGrid::ItemEvent::TAP_AND_HOLD:
 			switchToSelectMode();
 			toggleItemSelected(itemIndex);
 			break;
-		case ImageGrid::ITEM_EVENT_DOUBLE_TAP:
+		case ImageGrid::ItemEvent::DOUBLE_TAP:
 			openViewer(itemIndex, x, y);
 			break;
+		default:
+			break;
 		}
 	}
 
@@ -534,7 +525,7 @@ namespace gallery {
 	}
 
 	void PreviewPage::onMoreOptionClicked(MoreOptionsPresenter &sender,
-			const MoreOption &option)
+			const MoreOptionsPresenter::Option &option)
 	{
 		switch (option.id) {
 		case impl::MORE_OPTION_ID_DELETE:
@@ -548,18 +539,18 @@ namespace gallery {
 		}
 	}
 
-	void PreviewPage::onSelectModeEvent(const int event)
+	void PreviewPage::onSelectModeEvent(const SelectModePresenter::Event event)
 	{
 		if (m_more->isOpened()) {
 			return;
 		}
 
 		switch (event) {
-		case SelectModePresenter::EVENT_SELECT_ALL:
-		case SelectModePresenter::EVENT_DESELECT_ALL:
+		case SelectModePresenter::Event::SELECT_ALL:
+		case SelectModePresenter::Event::DESELECT_ALL:
 			{
 				const bool isSelect =
-						(event == SelectModePresenter::EVENT_SELECT_ALL);
+						(event == SelectModePresenter::Event::SELECT_ALL);
 				for (auto &item: m_items) {
 					item->setSelected(isSelect);
 				}
@@ -568,7 +559,7 @@ namespace gallery {
 			}
 			break;
 
-		case SelectModePresenter::EVENT_BOTTOM_BUTTON_CLICK:
+		case SelectModePresenter::Event::BOTTOM_BUTTON_CLICK:
 			confirmItemsDelete();
 			break;
 		}
diff --git a/src/presenters/ProcessingPresenter.cpp b/src/presenters/ProcessingPresenter.cpp
index bccd4cb..390b484 100644
--- a/src/presenters/ProcessingPresenter.cpp
+++ b/src/presenters/ProcessingPresenter.cpp
@@ -16,8 +16,6 @@
 
 #include "presenters/ProcessingPresenter.h"
 
-#include "ucl/gui/Window.h"
-
 #include "common.h"
 
 namespace gallery { namespace { namespace impl {
diff --git a/src/presenters/SelectModePresenter.cpp b/src/presenters/SelectModePresenter.cpp
index bba872c..c6a72f7 100644
--- a/src/presenters/SelectModePresenter.cpp
+++ b/src/presenters/SelectModePresenter.cpp
@@ -18,10 +18,6 @@
 
 #include "ucl/gui/WidgetItem.h"
 
-#include "view/PageContent.h"
-
-#include "presenters/ISelectModeListener.h"
-
 #include "resources.h"
 #include "common.h"
 
@@ -125,8 +121,7 @@ namespace gallery {
 		return RES_OK;
 	}
 
-	void SelectModePresenter::setListener(
-			const ISelectModeListenerWRef &listener)
+	void SelectModePresenter::setListener(const IListenerWRef &listener)
 	{
 		m_listener = listener;
 	}
@@ -346,7 +341,7 @@ namespace gallery {
 	{
 		if (m_popup && (m_popup->getEo() == obj)) {
 			dismissPopup();
-			dispatchEvent(EVENT_SELECT_ALL);
+			dispatchEvent(Event::SELECT_ALL);
 		}
 	}
 
@@ -355,7 +350,7 @@ namespace gallery {
 	{
 		if (m_popup && (m_popup->getEo() == obj)) {
 			dismissPopup();
-			dispatchEvent(EVENT_DESELECT_ALL);
+			dispatchEvent(Event::DESELECT_ALL);
 		}
 	}
 
@@ -371,7 +366,7 @@ namespace gallery {
 			Widget &widget, void *eventInfo)
 	{
 		if (isActive() && !m_popup && (m_selectCount > 0)) {
-			dispatchEvent(EVENT_BOTTOM_BUTTON_CLICK);
+			dispatchEvent(Event::BOTTOM_BUTTON_CLICK);
 		}
 	}
 
diff --git a/src/presenters/ThumbnailPage.cpp b/src/presenters/ThumbnailPage.cpp
index 5cf6e5b..9cb4eb5 100644
--- a/src/presenters/ThumbnailPage.cpp
+++ b/src/presenters/ThumbnailPage.cpp
@@ -16,13 +16,6 @@
 
 #include "presenters/ThumbnailPage.h"
 
-#include "model/IMediaAlbum.h"
-#include "model/MediaItem.h"
-
-#include "view/PageContent.h"
-#include "view/ImageGrid.h"
-
-#include "presenters/MoreOptionsPresenter.h"
 #include "presenters/PreviewPage.h"
 
 #include "resources.h"
@@ -178,7 +171,7 @@ namespace gallery {
 		}
 
 		m_imageGrid = ImageGrid::Builder().
-				setListener(this).
+				setListener(asWeakThis<ImageGrid::IListener>(this)).
 				setType(ImageGrid::Type::HCOMB_3X3).
 				build(*m_content);
 		if (!m_imageGrid) {
@@ -297,7 +290,7 @@ namespace gallery {
 	}
 
 	void ThumbnailPage::onItemEvent(const int itemIndex,
-			const int event, const int x, const int y)
+			const ImageGrid::ItemEvent event, const int x, const int y)
 	{
 		if (!isActive() || m_more->isOpened()) {
 			return;
@@ -306,9 +299,9 @@ namespace gallery {
 		bool selectModeStartup = false;
 
 		switch (event) {
-		case ImageGrid::ITEM_EVENT_CLICK:
+		case ImageGrid::ItemEvent::CLICK:
 			break;
-		case ImageGrid::ITEM_EVENT_TAP_AND_HOLD:
+		case ImageGrid::ItemEvent::TAP_AND_HOLD:
 			selectModeStartup = true;
 			break;
 		default:
@@ -325,7 +318,7 @@ namespace gallery {
 	}
 
 	void ThumbnailPage::onMoreOptionClicked(MoreOptionsPresenter &sender,
-			const MoreOption &option)
+			const MoreOptionsPresenter::Option &option)
 	{
 		switch (option.id) {
 		case impl::MORE_OPTION_ID_DELETE:
diff --git a/src/presenters/VideoPlayerPage.cpp b/src/presenters/VideoPlayerPage.cpp
index 8d367af..bd4a8c9 100644
--- a/src/presenters/VideoPlayerPage.cpp
+++ b/src/presenters/VideoPlayerPage.cpp
@@ -20,10 +20,6 @@
 
 #include "ucl/appfw/types.h"
 
-#include "model/MediaItem.h"
-
-#include "view/TouchParser.h"
-
 #include "resources.h"
 #include "common.h"
 
@@ -146,7 +142,8 @@ namespace gallery {
 		m_tickTimer(nullptr),
 		m_state(State::PAUSED),
 		m_isControlsVisible(false),
-		m_needAutoStart(true)
+		m_needAutoStart(true),
+		m_isPlaybackCompleted(false)
 	{
 	}
 
diff --git a/src/presenters/ViewerPage.cpp b/src/presenters/ViewerPage.cpp
index 8765444..5dcd31d 100644
--- a/src/presenters/ViewerPage.cpp
+++ b/src/presenters/ViewerPage.cpp
@@ -16,16 +16,6 @@
 
 #include "presenters/ViewerPage.h"
 
-#include "model/MediaItem.h"
-#include "model/IJob.h"
-
-#include "view/PageContent.h"
-#include "view/ImageViewer.h"
-#include "view/TouchParser.h"
-
-#include "presenters/MoreOptionsPresenter.h"
-#include "presenters/ProcessingPresenter.h"
-
 #include "resources.h"
 #include "common.h"
 
@@ -185,7 +175,8 @@ namespace gallery {
 					PageContent::Part::MORE_OPTIONS);
 			addDeactivatorSource(m_more->getWidget());
 
-			m_more->setListener(asWeakThis<IMoreOptionsListener>(this));
+			m_more->setListener(asWeakThis<
+					MoreOptionsPresenter::IListener>(this));
 		}
 
 		if (useThumb) {
@@ -278,7 +269,7 @@ namespace gallery {
 	}
 
 	void ViewerPage::onMoreOptionClicked(MoreOptionsPresenter &sender,
-			const MoreOption &option)
+			const MoreOptionsPresenter::Option &option)
 	{
 		sender.setOpened(false);
 
diff --git a/src/view/ImageGrid.cpp b/src/view/ImageGrid.cpp
index 09421c5..e7aa054 100644
--- a/src/view/ImageGrid.cpp
+++ b/src/view/ImageGrid.cpp
@@ -22,7 +22,6 @@
 #include "ucl/gui/Layout.h"
 #include "ucl/gui/Window.h"
 
-#include "view/IImageGridListener.h"
 #include "view/TouchParser.h"
 
 #include "common.h"
@@ -83,7 +82,6 @@ namespace gallery {
 
 	ImageGrid::Builder::Builder() :
 		m_type(Type::HCOMB_3X3),
-		m_listener(nullptr),
 		m_selectModeStartup(false)
 	{
 	}
@@ -95,7 +93,7 @@ namespace gallery {
 	}
 
 	ImageGrid::Builder &ImageGrid::Builder::setListener(
-			IImageGridListener *const value)
+			const IListenerWRef &value)
 	{
 		m_listener = value;
 		return *this;
@@ -524,7 +522,7 @@ namespace gallery {
 					LOG_RETURN_VOID(RES_ILLEGAL_STATE, "Item is not realized!");
 				}
 				m_imageGrid.handleItemEvent(m_realizeIndex,
-						ITEM_EVENT_CLICK, -1, -1);
+						ItemEvent::CLICK, -1, -1);
 			}
 
 			void onDoubleTap(const int x, const int y)
@@ -533,7 +531,7 @@ namespace gallery {
 					LOG_RETURN_VOID(RES_ILLEGAL_STATE, "Item is not realized!");
 				}
 				m_imageGrid.handleItemEvent(m_realizeIndex,
-						ITEM_EVENT_DOUBLE_TAP, x, y);
+						ItemEvent::DOUBLE_TAP, x, y);
 			}
 
 			void onTapAndHold(const int x, const int y)
@@ -542,7 +540,7 @@ namespace gallery {
 					LOG_RETURN_VOID(RES_ILLEGAL_STATE, "Item is not realized!");
 				}
 				m_imageGrid.handleItemEvent(m_realizeIndex,
-						ITEM_EVENT_TAP_AND_HOLD, x, y);
+						ItemEvent::TAP_AND_HOLD, x, y);
 			}
 
 			void onHighlighted(Widget &widget, void *eventInfo)
@@ -755,7 +753,6 @@ namespace gallery {
 		m_rect2(evas_object_rectangle_add(m_box.getEvas())),
 		m_circleScroller(nullptr),
 
-		m_listener(nullptr),
 		m_itemCount(0),
 
 		m_slotCount(0), // Must be even >= 2
@@ -898,7 +895,7 @@ namespace gallery {
 				WEAK_DELEGATE(ImageGrid::onKeeperUnhighlighted, asWeak(*this)));
 	}
 
-	void ImageGrid::setListener(IImageGridListener *const listener)
+	void ImageGrid::setListener(const IListenerWRef &listener)
 	{
 		m_listener = listener;
 	}
@@ -1282,8 +1279,8 @@ namespace gallery {
 		}
 	}
 
-	void ImageGrid::handleItemEvent(const int itemIndex, const int event,
-			const int x, const int y) const
+	void ImageGrid::handleItemEvent(const int itemIndex,
+			const ItemEvent event, const int x, const int y) const
 	{
 		if (m_listener) {
 			m_listener->onItemEvent(itemIndex, event, x, y);
diff --git a/ucl/inc/ucl/appfw/SysEventProvider.h b/ucl/inc/ucl/appfw/SysEventProvider.h
index 68539b3..7d224f4 100644
--- a/ucl/inc/ucl/appfw/SysEventProvider.h
+++ b/ucl/inc/ucl/appfw/SysEventProvider.h
@@ -23,6 +23,9 @@
 
 namespace ucl {
 
+	class SysEventProvider;
+	using SysEventProviderUPtr = std::unique_ptr<SysEventProvider>;
+
 	class SysEventProvider : public NonCopyable {
 	public:
 		using EventHandlerAddFunc = int (*)(app_event_handler_h *,
diff --git a/ucl/inc/ucl/appfw/types.h b/ucl/inc/ucl/appfw/types.h
index afe1f1d..5f10426 100644
--- a/ucl/inc/ucl/appfw/types.h
+++ b/ucl/inc/ucl/appfw/types.h
@@ -44,9 +44,6 @@ namespace ucl {
 
 	using AppParams = HashMap<AppParam, Variant>;
 
-	class SysEventProvider;
-	using SysEventProviderUPtr = std::unique_ptr<SysEventProvider>;
-
 	enum class SysEvent {
 		LANGUAGE_CHANGED,
 		REGION_FMT_CHANGED,