Changes Home Subpanel resources according to GUI guideline.

Change-Id: I92c4be7909aae2db6ae00a4c605e83611137790b
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>

diff --git a/LibTVRefCommonPortable/Models/AppShortcutController.cs b/LibTVRefCommonPortable/Models/AppShortcutController.cs
index 24f88c256c80bb0bacb2e15fd35da7e3ac49bb5e..331c97543b8e163e816483bb700865c626d9e018 100755 (executable)
--- a/LibTVRefCommonPortable/Models/AppShortcutController.cs
+++ b/LibTVRefCommonPortable/Models/AppShortcutController.cs
@@ -92,37 +92,72 @@ namespace LibTVRefCommonPortable.Models
         /// <param name="returnPinnedAppsInfo">A App Shortcut list contains the additional Shortcuts.</param>
         private void AddAllAppsAndMediaHubShortcut(ref List<ShortcutInfo> returnPinnedAppsInfo)
         {
-            var allAppsStateDescription = new StateDescription()
+            var allAppsShortcutInfo = new AppShortcutInfo()
             {
-                Label = "All apps",
-                IconPath = "ic_tizen_home_list_allapps_normal.png",
-                Action = new AppControlAction
+                StateDescriptions =
                 {
-                    AppID = ManagedApps.TVAppsAppID,
+                    {
+                        "default",
+                        new StateDescription
+                        {
+                            Label = "All apps",
+                            IconPath = "ic_home_menu_apps_138.png",
+                            Action = new AppControlAction
+                            {
+                                AppID = ManagedApps.TVAppsAppID,
+                            }
+                        }
+                    },
+                    {
+                        "focused",
+                        new StateDescription
+                        {
+                            Label = "All apps",
+                            IconPath = "ic_home_menu_apps_182.png",
+                            Action = new AppControlAction
+                            {
+                                AppID = ManagedApps.TVAppsAppID,
+                            }
+                        }
+                    },
                 }
             };
 
-            var allAppsShortcutInfo = new AppShortcutInfo();
-
-            allAppsShortcutInfo.StateDescriptions.Add("default", allAppsStateDescription);
-            allAppsShortcutInfo.CurrentStateDescription = allAppsStateDescription;
-
+            allAppsShortcutInfo.UpdateState();
             returnPinnedAppsInfo.Insert(0, allAppsShortcutInfo);
 
-            var mediaHubStateDescription = new StateDescription()
+            var mediaHubShortcutInfo = new AppShortcutInfo()
             {
-                Label = "Media Hub",
-                IconPath = "ic_tizen_home_list_mediahub_normal.png",
-                Action = new AppControlAction
+                StateDescriptions =
                 {
-                    AppID = ManagedApps.MediaHubAppID,
+                    {
+                        "default",
+                        new StateDescription
+                        {
+                            Label = "Media Hub",
+                            IconPath = "ic_launcher_mediahub_138.png",
+                            Action = new AppControlAction
+                            {
+                                AppID = ManagedApps.MediaHubAppID,
+                            }
+                        }
+                    },
+                    {
+                        "focused",
+                        new StateDescription
+                        {
+                            Label = "Media Hub",
+                            IconPath = "ic_launcher_mediahub_182.png",
+                            Action = new AppControlAction
+                            {
+                                AppID = ManagedApps.MediaHubAppID,
+                            }
+                        }
+                    },
                 }
             };
 
-            var mediaHubShortcutInfo = new AppShortcutInfo();
-            mediaHubShortcutInfo.StateDescriptions.Add("default", mediaHubStateDescription);
-            mediaHubShortcutInfo.CurrentStateDescription = mediaHubStateDescription;
-
+            mediaHubShortcutInfo.UpdateState();
             returnPinnedAppsInfo.Insert(1, mediaHubShortcutInfo);
         }
 
@@ -134,26 +169,48 @@ namespace LibTVRefCommonPortable.Models
         /// <param name="returnPinnedAppsInfo">A App Shortcut list contains the additional Shortcuts.</param>
         private void AppendAddPinShortcut(ref List<ShortcutInfo> returnPinnedAppsInfo)
         {
-            var addPinStateDescription = new StateDescription()
+            var addPinShortcutInfo = new AppShortcutInfo()
             {
-                Label = "Add pin",
-                IconPath = "ic_tizen_home_list_addpin_normal.png",
-                Action = new CommandAction()
+                StateDescriptions =
                 {
-                    NextStateDescription = "default",
-                    Command = new Command<string>((key) =>
                     {
-                        AppControlUtils.SendAddAppRequestToApps();
-                    }),
-                    CommandParameter = "",
+                        "default",
+                        new StateDescription
+                        {
+                            Label = "Add pin",
+                            IconPath = "ic_home_menu_addpin_138.png",
+                            Action = new CommandAction()
+                            {
+                                NextStateDescription = "default",
+                                Command = new Command<string>((key) =>
+                                {
+                                    AppControlUtils.SendAddAppRequestToApps();
+                                }),
+                                CommandParameter = "",
+                            }
+                        }
+                    },
+                    {
+                        "focused",
+                        new StateDescription
+                        {
+                            Label = "Add pin",
+                            IconPath = "ic_home_menu_addpin_182.png",
+                            Action = new CommandAction()
+                            {
+                                NextStateDescription = "default",
+                                Command = new Command<string>((key) =>
+                                {
+                                    AppControlUtils.SendAddAppRequestToApps();
+                                }),
+                                CommandParameter = "",
+                            }
+                        }
+                    },
                 }
             };
 
-            var addPinShortcutInfo = new AppShortcutInfo();
-
-            addPinShortcutInfo.StateDescriptions.Add("default", addPinStateDescription);
-            addPinShortcutInfo.CurrentStateDescription = addPinStateDescription;
-
+            addPinShortcutInfo.UpdateState();
             returnPinnedAppsInfo.Add(addPinShortcutInfo);
         }
 

diff --git a/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj b/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
index 337e8894f54a93c34b4c184bbcd13c902fd317e5..d8ad71b12f8f9ebd6e6a27bffab5051f6dcd44a5 100755 (executable)
--- a/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
+++ b/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
@@ -102,6 +102,12 @@
     <Content Include="res\ic_black.png" />
     <Content Include="res\ic_blue.png" />
     <Content Include="res\ic_green.png" />
+    <Content Include="res\ic_home_menu_addpin_138.png" />
+    <Content Include="res\ic_home_menu_addpin_182.png" />
+    <Content Include="res\ic_home_menu_apps_138.png" />
+    <Content Include="res\ic_home_menu_apps_182.png" />
+    <Content Include="res\ic_launcher_mediahub_138.png" />
+    <Content Include="res\ic_launcher_mediahub_182.png" />
     <Content Include="res\ic_red.png" />
     <Content Include="res\ic_tizen_apps_additional_back.png" />
     <Content Include="res\ic_tizen_apps_launcher_pinmark.png" />
@@ -134,6 +140,7 @@
     <Content Include="res\ic_tizen_option_menu_list_box_check_normal.png" />
     <Content Include="res\ic_tizen_option_menu_list_box_check_selected.png" />
     <Content Include="res\ic_yellow.png" />
+    <Content Include="res\img_home_list_dimmed_apps_60.png" />
     <Content Include="res\img_tizen_apps_list_dimmed.png" />
     <Content Include="res\img_tizen_apps_list_dimmed_check.png" />
     <Content Include="res\img_tizen_home_list_bg_focused.png" />

diff --git a/TVHome/TVHome.TizenTV/res/ic_home_menu_addpin_138.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_addpin_138.png
new file mode 100755 (executable)
index 0000000..9eeba3e
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_home_menu_addpin_138.png differ

diff --git a/TVHome/TVHome.TizenTV/res/ic_home_menu_addpin_182.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_addpin_182.png
new file mode 100755 (executable)
index 0000000..1ffd4b6
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_home_menu_addpin_182.png differ

diff --git a/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_138.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_138.png
new file mode 100755 (executable)
index 0000000..a280cf3
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_138.png differ

diff --git a/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_182.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_182.png
new file mode 100755 (executable)
index 0000000..66c0cba
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_182.png differ

diff --git a/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_138.png b/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_138.png
new file mode 100755 (executable)
index 0000000..bdfacb1
Binary files /dev/null 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
new file mode 100755 (executable)
index 0000000..dc9203e
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_launcher_mediahub_182.png differ

diff --git a/TVHome/TVHome.TizenTV/res/img_home_list_dimmed_apps_60.png b/TVHome/TVHome.TizenTV/res/img_home_list_dimmed_apps_60.png
new file mode 100755 (executable)
index 0000000..4f5ac7c
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/img_home_list_dimmed_apps_60.png differ

diff --git a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml
index be9d49c339d541ac36cc3b3c6a55ada7d6d80a1d..3ecf50d0f4a75e3ee9a6a6f6bd0ae9802ab2314b 100755 (executable)
--- a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml
+++ b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml
@@ -5,24 +5,18 @@
                       x:Class="TVHome.Controls.SubPanelAllAppsButton">
   <RelativeLayout x:Name="ButtonBox"
                   HorizontalOptions="Center">
-    <Image x:Name="ButtonBgImage"
+    <Image x:Name="ButtonImage"
            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.120879}"
            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.095652}"
            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.6}"
            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.75824}"
-           Source="img_tizen_home_list_bg_normal.png" />
-    <Image x:Name="ButtonImage"
-           RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.3571428}"
-           RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.2826}"
-           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.226087}"
-           RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.2857}"
            Source="{Binding CurrentStateDescription.IconPath}" />
     <Image x:Name="ButtonDimmedImage"
            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.120879}"
            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.095652}"
            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.6}"
            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.75824}"
-             Source="img_tizen_home_list_dim_apps.png" />
+             Source="img_home_list_dimmed_apps_60.png" />
     <Label x:Name="ButtonTitle"
            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.120879}"
            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.77391}"

diff --git a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
index 173cdce960f1ea549591eadcc7c6e5ca18d869f9..12aa05514e9174d4c5d6a69bc3860833b8b393e9 100755 (executable)
--- a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
@@ -72,9 +72,8 @@ namespace TVHome.Controls
 #pragma warning disable CS4014
             ButtonTitle.FadeTo(0.99, 300);
             ButtonTitle.TranslateTo(0, selectTransitionHeight, 300);
-            ButtonImage.ScaleTo(1.3, 300);
 #pragma warning restore CS4014
-            await ButtonBgImage.ScaleTo(1.3, 300);
+            await ButtonImage.ScaleTo(1.3, 300);
         }
 
         /// <summary>
@@ -87,9 +86,8 @@ namespace TVHome.Controls
 #pragma warning disable CS4014
             ButtonTitle.FadeTo(0.5, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
-            ButtonImage.ScaleTo(1.0, 300);
 #pragma warning restore CS4014
-            await ButtonBgImage.ScaleTo(1, 300);
+            await ButtonImage.ScaleTo(1.0, 300);
         }
 
         /// <summary>

diff --git a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml
index f05dbf4b3b5d4191497b23b44d3a7cb6ccaf05e6..f76bd73c9043d1a8787d9e551be46b403de677d9 100755 (executable)
--- a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml
+++ b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml
@@ -5,24 +5,18 @@
                       x:Class="TVHome.Controls.SubPanelReservedButton">
   <RelativeLayout x:Name = "ButtonBox"
                   HorizontalOptions="Center">
-    <Image x:Name="ButtonBgImage"
+    <Image x:Name="ButtonImage"
            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.120879}"
            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.095652}"
            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.6}"
            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.75824}"
-           Source="img_tizen_home_list_bg_white_normal.png" />
-    <Image x:Name="ButtonImage"
-           RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.3571428}"
-           RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.2826}"
-           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.226087}"
-           RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.2857}"
            Source="{Binding CurrentStateDescription.IconPath}" />
     <Image x:Name="ButtonDimmedImage"
            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.120879}"
            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.095652}"
            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.6}"
            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.75824}"
-             Source="img_tizen_home_list_dim_apps.png" />
+             Source="img_home_list_dimmed_apps_60.png" />
     <Label x:Name="ButtonTitle"
            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.120879}"
            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.77391}"

diff --git a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs
index 5013cdefe952ad30d17c245ec2cc7ff6fc63d447..b1962e0ca05b2ac8604922b67542cf89889bc7c9 100755 (executable)
--- a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs
@@ -73,9 +73,8 @@ namespace TVHome.Controls
 #pragma warning disable CS4014
             ButtonTitle.FadeTo(0.99, 300);
             ButtonTitle.TranslateTo(0, selectTransitionHeight, 300);
-            ButtonImage.ScaleTo(1.3, 300);
 #pragma warning restore CS4014
-            await ButtonBgImage.ScaleTo(1.3, 300);
+            await ButtonImage.ScaleTo(1.3, 300);
         }
 
         /// <summary>
@@ -88,9 +87,8 @@ namespace TVHome.Controls
 #pragma warning disable CS4014
             ButtonTitle.FadeTo(0.5, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
-            ButtonImage.ScaleTo(1, 300);
 #pragma warning restore CS4014
-            await ButtonBgImage.ScaleTo(1, 300);
+            await ButtonImage.ScaleTo(1, 300);
         }
 
         /// <summary>

diff --git a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml
index 45a7e8430d873448cbf0a21315753fe38bf0bb0a..8b974cdf029688d08fa351f2dcb47e6a34732f22 100755 (executable)
--- a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml
+++ b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml
@@ -16,7 +16,7 @@
            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.095652}"
            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.6}"
            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.75824}"
-           Source="img_tizen_home_list_dim_apps.png" />
+           Source="img_home_list_dimmed_apps_60.png" />
     <Label x:Name="ButtonTitle"
            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.120879}"
            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.77391}"