Remove comment for using TizenSpecific

Change-Id: I7b9352e428f3e33a818bbe602a28ce003f4fc365
Signed-off-by: Heonjae.Jang <Heonjae.Jang@samsung.com>

9 files changed, 48 insertions, 32 deletions

diff --git a/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj b/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
index e34c54b..faa60d9 100644
--- a/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
+++ b/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
@@ -22,6 +22,10 @@
     <DebugType>None</DebugType>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <Folder Include="lib\" />
   </ItemGroup>
@@ -35,7 +39,7 @@
     <PackageReference Include="Tizen.NET" Version="4.0.0-preview1-00143" />
     <PackageReference Include="Tizen.NET.Sdk" Version="0.9.18-pre1" />
     <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00005" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.266-pre1" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
     <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.4.0-r266-006" />
   </ItemGroup>
   <ItemGroup>
diff --git a/TVHome/TVHome/Controls/MainPanelButton.xaml.cs b/TVHome/TVHome/Controls/MainPanelButton.xaml.cs
index cef0a9a..0d731aa 100755
--- a/TVHome/TVHome/Controls/MainPanelButton.xaml.cs
+++ b/TVHome/TVHome/Controls/MainPanelButton.xaml.cs
@@ -17,6 +17,7 @@
 using LibTVRefCommonPortable.Utils;
 using System;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -49,7 +50,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(236);
             HeightRequest = SizeUtils.GetHeightSize(260);
             ButtonTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
 
             PropertyChanged += MainPanelButton_PropertyChanged;
         }
diff --git a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
index 013c6f6..4ce34ec 100755
--- a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
@@ -17,6 +17,7 @@
 using LibTVRefCommonPortable.Utils;
 using System;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -40,7 +41,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(182);
             HeightRequest = SizeUtils.GetHeightSize(230);
             ButtonTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
         }
 
         /// <summary>
@@ -65,7 +66,7 @@ namespace TVHome.Controls
             OnFocusedCommand?.Execute("");
 
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
             ButtonTitle.FadeTo(0.99, 300);
             ButtonTitle.TranslateTo(0, selectTransitionHeight, 300);
 #pragma warning restore CS4014
@@ -81,7 +82,7 @@ namespace TVHome.Controls
         public override async void OnUnfocused(object sender, FocusEventArgs e)
         {
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
             ButtonTitle.FadeTo(0.5, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
 #pragma warning restore CS4014
diff --git a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
index 6c8bd8a..9f671fe 100755
--- a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
@@ -18,6 +18,7 @@ using System;
 using LibTVRefCommonPortable.Utils;
 using Xamarin.Forms;
 using Tizen.Xamarin.Forms.Extension;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -46,7 +47,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(182);
             HeightRequest = SizeUtils.GetHeightSize(230);
             ButtonTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
 
             // TODO : make this subscribe when it is in the move mode.
             MessagingCenter.Subscribe<App, string>(this, "NavigationKeyPressed", (sender, e) =>
@@ -220,7 +221,7 @@ namespace TVHome.Controls
             OnFocusedCommand?.Execute("");
 
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
             ButtonTitle.FadeTo(0.8, 300);
             ButtonTitle.TranslateTo(0, selectTransitionHeight, 300);
 #pragma warning restore CS4014
@@ -246,7 +247,7 @@ namespace TVHome.Controls
             PanelButtonState = PanelButtonState.Show;
 
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
             ButtonTitle.FadeTo(0.6, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
 #pragma warning restore CS4014
diff --git a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs
index 1d25cd3..f5c6eff 100755
--- a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs
@@ -17,6 +17,7 @@
 using LibTVRefCommonPortable.Utils;
 using System;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -40,7 +41,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(182);
             HeightRequest = SizeUtils.GetHeightSize(230);
             ButtonTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
         }
 
         /// <summary>
@@ -65,7 +66,7 @@ namespace TVHome.Controls
             OnFocusedCommand?.Execute("");
 
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
             ButtonTitle.FadeTo(0.99, 300);
             ButtonTitle.TranslateTo(0, selectTransitionHeight, 300);
 #pragma warning restore CS4014
@@ -81,7 +82,7 @@ namespace TVHome.Controls
         public override async void OnUnfocused(object sender, FocusEventArgs e)
         {
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
             ButtonTitle.FadeTo(0.5, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
 #pragma warning restore CS4014
diff --git a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
index 88ef787..b0a487e 100755
--- a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
@@ -17,6 +17,7 @@ using LibTVRefCommonPortable.Utils;
 using System;
 using Tizen.Xamarin.Forms.Extension;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -35,7 +36,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(320);
             HeightRequest = SizeUtils.GetHeightSize(180);
             ThumbnailTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
 
         }
 
@@ -66,7 +67,7 @@ namespace TVHome.Controls
 
 #pragma warning disable CS4014
             ThumbnailGradient.Source = "ic_list_thumbnail_gradient_focused.9.png";
-            //ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
             //ThumbnailTitle.FadeTo(0.8, 300);
 #pragma warning restore CS4014
             await this.ScaleTo(1.2, 300);
@@ -89,7 +90,7 @@ namespace TVHome.Controls
 #pragma warning disable CS4014
             //ThumbnailTitle.FadeTo(0.3, 300);
             ThumbnailGradient.Source = "ic_list_thumbnail_gradient_normal.9.png";
-            //ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
 #pragma warning restore CS4014
             await this.ScaleTo(1.0, 300);
         }
diff --git a/TVHome/TVHome/TVHome.csproj b/TVHome/TVHome/TVHome.csproj
index 0a45e6a..7b63e4b 100755
--- a/TVHome/TVHome/TVHome.csproj
+++ b/TVHome/TVHome/TVHome.csproj
@@ -4,9 +4,13 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00005" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.266-pre1" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TVHome/TVHome/Views/MainPage.xaml.cs b/TVHome/TVHome/Views/MainPage.xaml.cs
index d015a70..23e505b 100755
--- a/TVHome/TVHome/Views/MainPage.xaml.cs
+++ b/TVHome/TVHome/Views/MainPage.xaml.cs
@@ -18,6 +18,7 @@ using System.Collections.Generic;
 using LibTVRefCommonPortable.Utils;
 using Xamarin.Forms;
 using TVHome.ViewModels;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Views
 {
@@ -188,12 +189,12 @@ namespace TVHome.Views
             Button appsMainPanelButton = PageMainPanel.GetButtonToFocusing(1);
             Button settingMainPanelButton = PageMainPanel.GetButtonToFocusing(2);
 
-            //recentMainPanelButton.On<Tizen>().SetNextFocusLeftView(recentMainPanelButton);
-            //recentMainPanelButton.On<Tizen>().SetNextFocusRightView(appsMainPanelButton);
-            //appsMainPanelButton.On<Tizen>().SetNextFocusLeftView(recentMainPanelButton);
-            //appsMainPanelButton.On<Tizen>().SetNextFocusRightView(settingMainPanelButton);
-            //settingMainPanelButton.On<Tizen>().SetNextFocusLeftView(appsMainPanelButton);
-            //settingMainPanelButton.On<Tizen>().SetNextFocusRightView(settingMainPanelButton);
+            recentMainPanelButton.On<Tizen>().SetNextFocusLeftView(recentMainPanelButton);
+            recentMainPanelButton.On<Tizen>().SetNextFocusRightView(appsMainPanelButton);
+            appsMainPanelButton.On<Tizen>().SetNextFocusLeftView(recentMainPanelButton);
+            appsMainPanelButton.On<Tizen>().SetNextFocusRightView(settingMainPanelButton);
+            settingMainPanelButton.On<Tizen>().SetNextFocusLeftView(appsMainPanelButton);
+            settingMainPanelButton.On<Tizen>().SetNextFocusRightView(settingMainPanelButton);
         }
 
         /// <summary>
@@ -206,24 +207,24 @@ namespace TVHome.Views
 
             if (recentSubPanelButtons.Count > 1)
             {
-                //recentMainPanelButton.On<Tizen>().SetNextFocusDownView(recentSubPanelButtons[0].FindByName<Button>("ButtonFocusArea"));
+                recentMainPanelButton.On<Tizen>().SetNextFocusDownView(recentSubPanelButtons[0].FindByName<Button>("ButtonFocusArea"));
             }
 
             foreach (var item in recentSubPanelButtons)
             {
-                //item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(recentMainPanelButton);
+                item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(recentMainPanelButton);
             }
 
             for (var i = 0; i < recentSubPanelButtons.Count; i++)
             {
                 if (i != 0)
                 {
-                    //recentSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusLeftView(recentSubPanelButtons[i - 1].FindByName<Button>("ButtonFocusArea"));
+                    recentSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusLeftView(recentSubPanelButtons[i - 1].FindByName<Button>("ButtonFocusArea"));
                 }
 
                 if (i != recentSubPanelButtons.Count - 1)
                 {
-                    //recentSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusRightView(recentSubPanelButtons[i + 1].FindByName<Button>("ButtonFocusArea"));
+                    recentSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusRightView(recentSubPanelButtons[i + 1].FindByName<Button>("ButtonFocusArea"));
                 }
             }
         }
@@ -239,24 +240,24 @@ namespace TVHome.Views
 
             if (appsSubPanelButtons.Count > 2)
             {
-                //appsMainPanelButton.On<Tizen>().SetNextFocusDownView(appsSubPanelButtons[1].FindByName<Button>("ButtonFocusArea"));
+                appsMainPanelButton.On<Tizen>().SetNextFocusDownView(appsSubPanelButtons[1].FindByName<Button>("ButtonFocusArea"));
             }
 
             foreach (var item in appsSubPanelButtons)
             {
-                //item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(appsMainPanelButton);
+                item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(appsMainPanelButton);
             }
 
             for (var i = 0; i < appsSubPanelButtons.Count; i++)
             {
                 if (i != 0)
                 {
-                    //appsSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusLeftView(appsSubPanelButtons[i - 1].FindByName<Button>("ButtonFocusArea"));
+                    appsSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusLeftView(appsSubPanelButtons[i - 1].FindByName<Button>("ButtonFocusArea"));
                 }
 
                 if (i != appsSubPanelButtons.Count - 1)
                 {
-                    //appsSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusRightView(appsSubPanelButtons[i + 1].FindByName<Button>("ButtonFocusArea"));
+                    appsSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusRightView(appsSubPanelButtons[i + 1].FindByName<Button>("ButtonFocusArea"));
                 }
             }
         }
@@ -271,12 +272,12 @@ namespace TVHome.Views
 
             if (settingSubPanelButtons.Count > 2)
             {
-                //settingMainPanelButton.On<Tizen>().SetNextFocusDownView(settingSubPanelButtons[1].FindByName<Button>("ButtonFocusArea"));
+                settingMainPanelButton.On<Tizen>().SetNextFocusDownView(settingSubPanelButtons[1].FindByName<Button>("ButtonFocusArea"));
             }
 
             foreach (var item in settingSubPanelButtons)
             {
-                //item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(settingMainPanelButton);
+                item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(settingMainPanelButton);
             }
         }
 
@@ -290,6 +291,7 @@ namespace TVHome.Views
             DebuggingUtils.Dbg("MainPage_PropertyChanged, status = " + CurrentState + ", - " + e.PropertyName);
             if (e.PropertyName.CompareTo("CurrentState") == 0)
             {
+                DebuggingUtils.Dbg("MyTest" + CurrentState);
                 switch (CurrentState)
                 {
                     case AppState.HomeIconified:
diff --git a/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs b/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs
index 8b5930d..521d2ab 100755
--- a/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs
+++ b/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs
@@ -25,6 +25,7 @@ using System.Collections.Generic;
 namespace TVHome.Views
 {
     using TVHome.ViewModels;
+    using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
     using Tizen = Xamarin.Forms.PlatformConfiguration.Tizen;
     /// <summary>
     /// SubThumnailPanel in Main Page for Recent
@@ -69,7 +70,7 @@ namespace TVHome.Views
             SetPanelDisplay();
 
             PropertyChanged += OnPropertyChanged;
-            //NoContentInfoText.On<Tizen>().SetFontWeight(FontWeight.Light);
+            NoContentInfoText.On<Tizen>().SetFontWeight(FontWeight.Light);
 
             ButtonList = new List<PanelButton>();
         }