From cb5418de4668713a45ca77b59e96775b0f985711 Mon Sep 17 00:00:00 2001
From: Hyerim Kim <rimi.kim@samsung.com>
Date: Fri, 10 Mar 2017 16:12:08 +0900
Subject: [PATCH] Add All apps/Media Hub/Add pin icons in App list Add Dimmed
 image for app list icons

Change-Id: I07d5a2f4007ffc564644b2d246cf45ac4fd282dc
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>
---
 .../Models/AppShortcutController.cs           | 63 +++++++++++++++-
 .../Models/SettingShortcutFactory.cs          | 18 +++++
 TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj   |  1 +
 TVHome/TVHome/Controls/SubPanelButton.xaml    | 34 +++++----
 .../Controls/SubPanelReservedButton.xaml      | 51 +++++++++++++
 .../Controls/SubPanelReservedButton.xaml.cs   | 71 +++++++++++++++++++
 TVHome/TVHome/TVHome.csproj                   | 11 ++-
 TVHome/TVHome/Views/MainPage.xaml             |  5 --
 TVHome/TVHome/Views/SubPanel.xaml.cs          | 27 ++++++-
 9 files changed, 258 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 LibTVRefCommonPortable/Models/AppShortcutController.cs
 mode change 100644 => 100755 LibTVRefCommonPortable/Models/SettingShortcutFactory.cs
 mode change 100644 => 100755 TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
 mode change 100644 => 100755 TVHome/TVHome/Controls/SubPanelButton.xaml
 create mode 100755 TVHome/TVHome/Controls/SubPanelReservedButton.xaml
 create mode 100755 TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs
 mode change 100644 => 100755 TVHome/TVHome/TVHome.csproj
 mode change 100644 => 100755 TVHome/TVHome/Views/SubPanel.xaml.cs

diff --git a/LibTVRefCommonPortable/Models/AppShortcutController.cs b/LibTVRefCommonPortable/Models/AppShortcutController.cs
old mode 100644
new mode 100755
index b48eae1..81dcc3b
--- a/LibTVRefCommonPortable/Models/AppShortcutController.cs
+++ b/LibTVRefCommonPortable/Models/AppShortcutController.cs
@@ -26,6 +26,7 @@ namespace LibTVRefCommmonPortable.Models
 {
     public class AppShortcutController
     {
+        private List<AppShortcutInfo> returnPinnedAppsInfo = new List<AppShortcutInfo>();
 
         public AppShortcutController()
         {
@@ -60,12 +61,69 @@ namespace LibTVRefCommmonPortable.Models
             return appShortcutInfoList;
         }
 
+        private void AddAllAppsAndMediaHubShortcut()
+        {
+            var allAppsStateDescription = new StateDescription()
+            {
+                Label = "All apps",
+                IconPath = "ic_tizen_home_list_allapps_normal.png",
+                Action = new AppControlAction
+                {
+                    AppID = "org.tizen.example.TVApps.TizenTV",
+                }
+            };
+
+            var allAppsShortcutInfo = new AppShortcutInfo();
+
+            allAppsShortcutInfo.StateDescriptions.Add("default", allAppsStateDescription);
+            allAppsShortcutInfo.CurrentStateDescription = allAppsStateDescription;
+
+            returnPinnedAppsInfo.Add(allAppsShortcutInfo);
+
+            var mediaHubStateDescription = new StateDescription()
+            {
+                Label = "Media Hub",
+                IconPath = "ic_tizen_home_list_mediahub_normal.png",
+                Action = new AppControlAction
+                {
+                    AppID = "org.tizen.mediahub",
+                }
+            };
+
+            var mediaHubShortcutInfo = new AppShortcutInfo();
+            mediaHubShortcutInfo.StateDescriptions.Add("default", mediaHubStateDescription);
+            mediaHubShortcutInfo.CurrentStateDescription = mediaHubStateDescription;
+
+            returnPinnedAppsInfo.Add(mediaHubShortcutInfo);
+        }
+
+        private void AppendAddPinShortcut()
+        {
+            var addPinStateDescription = new StateDescription()
+            {
+                Label = "Add pin",
+                IconPath = "ic_tizen_home_list_addpin_normal.png",
+                Action = new AppControlAction
+                {
+                    AppID = "org.tizen.example.TVApps.TizenTV",
+                }
+            };
+
+            var addPinShortcutInfo = new AppShortcutInfo();
+
+            addPinShortcutInfo.StateDescriptions.Add("default", addPinStateDescription);
+            addPinShortcutInfo.CurrentStateDescription = addPinStateDescription;
+
+            returnPinnedAppsInfo.Add(addPinShortcutInfo);
+        }
         public IEnumerable<AppShortcutInfo> GetPinnedApps()
         {
             IApplicationManagerAPIs applicationManagerPort = DependencyService.Get<IApplicationManagerAPIs>();
             IEnumerable<AppShortcutInfo> pinned_apps_info = AppShortcutStorage.Read();
             string[] icons = { "ic_black.png", "ic_blue.png", "ic_green.png", "ic_red.png", "ic_yellow.png", "AppIcon.png" };
 
+            AddAllAppsAndMediaHubShortcut();
+
             foreach (AppShortcutInfo appShortcutInfo in pinned_apps_info)
             {
                 Dictionary<string, string> appInfo = applicationManagerPort.GetInstalledApplication(appShortcutInfo.AppID);
@@ -92,6 +150,7 @@ namespace LibTVRefCommmonPortable.Models
 
                     appShortcutInfo.StateDescriptions.Add("default", defaultStateDescription);
                     appShortcutInfo.CurrentStateDescription = defaultStateDescription;
+                    returnPinnedAppsInfo.Add(appShortcutInfo);
                 }
                 else
                 {
@@ -99,7 +158,9 @@ namespace LibTVRefCommmonPortable.Models
                 }
             }
 
-            return pinned_apps_info;
+            AppendAddPinShortcut();
+
+            return returnPinnedAppsInfo;
         }
 
         public void UpdatePinnedApps(IEnumerable<AppShortcutInfo> pinnedAppsInfo)
diff --git a/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs b/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs
old mode 100644
new mode 100755
index 40cd561..6a45ec8
--- a/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs
+++ b/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs
@@ -36,6 +36,15 @@ namespace LibTVRefCommmonPortable.Models
                     {
                         StateDescriptions =
                         {
+                            {
+                                "default",
+                                new StateDescription
+                                {
+                                    Label = "WiFi ON",
+                                    IconPath = "AppIcon.png",
+                                    Action = new WiFiOffAction(),
+                                }
+                            },
                             {
                                 "on",
                                 new StateDescription
@@ -73,6 +82,15 @@ namespace LibTVRefCommmonPortable.Models
                     {
                         StateDescriptions =
                         {
+                            {
+                                "default",
+                                new StateDescription
+                                {
+                                    Label = "BT ON",
+                                    IconPath = "AppIcon.png",
+                                    Action = new BTOffAction(),
+                                }
+                            },
                             {
                                 "on",
                                 new StateDescription
diff --git a/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj b/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
old mode 100644
new mode 100755
index af0c5df..1f2d02e
--- a/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
+++ b/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
@@ -52,6 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="lib\" />
+    <Folder Include="res\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LibTVRefCommonPortable\LibTVRefCommonPortable.csproj">
diff --git a/TVHome/TVHome/Controls/SubPanelButton.xaml b/TVHome/TVHome/Controls/SubPanelButton.xaml
old mode 100644
new mode 100755
index d238c9d..27c56e7
--- a/TVHome/TVHome/Controls/SubPanelButton.xaml
+++ b/TVHome/TVHome/Controls/SubPanelButton.xaml
@@ -6,28 +6,36 @@
     <RelativeLayout Opacity="0.38">
         <BoxView x:Name = "ButtonBox"
                  RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
-                 RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.94}"
+                 RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.7419}"
                  Opacity="0"/>
         <Image x:Name="ButtonImage"
-               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.94}"
-               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.94}"
+               RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0}"
+               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.7419}"
+               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
                Source="{Binding CurrentStateDescription.IconPath}" />
-        <Image x:Name="ButtonGradient"
-               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
-               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.94}"
-               Source="ic_tizen_list_thumbnail_gradient_normal.9.png" />
+      <Image x:Name="ButtonDimmedImage"
+               RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonImage, Property=Width, Factor=0}"
+               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonImage, Property=Height, Factor=0}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonImage, Property=Height, Factor=1}"
+               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonImage, Property=Width, Factor=1}"
+               Source="img_tizen_home_list_dim_apps.png" />
         <Label x:Name="ButtonTitle"
-               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.2}"
-               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.94}"
-               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.8}"
-               Opacity="0.5"
+               RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0}"
+               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.8387}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.1613}"
+               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
+               Opacity="0.6"
                TextColor="White"
+               FontSize="26"
                LineBreakMode="TailTruncation"
                HorizontalTextAlignment="Center"
                Text="{Binding CurrentStateDescription.Label}" />
         <Button x:Name = "ButtonFocusArea"
-                RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
-                RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.94}"
+               RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0}"
+               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=1}"
+               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
                 Focused="OnFocused"
                 Unfocused="OnUnfocused"
                 Clicked="OnClicked"
diff --git a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml
new file mode 100755
index 0000000..4b5c49c
--- /dev/null
+++ b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Controls:PanelButton xmlns="http://xamarin.com/schemas/2014/forms"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                      xmlns:Controls="clr-namespace:TVHome.Controls"
+                      x:Class="TVHome.Controls.SubPanelReservedButton">
+    <RelativeLayout>
+        <BoxView x:Name = "ButtonBox"
+                 RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
+                 RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.7419}"
+                 Opacity="0"/>
+        <Image x:Name="ButtonBgImage"
+               RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0}"
+               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.7419}"
+               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
+               Source="img_tizen_home_list_bg_white_normal.png"
+               />
+        <Image x:Name="ButtonImage"
+               RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBgImage, Property=Width, Factor=0.3116}"
+               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBgImage, Property=Height, Factor=0.3116}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBgImage, Property=Height, Factor=0.3768}"
+               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBgImage, Property=Width, Factor=0.3768}"
+               Source="{Binding CurrentStateDescription.IconPath}" />
+      <Image x:Name="ButtonDimmedImage"
+               RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBgImage, Property=Width, Factor=0}"
+               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBgImage, Property=Height, Factor=0}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBgImage, Property=Height, Factor=1}"
+               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBgImage, Property=Width, Factor=1}"
+               Source="img_tizen_home_list_dim_apps.png" />
+        <Label x:Name="ButtonTitle"
+               RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0}"
+               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.8387}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.1613}"
+               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
+               Opacity="0.6"
+               TextColor="White"
+               FontSize="52"
+               LineBreakMode="TailTruncation"
+               HorizontalTextAlignment="Center"
+               Text="{Binding CurrentStateDescription.Label}" />
+        <Button x:Name = "ButtonFocusArea"
+               RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0}"
+               RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=1}"
+               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=1}"
+                Focused="OnFocused"
+                Unfocused="OnUnfocused"
+                Clicked="OnClicked"
+                Opacity="0" />
+    </RelativeLayout>
+</Controls:PanelButton>
\ No newline at end of file
diff --git a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs
new file mode 100755
index 0000000..83c1a19
--- /dev/null
+++ b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 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.
+ */
+
+using System;
+using System.Windows.Input;
+using LibTVRefCommmonPortable.Utils;
+using Xamarin.Forms;
+
+namespace TVHome.Controls
+{
+    /// <summary>
+    /// Custom Control for Button in Sub Panel
+    /// </summary>
+    public partial class SubPanelReservedButton : PanelButton
+    {
+        public SubPanelReservedButton()
+        {
+            InitializeComponent();
+        }
+
+        public override async void OnClicked(object sender, EventArgs e)
+        {
+            if (OnClickedCommand != null)
+            {
+                OnClickedCommand.Execute("");
+            }
+
+            await View.FadeTo(0.99, 300);
+        }
+
+        public override async void OnFocused(object sender, FocusEventArgs e)
+        {
+            if (OnFocusedCommand != null)
+            {
+                OnFocusedCommand.Execute("");
+            }
+
+#pragma warning disable CS4014
+            View.FadeTo(0.8, 300);
+            ButtonTitle.FadeTo(0.8, 300);
+            ButtonBgImage.ScaleTo(1.32, 300);
+#pragma warning restore CS4014
+            //await View.ScaleTo(1.3, 300);
+            await ButtonImage.ScaleTo(1.32, 300);
+        }
+
+        public override async void OnUnfocused(object sender, FocusEventArgs e)
+        {
+#pragma warning disable CS4014
+            View.FadeTo(0.6, 300);
+            ButtonTitle.FadeTo(0.6, 300);
+            ButtonBgImage.ScaleTo(1, 300);
+#pragma warning restore CS4014
+            //await View.ScaleTo(1, 300);
+            await ButtonImage.ScaleTo(1, 300);
+        }
+    }
+}
\ No newline at end of file
diff --git a/TVHome/TVHome/TVHome.csproj b/TVHome/TVHome/TVHome.csproj
old mode 100644
new mode 100755
index 99c888c..9f65c3d
--- a/TVHome/TVHome/TVHome.csproj
+++ b/TVHome/TVHome/TVHome.csproj
@@ -38,6 +38,9 @@
       <DependentUpon>MainPanelButton.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\PanelButton.cs" />
+    <Compile Include="Controls\SubPanelReservedButton.xaml.cs">
+      <DependentUpon>SubPanelReservedButton.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\SubPanelButton.xaml.cs">
       <DependentUpon>SubPanelButton.xaml</DependentUpon>
     </Compile>
@@ -128,6 +131,12 @@
       <Name>LibTVRefCommonPortable</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\SubPanelReservedButton.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -143,4 +152,4 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/TVHome/TVHome/Views/MainPage.xaml b/TVHome/TVHome/Views/MainPage.xaml
index 9f4169e..c6bf648 100755
--- a/TVHome/TVHome/Views/MainPage.xaml
+++ b/TVHome/TVHome/Views/MainPage.xaml
@@ -47,11 +47,6 @@
                             RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
                             RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.89}"
                             ItemsSource="{Binding AppList}">
-                <Views:SubPanel.ItemTemplate>
-                    <DataTemplate>
-                        <Controls:SubPanelButton/>
-                    </DataTemplate>
-                </Views:SubPanel.ItemTemplate>
             </Views:SubPanel>
 
             <Views:SubPanel x:Name="SettingsSubPanel"
diff --git a/TVHome/TVHome/Views/SubPanel.xaml.cs b/TVHome/TVHome/Views/SubPanel.xaml.cs
old mode 100644
new mode 100755
index 47ac504..79226f3
--- a/TVHome/TVHome/Views/SubPanel.xaml.cs
+++ b/TVHome/TVHome/Views/SubPanel.xaml.cs
@@ -48,7 +48,18 @@ namespace TVHome.Views
             PanelButtonStack.Children.Clear();
             foreach (ShortcutInfo item in ItemsSource)
             {
-                var button = ItemTemplate.CreateContent() as PanelButton;
+                PanelButton button;
+
+                if (item.StateDescriptions["default"].Label.Equals("All apps") || item.StateDescriptions["default"].Label.Equals("Media Hub")
+                    || item.StateDescriptions["default"].Label.Equals("Add pin"))
+                {
+                    button = new SubPanelReservedButton();
+                }
+                else
+				{
+                    button = new SubPanelButton();
+				}
+
                 button.View.BindingContext = item;
                 button.OnFocusedCommand = new Command(() =>
                 {
@@ -87,10 +98,15 @@ namespace TVHome.Views
                 item.IsEnabled = true;
             }
 
+            foreach (var item in PanelButtonStack.Children)
+            {
+                item.FindByName<Image>("ButtonDimmedImage").Opacity = 1;
+            }
+
 #pragma warning disable CS4014
-            this.TranslateTo(0, 0, 0);
+            this.TranslateTo(0, 0, 300);
 #pragma warning restore CS4014
-            await this.FadeTo(0.3, 0);
+            await this.FadeTo(0.3, 300);
         }
 
         public override async void FocusPanel()
@@ -106,6 +122,11 @@ namespace TVHome.Views
             var button = PanelButtonStack.Children[1];
             button.FindByName<Button>("ButtonFocusArea").Focus();
 
+            foreach (var item in PanelButtonStack.Children)
+            {
+                item.FindByName<Image>("ButtonDimmedImage").Opacity = 0;
+            }
+
 #pragma warning disable CS4014
             this.TranslateTo(0, -140, 300);
 #pragma warning restore CS4014
-- 
2.34.1