From: Heonjae Jang <heonjae.jang@samsung.com>
Date: Thu, 11 May 2017 11:42:45 +0000 (+0900)
Subject: Fix Home In Animation Issue
X-Git-Tag: submit/tizen/20170808.015446~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af695e370b8b49d452dfb40dcc7e9f77cd66e9fa;p=profile%2Ftv%2Fapps%2Fdotnet%2Fhome.git

Fix Home In Animation Issue

Change-Id: I7ff81af061423ae76e4109b995be3af27e707f9f
Signed-off-by: Heonjae Jang <heonjae.jang@samsung.com>
---

diff --git a/LibTVRefCommonPortable/Utils/SizeUtils.cs b/LibTVRefCommonPortable/Utils/SizeUtils.cs
index b8ca066..6eebc03 100644
--- a/LibTVRefCommonPortable/Utils/SizeUtils.cs
+++ b/LibTVRefCommonPortable/Utils/SizeUtils.cs
@@ -136,6 +136,11 @@ namespace LibTVRefCommonPortable.Utils
             return Convert.ToInt32((double)((double)widthBaseSize / (double)BaseScreenWidth) * (double)(ScreenWidth));
         }
 
+        public static double GetWidthSizeDouble(double widthBaseSize)
+        {
+            return (double)(widthBaseSize / (double)BaseScreenWidth) * (double)(ScreenWidth);
+        }
+
         /// <summary>
         /// A method provides a converted font size.
         /// </summary>
diff --git a/TVHome/TVHome.TizenTV/res/ic_apps_launcher_mediahub_164.png b/TVHome/TVHome.TizenTV/res/ic_apps_launcher_mediahub_164.png
new file mode 100644
index 0000000..041c15f
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_apps_launcher_mediahub_164.png differ
diff --git a/TVHome/TVHome.TizenTV/res/ic_apps_launcher_mediahub_196.png b/TVHome/TVHome.TizenTV/res/ic_apps_launcher_mediahub_196.png
new file mode 100644
index 0000000..f28db0f
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_apps_launcher_mediahub_196.png differ
diff --git a/TVHome/TVHome.TizenTV/res/ic_home_launcher_mediahub_136.png b/TVHome/TVHome.TizenTV/res/ic_home_launcher_mediahub_136.png
new file mode 100644
index 0000000..2025049
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_home_launcher_mediahub_136.png differ
diff --git a/TVHome/TVHome.TizenTV/res/ic_home_launcher_mediahub_168.png b/TVHome/TVHome.TizenTV/res/ic_home_launcher_mediahub_168.png
new file mode 100644
index 0000000..18ce5f0
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_home_launcher_mediahub_168.png differ
diff --git a/TVHome/TVHome.TizenTV/res/ic_home_launcher_mediahub_42.png b/TVHome/TVHome.TizenTV/res/ic_home_launcher_mediahub_42.png
new file mode 100644
index 0000000..52d9da5
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_home_launcher_mediahub_42.png differ
diff --git a/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_138.png b/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_138.png
index bdfacb1..f28db0f 100755
Binary files a/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_138.png and b/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_138.png differ
diff --git a/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_182.png b/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_182.png
index dc9203e..f28db0f 100755
Binary files a/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_182.png and b/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_182.png differ
diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_mediahub_focused.png b/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_mediahub_focused.png
index 6277008..f28db0f 100755
Binary files a/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_mediahub_focused.png and b/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_mediahub_focused.png differ
diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_mediahub_normal.png b/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_mediahub_normal.png
index b58cfa3..f28db0f 100755
Binary files a/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_mediahub_normal.png and b/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_mediahub_normal.png differ
diff --git a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml
index a31697f..e9c2e88 100755
--- a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml
+++ b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml
@@ -4,11 +4,6 @@
                       xmlns:Controls="clr-namespace:TVHome.Controls"
                       x:Class="TVHome.Controls.SubPanelThumbnailButton">
   <RelativeLayout x:Name="ButtonBox">
-    <Image x:Name="ThumnailDimLayer"
-            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
-            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=1}"
-            Opacity="0.99"
-            Source="img_tizen_home_list_dim_recent.png"/>
     <Image x:Name="ThumbnailImage"
             RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
             RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=1}"
@@ -37,6 +32,12 @@
             FontFamily="BreezeSans"
             Text="{Binding CurrentStateDescription.Label}"
             TextColor="#FFFFFF"/>
+      <Image x:Name="ThumnailDimLayer"
+            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
+            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=1}"
+            Aspect="Fill"
+            Opacity="0.99"
+            Source="img_tizen_home_list_dimmed_recent.png"/>
     <Button x:Name="ButtonFocusArea"
             RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
             RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=1}"
diff --git a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
index f8f0b53..8b2689d 100755
--- a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
@@ -125,7 +125,6 @@ namespace TVHome.Controls
             ThumbnailGradient.Source = "ic_list_thumbnail_gradient_focused.9.png";
             ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
             //ThumbnailTitle.FadeTo(0.8, 300);
-            ThumnailDimLayer.FadeTo(0.0, 300);
 #pragma warning restore CS4014
             await View.ScaleTo(1.2, 300);
         }
@@ -142,7 +141,6 @@ namespace TVHome.Controls
             //ThumbnailTitle.FadeTo(0.3, 300);
             ThumbnailGradient.Source = "ic_list_thumbnail_gradient_normal.9.png";
             ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
-            ThumnailDimLayer.FadeTo(0.99, 300);
 #pragma warning restore CS4014
             await View.ScaleTo(1.0, 300);
         }
diff --git a/TVHome/TVHome/ViewModels/MainPageViewModel.cs b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
index 25c10a9..3228473 100755
--- a/TVHome/TVHome/ViewModels/MainPageViewModel.cs
+++ b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
@@ -146,12 +146,12 @@ namespace TVHome.ViewModels
             }
         }
 
-        public int SubThumbPanelSpacing
+        public double SubThumbPanelSpacing
         {
             get
             {
                 // TODO : set proper size
-                return SizeUtils.GetWidthSize(27);
+                return SizeUtils.GetWidthSizeDouble(27.5);
             }
         }
 
diff --git a/TVHome/TVHome/Views/MainPage.xaml.cs b/TVHome/TVHome/Views/MainPage.xaml.cs
index 8a4be03..8541d7f 100755
--- a/TVHome/TVHome/Views/MainPage.xaml.cs
+++ b/TVHome/TVHome/Views/MainPage.xaml.cs
@@ -67,6 +67,7 @@ namespace TVHome.Views
         /// </summary>
         private async void Iconified()
         {
+            SubPanelDictionary[SelectedMenuName]?.ForceHidePanel();
 #pragma warning disable CS4014
             SubPanelDictionary[SelectedMenuName]?.TranslateTo(0.0, SizeUtils.GetHeightSize(100), 150);
             SubPanelDictionary[SelectedMenuName]?.FadeTo(0,150);
diff --git a/TVHome/TVHome/Views/MainPanel.xaml.cs b/TVHome/TVHome/Views/MainPanel.xaml.cs
index 79b4687..fc53ed6 100755
--- a/TVHome/TVHome/Views/MainPanel.xaml.cs
+++ b/TVHome/TVHome/Views/MainPanel.xaml.cs
@@ -21,6 +21,7 @@ using TVHome.ViewModels;
 using Xamarin.Forms;
 using System.Threading.Tasks;
 using LibTVRefCommonPortable.Utils;
+using System;
 
 namespace TVHome.Views
 {
@@ -143,5 +144,10 @@ namespace TVHome.Views
         {
 
         }
+
+        public override void ForceHidePanel()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/TVHome/TVHome/Views/Panel.cs b/TVHome/TVHome/Views/Panel.cs
index fe8cfbe..93d5274 100755
--- a/TVHome/TVHome/Views/Panel.cs
+++ b/TVHome/TVHome/Views/Panel.cs
@@ -148,6 +148,7 @@ namespace TVHome.Views
         /// A method for handling to hide panel
         /// </summary>
         public abstract void HidePanel();
+        public abstract void ForceHidePanel();
 
         /// <summary>
         /// A method for handling to show panel
diff --git a/TVHome/TVHome/Views/SubPanel.xaml.cs b/TVHome/TVHome/Views/SubPanel.xaml.cs
index 0965667..d3ae466 100755
--- a/TVHome/TVHome/Views/SubPanel.xaml.cs
+++ b/TVHome/TVHome/Views/SubPanel.xaml.cs
@@ -275,7 +275,7 @@ namespace TVHome.Views
             {
                 item.IsEnabled = true;
                 item.FindByName<Image>("ButtonDimmedImage").Opacity = 0.99;
-                item.FindByName<Image>("ButtonDimmedImage").ScaleTo(1.0, 300);
+                //item.FindByName<Image>("ButtonDimmedImage").ScaleTo(1.0, 300);
             }
 
             this.TranslateTo(0, 0, 300);
@@ -452,5 +452,15 @@ namespace TVHome.Views
             ButtonViewList[index] = prevItemView;
             ButtonViewList[prevIndex] = originItemView;
         }
+
+        public override void ForceHidePanel()
+        {
+            foreach (var item in PanelButtonStack.Children)
+            {
+                item.FindByName<Image>("ButtonDimmedImage").Opacity = 0.99;
+            }
+            TranslationY = selectTransitionHeight;
+            Opacity = 1;
+        }
     }
 }
\ No newline at end of file
diff --git a/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs b/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs
index 31da965..7a06aea 100755
--- a/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs
+++ b/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs
@@ -26,6 +26,7 @@ using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Views
 {
+    using System;
     using System.Threading;
     using Tizen = Xamarin.Forms.PlatformConfiguration.Tizen;
     /// <summary>
@@ -216,6 +217,7 @@ namespace TVHome.Views
                 foreach (var item in PanelButtonStack.Children)
                 {
                     item.IsEnabled = true;
+                    item.FindByName<Xamarin.Forms.Image>("ThumnailDimLayer").Opacity = 1;
                 }
 #pragma warning disable CS4014
                 this.TranslateTo(0, 0, 300);
@@ -235,7 +237,10 @@ namespace TVHome.Views
             }
 
             OnFocusedCommand.Execute("");
-
+            foreach (var item in PanelButtonStack.Children)
+            {
+                item.FindByName<Xamarin.Forms.Image>("ThumnailDimLayer").Opacity = 0;
+            }
             isFocused = true;
             var button = PanelButtonStack.Children[0];
             button.FindByName<Button>("ButtonFocusArea").Focus();
@@ -245,5 +250,16 @@ namespace TVHome.Views
             this.TranslateTo(0, -selectTransitionHeight, 300);
 #pragma warning restore CS4014
         }
+
+        public override void ForceHidePanel()
+        {
+            foreach (var item in PanelButtonStack.Children)
+            {
+                item.IsEnabled = true;
+                item.FindByName<Xamarin.Forms.Image>("ThumnailDimLayer").Opacity = 1;
+            }
+            this.TranslationY = selectTransitionHeight;
+            Opacity = 1;
+        }
     }
 }
\ No newline at end of file