Add unit test case for RecentShortcutController.

Remove meaningless TODOs

Change-Id: I157ddce45ede7ac4967add7ba95e4c9986917e4f

14 files changed, 322 insertions, 340 deletions

diff --git a/TVHome/TVHome.TizenTV/Sniper.cs b/TVHome/TVHome.TizenTV/Sniper.cs
index 461b623..76017f0 100644
--- a/TVHome/TVHome.TizenTV/Sniper.cs
+++ b/TVHome/TVHome.TizenTV/Sniper.cs
@@ -6,308 +6,308 @@ using Tizen;
 
 namespace CoreApp
 {
-    /// <summary>
-    /// Handles recent screen shot of launched applications
-    /// </summary>
-    public class Sniper
-    {
-        /// <summary>
-        /// Main window of the application
-        /// </summary>
-        private IntPtr nativeWindow;
-
-        /// <summary>
-        /// A path of storage for recent screen shot of launched application
-        /// </summary>
-        private string storagePath;
-
-        /// <summary>
-        /// A width of recent screen shot
-        /// </summary>
-        private int imageWidth;
-
-        /// <summary>
-        /// A height of recent screen shot
-        /// </summary>
-        private int imageHeight;
-
-        /// <summary>
-        /// A flag indicates whether updating recent screen shot or not
-        /// </summary>
-        public bool SkipUpdateFlag;
-
-        /// <summary>
-        /// Callbacks of sniper events
-        /// </summary>
+	/// <summary>
+	/// Handles recent screen shot of launched applications
+	/// </summary>
+	public class Sniper
+	{
+		/// <summary>
+		/// Main window of the application
+		/// </summary>
+		private IntPtr nativeWindow;
+
+		/// <summary>
+		/// A path of storage for recent screen shot of launched application
+		/// </summary>
+		private string storagePath;
+
+		/// <summary>
+		/// A width of recent screen shot
+		/// </summary>
+		private int imageWidth;
+
+		/// <summary>
+		/// A height of recent screen shot
+		/// </summary>
+		private int imageHeight;
+
+		/// <summary>
+		/// A flag indicates whether updating recent screen shot or not
+		/// </summary>
+		public bool SkipUpdateFlag;
+
+		/// <summary>
+		/// Callbacks of sniper events
+		/// </summary>
 		private static InterOp.SniperCallback callbacks;
 
-        /// <summary>
-        /// A EventHandler handles recent screen shot update event
-        /// </summary>
-        public event EventHandler<Event> UpdatedEvent;
-
-        /// <summary>
-        /// A EventHandler handles add or remove application
-        /// </summary>
-        public event EventHandler<Event> AddRemoveEvent;
-
-        /// <summary>
-        /// A EventHandler handles skip update event
-        /// </summary>
-        public event EventHandler<Event> SkipUpdateEvent;
-
-        /// <summary>
-        /// TODO : Comment this
-        /// </summary>
-        public class Event : EventArgs
-        {
-            public string AppId;
-            public string InstanceId;
-            public string Info;
-        }
-
-        /// <summary>
-        /// A method for writing debug log
-        /// </summary>
-        /// <param name="message">A log message</param>
-        /// <param name="file">A path of caller file</param>
-        /// <param name="func">A name of caller function</param>
-        /// <param name="line">A line number of caller line</param>
-        private void WriteLog(string message, [CallerFilePath] string file = "", [CallerMemberName] string func = "", [CallerLineNumber] int line = 0)
-        {
-            Log.Debug("sniper", message);
-        }
-
-        /// <summary>
-        /// A method for handling launched application
-        /// </summary>
-        /// <param name="appId">An ID of launched application</param>
-        /// <param name="instanceId">An instance ID of launched application</param>
-        private void AddedCallback(string appId, string instanceId)
-        {
-            EventHandler<Event> handler = AddRemoveEvent;
-            Event eventInfo;
-
-            WriteLog("Added " + appId + " " + instanceId);
-
-            if (handler == null)
-            {
-                return;
-            }
-
-            try
-            {
-                eventInfo = new Event();
-            }
-            catch (Exception e)
-            {
-                WriteLog("Updated Exception : " + e.Message);
-                return;
-            }
-
-            eventInfo.AppId = appId;
-            eventInfo.InstanceId = instanceId;
-            eventInfo.Info = "Added";
-
-            handler(this, eventInfo);
-        }
-
-        /// <summary>
-        /// A method for handling terminated application
-        /// </summary>
-        /// <param name="appId">An ID of terminated application</param>
-        /// <param name="instanceId">An instance ID of terminated application</param>
-        private void RemovedCallback(string appId, string instanceId)
-        {
-            EventHandler<Event> handler = AddRemoveEvent;
-            Event eventInfo;
-
-            WriteLog("Removed " + appId + " " + instanceId);
-
-            if (handler == null)
-            {
-                return;
-            }
-
-            try
-            {
-                eventInfo = new Event();
-            }
-            catch (Exception e)
-            {
-                WriteLog("Updated Exception : " + e.Message);
-                return;
-            }
-
-            eventInfo.AppId = appId;
-            eventInfo.InstanceId = instanceId;
-            eventInfo.Info = "Removed";
-
-            handler(this, eventInfo);
-        }
-
-        /// <summary>
-        /// A method for handling application screen is updated
-        /// </summary>
-        /// <param name="appId">An ID of application that screen is updated</param>
-        /// <param name="instanceId">An instance ID of application that screen is updated</param>
-        /// <param name="Filename">A path of application screen shot</param>
-        private void UpdatedCallback(string appId, string instanceId, string Filename)
-        {
-            EventHandler<Event> handler = UpdatedEvent;
-            Event eventInfo;
-
-            WriteLog("Updated " + appId + " " + instanceId + " " + Filename);
-
-            if (handler == null)
-            {
-                return;
-            }
-
-            try
-            {
-                eventInfo = new Event();
-            }
-            catch (Exception e)
-            {
-                WriteLog("Updated Exception : " + e.Message);
-                return;
-            }
-
-            eventInfo.Info = Filename;
-            eventInfo.AppId = appId;
-            eventInfo.InstanceId = instanceId;
-
-            handler(this, eventInfo);
-        }
-
-        /// <summary>
-        /// A method for handling screen update is skipped
-        /// </summary>
-        /// <param name="appId">An ID of application that screen update is skipped</param>
-        /// <param name="instanceId">An instance ID of application that screen update is skipped</param>
-        /// <param name="Filename">A path of application screen shot</param>
-        /// <returns>Returns finish code</returns>
-        private int SkipUpdateCallback(string appId, string instanceId, string Filename)
-        {
-            EventHandler<Event> handler = SkipUpdateEvent;
-            Event eventInfo;
-
-            WriteLog("SkipUpdate" + appId + " " + instanceId + " " + Filename);
-
-            if (handler == null)
-            {
-                return 0;
-            }
-
-            try
-            {
-                eventInfo = new Event();
-            }
-            catch (Exception e)
-            {
-                WriteLog("SkipUpdated Exception : " + e.Message);
-                return 0;
-            }
-
-            eventInfo.Info = Filename;
-            eventInfo.AppId = appId;
-            eventInfo.InstanceId = instanceId;
-
-            handler(this, eventInfo);
-
-            if (SkipUpdateFlag)
-            {
-                WriteLog("Update is skipped : " + Filename);
-                SkipUpdateFlag = false;
-                return 1;
-            }
-
-            return 0;
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="window">Main window of this application</param>
-        /// <param name="path">Storage path</param>
-        /// <param name="width">Screen shot width</param>
-        /// <param name="height">Screen shot height</param>
-        public Sniper(IntPtr window, string path, int width, int height)
-        {
-            nativeWindow = window;
-            storagePath = path;
-            imageWidth = width;
-            imageHeight = height;
-            SkipUpdateFlag = false;
-        }
-
-        /// <summary>
-        /// A method for starting monitoring
-        /// Adds callbacks and initialize Sniper class
-        /// </summary>
-        public void StartMonitor()
-        {
-            try
-            {
-                callbacks = new InterOp.SniperCallback();
-                callbacks.Added = new InterOp.CallbackAddedRemoved(AddedCallback);
-                callbacks.Removed = new InterOp.CallbackAddedRemoved(RemovedCallback);
-                callbacks.Updated = new InterOp.CallbackUpdated(UpdatedCallback);
-                callbacks.SkipUpdate = new InterOp.CallbackSkipUpdate(SkipUpdateCallback);
-            }
-            catch (Exception e)
-            {
-                throw new SniperException(e.Message);
-            }
-
-            try
-            {
-                InterOp.sniper_init(nativeWindow, callbacks, storagePath, imageWidth, imageHeight);
-            }
-            catch (DllNotFoundException e)
-            {
-                WriteLog("Loadable library is not found " + e.StackTrace);
-            }
-
-            WriteLog("Sniper starts monitoring : " + storagePath + "ImageSize : " + imageWidth + "x" + imageHeight);
-        }
-
-        /// <summary>
-        /// A method stops monitoring
-        /// </summary>
-        public void StopMonitor()
-        {
-            try
-            {
-                InterOp.sniper_fini();
-            }
-            catch (DllNotFoundException e)
-            {
-                WriteLog("Loadable library is not found " + e.StackTrace);
-            }
-
-            WriteLog("Sniper stops monitoring : " + storagePath + "ImageSize : " + imageWidth + "x" + imageHeight);
-        }
-
-        /// <summary>
-        /// A method requests updating application screen shot
-        /// </summary>
-        /// <param name="instanceId">An instance ID of application</param>
-        public void RequestUpdate(string instanceId)
-        {
-            try
-            {
-                InterOp.sniper_request_update(instanceId);
-            }
-            catch (DllNotFoundException e)
-            {
-                WriteLog("Loadable library is not found " + e.StackTrace);
-            }
-
-            WriteLog("Sniper requests update (" + instanceId + ") : " + storagePath + "ImageSize : " + imageWidth + "x" + imageHeight);
-        }
-    }
+		/// <summary>
+		/// A EventHandler handles recent screen shot update event
+		/// </summary>
+		public event EventHandler<Event> UpdatedEvent;
+
+		/// <summary>
+		/// A EventHandler handles add or remove application
+		/// </summary>
+		public event EventHandler<Event> AddRemoveEvent;
+
+		/// <summary>
+		/// A EventHandler handles skip update event
+		/// </summary>
+		public event EventHandler<Event> SkipUpdateEvent;
+
+		/// <summary>
+		/// A event argument class for app screen update notification.
+		/// </summary>
+		public class Event : EventArgs
+		{
+			public string AppId;
+			public string InstanceId;
+			public string Info;
+		}
+
+		/// <summary>
+		/// A method for writing debug log
+		/// </summary>
+		/// <param name="message">A log message</param>
+		/// <param name="file">A path of caller file</param>
+		/// <param name="func">A name of caller function</param>
+		/// <param name="line">A line number of caller line</param>
+		private void WriteLog(string message, [CallerFilePath] string file = "", [CallerMemberName] string func = "", [CallerLineNumber] int line = 0)
+		{
+			Log.Debug("sniper", message);
+		}
+
+		/// <summary>
+		/// A method for handling launched application
+		/// </summary>
+		/// <param name="appId">An ID of launched application</param>
+		/// <param name="instanceId">An instance ID of launched application</param>
+		private void AddedCallback(string appId, string instanceId)
+		{
+			EventHandler<Event> handler = AddRemoveEvent;
+			Event eventInfo;
+
+			WriteLog("Added " + appId + " " + instanceId);
+
+			if (handler == null)
+			{
+				return;
+			}
+
+			try
+			{
+				eventInfo = new Event();
+			}
+			catch (Exception e)
+			{
+				WriteLog("Updated Exception : " + e.Message);
+				return;
+			}
+
+			eventInfo.AppId = appId;
+			eventInfo.InstanceId = instanceId;
+			eventInfo.Info = "Added";
+
+			handler(this, eventInfo);
+		}
+
+		/// <summary>
+		/// A method for handling terminated application
+		/// </summary>
+		/// <param name="appId">An ID of terminated application</param>
+		/// <param name="instanceId">An instance ID of terminated application</param>
+		private void RemovedCallback(string appId, string instanceId)
+		{
+			EventHandler<Event> handler = AddRemoveEvent;
+			Event eventInfo;
+
+			WriteLog("Removed " + appId + " " + instanceId);
+
+			if (handler == null)
+			{
+				return;
+			}
+
+			try
+			{
+				eventInfo = new Event();
+			}
+			catch (Exception e)
+			{
+				WriteLog("Updated Exception : " + e.Message);
+				return;
+			}
+
+			eventInfo.AppId = appId;
+			eventInfo.InstanceId = instanceId;
+			eventInfo.Info = "Removed";
+
+			handler(this, eventInfo);
+		}
+
+		/// <summary>
+		/// A method for handling application screen is updated
+		/// </summary>
+		/// <param name="appId">An ID of application that screen is updated</param>
+		/// <param name="instanceId">An instance ID of application that screen is updated</param>
+		/// <param name="Filename">A path of application screen shot</param>
+		private void UpdatedCallback(string appId, string instanceId, string Filename)
+		{
+			EventHandler<Event> handler = UpdatedEvent;
+			Event eventInfo;
+
+			WriteLog("Updated " + appId + " " + instanceId + " " + Filename);
+
+			if (handler == null)
+			{
+				return;
+			}
+
+			try
+			{
+				eventInfo = new Event();
+			}
+			catch (Exception e)
+			{
+				WriteLog("Updated Exception : " + e.Message);
+				return;
+			}
+
+			eventInfo.Info = Filename;
+			eventInfo.AppId = appId;
+			eventInfo.InstanceId = instanceId;
+
+			handler(this, eventInfo);
+		}
+
+		/// <summary>
+		/// A method for handling screen update is skipped
+		/// </summary>
+		/// <param name="appId">An ID of application that screen update is skipped</param>
+		/// <param name="instanceId">An instance ID of application that screen update is skipped</param>
+		/// <param name="Filename">A path of application screen shot</param>
+		/// <returns>Returns finish code</returns>
+		private int SkipUpdateCallback(string appId, string instanceId, string Filename)
+		{
+			EventHandler<Event> handler = SkipUpdateEvent;
+			Event eventInfo;
+
+			WriteLog("SkipUpdate" + appId + " " + instanceId + " " + Filename);
+
+			if (handler == null)
+			{
+				return 0;
+			}
+
+			try
+			{
+				eventInfo = new Event();
+			}
+			catch (Exception e)
+			{
+				WriteLog("SkipUpdated Exception : " + e.Message);
+				return 0;
+			}
+
+			eventInfo.Info = Filename;
+			eventInfo.AppId = appId;
+			eventInfo.InstanceId = instanceId;
+
+			handler(this, eventInfo);
+
+			if (SkipUpdateFlag)
+			{
+				WriteLog("Update is skipped : " + Filename);
+				SkipUpdateFlag = false;
+				return 1;
+			}
+
+			return 0;
+		}
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="window">Main window of this application</param>
+		/// <param name="path">Storage path</param>
+		/// <param name="width">Screen shot width</param>
+		/// <param name="height">Screen shot height</param>
+		public Sniper(IntPtr window, string path, int width, int height)
+		{
+			nativeWindow = window;
+			storagePath = path;
+			imageWidth = width;
+			imageHeight = height;
+			SkipUpdateFlag = false;
+		}
+
+		/// <summary>
+		/// A method for starting monitoring
+		/// Adds callbacks and initialize Sniper class
+		/// </summary>
+		public void StartMonitor()
+		{
+			try
+			{
+				callbacks = new InterOp.SniperCallback();
+				callbacks.Added = new InterOp.CallbackAddedRemoved(AddedCallback);
+				callbacks.Removed = new InterOp.CallbackAddedRemoved(RemovedCallback);
+				callbacks.Updated = new InterOp.CallbackUpdated(UpdatedCallback);
+				callbacks.SkipUpdate = new InterOp.CallbackSkipUpdate(SkipUpdateCallback);
+			}
+			catch (Exception e)
+			{
+				throw new SniperException(e.Message);
+			}
+
+			try
+			{
+				InterOp.sniper_init(nativeWindow, callbacks, storagePath, imageWidth, imageHeight);
+			}
+			catch (DllNotFoundException e)
+			{
+				WriteLog("Loadable library is not found " + e.StackTrace);
+			}
+
+			WriteLog("Sniper starts monitoring : " + storagePath + "ImageSize : " + imageWidth + "x" + imageHeight);
+		}
+
+		/// <summary>
+		/// A method stops monitoring
+		/// </summary>
+		public void StopMonitor()
+		{
+			try
+			{
+				InterOp.sniper_fini();
+			}
+			catch (DllNotFoundException e)
+			{
+				WriteLog("Loadable library is not found " + e.StackTrace);
+			}
+
+			WriteLog("Sniper stops monitoring : " + storagePath + "ImageSize : " + imageWidth + "x" + imageHeight);
+		}
+
+		/// <summary>
+		/// A method requests updating application screen shot
+		/// </summary>
+		/// <param name="instanceId">An instance ID of application</param>
+		public void RequestUpdate(string instanceId)
+		{
+			try
+			{
+				InterOp.sniper_request_update(instanceId);
+			}
+			catch (DllNotFoundException e)
+			{
+				WriteLog("Loadable library is not found " + e.StackTrace);
+			}
+
+			WriteLog("Sniper requests update (" + instanceId + ") : " + storagePath + "ImageSize : " + imageWidth + "x" + imageHeight);
+		}
+	}
 }
 
 /* End of a file */
diff --git a/TVHome/TVHome.TizenTV/SniperInterOp.cs b/TVHome/TVHome.TizenTV/SniperInterOp.cs
index 12712b9..d0bf60a 100644
--- a/TVHome/TVHome.TizenTV/SniperInterOp.cs
+++ b/TVHome/TVHome.TizenTV/SniperInterOp.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 namespace CoreApp
 {
     /// <summary>
-    /// TODO : Comment this
+    /// Sniper InterOp class for getting application's screen-shot.
     /// </summary>
     internal static partial class InterOp
     {
diff --git a/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj b/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
index 260847a..c13b831 100755
--- a/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
+++ b/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
@@ -51,7 +51,9 @@
   <ItemGroup>
     <Compile Include="Sniper.cs" />
     <Compile Include="SniperException.cs" />
-    <Compile Include="SniperInterOp.cs" />
+    <Compile Include="SniperInterOp.cs">
+		<ExcludeFromStyleCop>true</ExcludeFromStyleCop>
+	</Compile>
     <Compile Include="TVHome.TizenTV.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -163,23 +165,6 @@
     <Content Include="res\img_tizen_home_list_bg_white_focused.png" />
     <Content Include="res\img_tizen_home_list_bg_white_normal.png" />
     <Content Include="res\img_tizen_home_list_dimmed_recent.png" />
-    <Content Include="res\org.tizen.example.Amazon.Tizen.png" />
-    <Content Include="res\org.tizen.example.Bawee.Tizen.png" />
-    <Content Include="res\org.tizen.example.Be183.Tizen.png" />
-    <Content Include="res\org.tizen.example.Butterfly.Tizen.png" />
-    <Content Include="res\org.tizen.example.Calculator.Tizen.png" />
-    <Content Include="res\org.tizen.example.HomeFitness.Tizen.png" />
-    <Content Include="res\org.tizen.example.Hulu.Tizen.png" />
-    <Content Include="res\org.tizen.example.Mustache.Tizen.png" />
-    <Content Include="res\org.tizen.example.Netflix.Tizen.png" />
-    <Content Include="res\org.tizen.example.Radio.Tizen.png" />
-    <Content Include="res\org.tizen.example.Sports.Tizen.png" />
-    <Content Include="res\org.tizen.example.Switcho.Tizen.png" />
-    <Content Include="res\org.tizen.example.TocToc.Tizen.png" />
-    <Content Include="res\org.tizen.example.Toda.Tizen.png" />
-    <Content Include="res\org.tizen.example.Vimeo.Tizen.png" />
-    <Content Include="res\org.tizen.example.XBox.Tizen.png" />
-    <Content Include="res\org.tizen.example.YouTube.Tizen.png" />
     <Content Include="res\screenshot.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/TVHome/TVHome.TizenTV/TVHome.TizenTV.nuget.targets b/TVHome/TVHome.TizenTV/TVHome.TizenTV.nuget.targets
index c577474..a8d042b 100644
--- a/TVHome/TVHome.TizenTV/TVHome.TizenTV.nuget.targets
+++ b/TVHome/TVHome.TizenTV/TVHome.TizenTV.nuget.targets
@@ -3,7 +3,7 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">D:\git\home\TVHome\TVHome.TizenTV\TVHome.TizenTV.project.lock.json</ProjectAssetsFile>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">D:\_Data\csharp\spin_home\home\TVHome\TVHome.TizenTV\TVHome.TizenTV.project.lock.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\samsung\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>
@@ -13,6 +13,6 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)xamarin.forms\2.3.5-r233-003\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\2.3.5-r233-003\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+    <Import Project="$(NuGetPackageRoot)xamarin.forms\2.3.5-r233-008\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)xamarin.forms\2.3.5-r233-008\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/TVHome/TVHome.TizenTV/TVHome.TizenTV.project.json b/TVHome/TVHome.TizenTV/TVHome.TizenTV.project.json
index e049334..28ae18a 100755
--- a/TVHome/TVHome.TizenTV/TVHome.TizenTV.project.json
+++ b/TVHome/TVHome.TizenTV/TVHome.TizenTV.project.json
@@ -6,11 +6,11 @@
     "preserveCompilationContext": true
   },
   "dependencies": {
-    "ElmSharp": "1.1.0-beta-021",
-    "Microsoft.NETCore.App": "1.1.0",
-    "Tizen.Xamarin.Forms.Extension": "2.3.5-r233-002",
-    "Xamarin.Forms": "2.3.5-r233-003",
-    "Xamarin.Forms.Platform.Tizen": "2.3.5-r233-003"
+    "ElmSharp": "1.2.0-beta-001",
+    "Microsoft.NETCore.App": "1.1.2",
+    "Tizen.Xamarin.Forms.Extension": "2.3.5-r233-003",
+    "Xamarin.Forms": "2.3.5-r233-008",
+    "Xamarin.Forms.Platform.Tizen": "2.3.5-r233-008"
   },
   "runtimes": {
     "win": {},
diff --git a/TVHome/TVHome.TizenTV/res/org.tizen.example.Butterfly.Tizen.png b/TVHome/TVHome.TizenTV/res/org.tizen.example.Butterfly.Tizen.png
deleted file mode 100644
index 738a625..0000000
--- a/TVHome/TVHome.TizenTV/res/org.tizen.example.Butterfly.Tizen.png
+++ /dev/null
diff --git a/TVHome/TVHome.TizenTV/res/org.tizen.example.Calculator.Tizen.png b/TVHome/TVHome.TizenTV/res/org.tizen.example.Calculator.Tizen.png
deleted file mode 100644
index fb15bac..0000000
--- a/TVHome/TVHome.TizenTV/res/org.tizen.example.Calculator.Tizen.png
+++ /dev/null
diff --git a/TVHome/TVHome.TizenTV/res/org.tizen.example.HomeFitness.Tizen.png b/TVHome/TVHome.TizenTV/res/org.tizen.example.HomeFitness.Tizen.png
deleted file mode 100644
index 738a625..0000000
--- a/TVHome/TVHome.TizenTV/res/org.tizen.example.HomeFitness.Tizen.png
+++ /dev/null
diff --git a/TVHome/TVHome.TizenTV/res/org.tizen.example.Sports.Tizen.png b/TVHome/TVHome.TizenTV/res/org.tizen.example.Sports.Tizen.png
deleted file mode 100644
index fb15bac..0000000
--- a/TVHome/TVHome.TizenTV/res/org.tizen.example.Sports.Tizen.png
+++ /dev/null
diff --git a/TVHome/TVHome.TizenTV/res/org.tizen.example.Toda.Tizen.png b/TVHome/TVHome.TizenTV/res/org.tizen.example.Toda.Tizen.png
deleted file mode 100644
index fb15bac..0000000
--- a/TVHome/TVHome.TizenTV/res/org.tizen.example.Toda.Tizen.png
+++ /dev/null
diff --git a/TVHome/TVHome.TizenTV/res/org.tizen.example.YouTube.Tizen.png b/TVHome/TVHome.TizenTV/res/org.tizen.example.YouTube.Tizen.png
deleted file mode 100644
index 738a625..0000000
--- a/TVHome/TVHome.TizenTV/res/org.tizen.example.YouTube.Tizen.png
+++ /dev/null
diff --git a/TVHome/TVHome/TVHome.csproj b/TVHome/TVHome/TVHome.csproj
index 337d87c..fa9c891 100755
--- a/TVHome/TVHome/TVHome.csproj
+++ b/TVHome/TVHome/TVHome.csproj
@@ -139,32 +139,28 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Tizen.Xamarin.Forms.Extension, Version=0.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Tizen.Xamarin.Forms.Extension.2.3.5-r233-002\lib\portable-win+net45+wp80+win81+wpa81\Tizen.Xamarin.Forms.Extension.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\packages\Tizen.Xamarin.Forms.Extension.2.3.5-r233-003\lib\portable-win+net45+wp80+win81+wpa81\Tizen.Xamarin.Forms.Extension.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.5-r233-003\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.5-r233-008\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.5-r233-003\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.5-r233-008\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.5-r233-003\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.5-r233-008\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.5-r233-003\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.5-r233-003\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.5-r233-008\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.5-r233-008\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.5-r233-003\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.5-r233-003\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.5-r233-008\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.5-r233-008\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
 		Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/TVHome/TVHome/ViewModels/MainPageViewModel.cs b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
index 3990937..31be243 100755
--- a/TVHome/TVHome/ViewModels/MainPageViewModel.cs
+++ b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
@@ -68,9 +68,10 @@ namespace TVHome.ViewModels
             {
                 return selectedMenuName;
             }
+
             set
             {
-                if(selectedMenuName != value)
+                if (selectedMenuName != value)
                 {
                     selectedMenuName = value;
                     ChangeSelectedPanelName(value, true);
@@ -241,7 +242,7 @@ namespace TVHome.ViewModels
         }
 
         /// <summary>
-        /// A method for makeing MainMenu items and display in MainPanel
+        /// A method for making MainMenu items and display in MainPanel
         /// </summary>
         private void MakeMainMenuItems()
         {
diff --git a/TVHome/TVHome/packages.config b/TVHome/TVHome/packages.config
index 0dc7a5a..e9dfad3 100755
--- a/TVHome/TVHome/packages.config
+++ b/TVHome/TVHome/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Tizen.Xamarin.Forms.Extension" version="2.3.5-r233-002" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Xamarin.Forms" version="2.3.5-r233-003" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="Tizen.Xamarin.Forms.Extension" version="2.3.5-r233-003" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="Xamarin.Forms" version="2.3.5-r233-008" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
\ No newline at end of file