From: Hyerim Kim <rimi.kim@samsung.com>
Date: Wed, 15 Mar 2017 09:29:49 +0000 (+0900)
Subject: Add Unpin action in home
X-Git-Tag: submit/tizen/20170808.015446~197
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7b10e56d13fda472d9bfe7b59455b4c4d506b57;p=profile%2Ftv%2Fapps%2Fdotnet%2Fhome.git

Add Unpin action in home
Modify FileSystemWatcher filter to pinned_apps_info.xml
Add missing resources

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

diff --git a/LibTVRefCommonTizen/Ports/FileSystemWatcherPort.cs b/LibTVRefCommonTizen/Ports/FileSystemWatcherPort.cs
old mode 100644
new mode 100755
index 8a926dd..3ef228a
--- a/LibTVRefCommonTizen/Ports/FileSystemWatcherPort.cs
+++ b/LibTVRefCommonTizen/Ports/FileSystemWatcherPort.cs
@@ -32,8 +32,8 @@ namespace LibTVRefCommonTizen.Ports
         {
             watcher = new FileSystemWatcher();
             watcher.Path = "/opt/usr/home/owner/share/";
-            watcher.NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.Size;
-            watcher.Filter = "apinnedapp.xml";
+            watcher.NotifyFilter = NotifyFilters.LastWrite;
+            watcher.Filter = "pinned_apps_info.xml";
 
             watcher.Created += new FileSystemEventHandler(WatcherChanged);
             watcher.Changed += new FileSystemEventHandler(WatcherChanged);
diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_addpin_focused.png b/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_addpin_focused.png
new file mode 100755
index 0000000..a0830ef
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_addpin_focused.png differ
diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_allapps_normal.png b/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_allapps_normal.png
new file mode 100755
index 0000000..12517bc
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/ic_tizen_home_list_allapps_normal.png differ
diff --git a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml
index 02cad5a..ac75fd9 100755
--- a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml
+++ b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml
@@ -3,11 +3,10 @@
                       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                       xmlns:Controls="clr-namespace:TVHome.Controls"
                       x:Class="TVHome.Controls.SubPanelAllAppsButton">
-  <RelativeLayout>
-    <BoxView x:Name = "ButtonBox"
+  <RelativeLayout x:Name="ButtonBox"
              HeightRequest="186"
              WidthRequest="138"
-             Opacity="0"/>
+             HorizontalOptions="Center">
     <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}"
diff --git a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
index 667381e..1b397b2 100755
--- a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
@@ -51,7 +51,7 @@ namespace TVHome.Controls
             }
 
 #pragma warning disable CS4014
-            ButtonTitle.FadeTo(0.8, 300);
+            ButtonTitle.FadeTo(0.99, 300);
             ButtonTitle.TranslateTo(0, 22, 300);
             ButtonImage.ScaleTo(1.3, 300);
 #pragma warning restore CS4014
@@ -60,9 +60,8 @@ namespace TVHome.Controls
 
         public override async void OnUnfocused(object sender, FocusEventArgs e)
         {
-            DebuggingUtils.Dbg(View.Width.ToString() + ", " + View.Height.ToString());
 #pragma warning disable CS4014
-            ButtonTitle.FadeTo(0.6, 300);
+            ButtonTitle.FadeTo(0.5, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
             ButtonImage.ScaleTo(1.0, 300);
 #pragma warning restore CS4014
diff --git a/TVHome/TVHome/Controls/SubPanelButton.xaml b/TVHome/TVHome/Controls/SubPanelButton.xaml
index c948ee5..137b5da 100755
--- a/TVHome/TVHome/Controls/SubPanelButton.xaml
+++ b/TVHome/TVHome/Controls/SubPanelButton.xaml
@@ -3,11 +3,10 @@
                       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                       xmlns:Controls="clr-namespace:TVHome.Controls"
                       x:Class="TVHome.Controls.SubPanelButton">
-    <RelativeLayout>
-        <BoxView x:Name = "ButtonBox"
-                 HeightRequest="186"
+    <RelativeLayout x:Name="ButtonBox"
                  WidthRequest="138"
-                 Opacity="0"/>
+                 HeightRequest="186"
+                 HorizontalOptions="Center">
         <Image x:Name="ButtonImage"
                RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0}"
                RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0}"
diff --git a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
index 0b7e367..68ab19e 100755
--- a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
@@ -49,7 +49,7 @@ namespace TVHome.Controls
             }
 
 #pragma warning disable CS4014
-            ButtonTitle.FadeTo(0.8, 300);
+            ButtonTitle.FadeTo(0.99, 300);
             ButtonTitle.TranslateTo(0, 22, 300);
 #pragma warning restore CS4014
             await ButtonImage.ScaleTo(1.3, 300);
@@ -58,7 +58,7 @@ namespace TVHome.Controls
         public override async void OnUnfocused(object sender, FocusEventArgs e)
         {
 #pragma warning disable CS4014
-            ButtonTitle.FadeTo(0.6, 300);
+            ButtonTitle.FadeTo(0.5, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
 #pragma warning restore CS4014
             await ButtonImage.ScaleTo(1, 300);
diff --git a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml
index 26ecd62..4eb4d7c 100755
--- a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml
+++ b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml
@@ -3,11 +3,10 @@
                       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 x:Name = "ButtonBox"
                  HeightRequest="186"
                  WidthRequest="138"
-                 Opacity="0"/>
+                 HorizontalOptions="Center">
         <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}"
diff --git a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs
index 2fad076..b3cf271 100755
--- a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs
@@ -49,7 +49,7 @@ namespace TVHome.Controls
             }
 
 #pragma warning disable CS4014
-            ButtonTitle.FadeTo(0.8, 300);
+            ButtonTitle.FadeTo(0.99, 300);
             ButtonTitle.TranslateTo(0, 22, 300);
             ButtonImage.ScaleTo(1.3, 300);
 #pragma warning restore CS4014
@@ -59,7 +59,7 @@ namespace TVHome.Controls
         public override async void OnUnfocused(object sender, FocusEventArgs e)
         {
 #pragma warning disable CS4014
-            ButtonTitle.FadeTo(0.8, 300);
+            ButtonTitle.FadeTo(0.5, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
             ButtonImage.ScaleTo(1, 300);
 #pragma warning restore CS4014
diff --git a/TVHome/TVHome/Views/MainPage.xaml.cs b/TVHome/TVHome/Views/MainPage.xaml.cs
old mode 100644
new mode 100755
index 6c9e79c..c60a9e9
--- a/TVHome/TVHome/Views/MainPage.xaml.cs
+++ b/TVHome/TVHome/Views/MainPage.xaml.cs
@@ -65,6 +65,11 @@ namespace TVHome.Views
                 PageMainPanel.SelectPanel();
             });
 
+            AppsSubPanel.OnUnpinCommand = new Command<string>((appId) =>
+            {
+                UnpinAppShortcutInfo(appId);
+            });
+
             SettingsSubPanel.OnFocusedCommand = new Command(() =>
             {
                 PageMainPanel.SelectPanel();
@@ -75,5 +80,34 @@ namespace TVHome.Views
         {
             PageMainPanel.InitialFocusing();
         }
+
+        private void UnpinAppShortcutInfo(string appId)
+        {
+            RemovePinnedApp(appId);
+        }
+
+        private void UpdatePinnedApps(Dictionary<string, string> PinnedApps)
+        {
+            List<AppShortcutInfo> pinnedAppList = new List<AppShortcutInfo>();
+            foreach (var item in PinnedApps)
+            {
+                pinnedAppList.Add(new AppShortcutInfo()
+                {
+                    AppID = item.Key,
+                });
+            }
+
+            TVHomeImpl.GetInstance.AppShortcutControllerInstance.UpdatePinnedApps(pinnedAppList);
+        }
+
+        public void RemovePinnedApp(string AppID)
+        {
+            Dictionary<string, string> PinnedApps = TVHomeImpl.GetInstance.AppShortcutControllerInstance.GetPinnedAppsAppIDs();
+            if (PinnedApps.ContainsKey(AppID))
+            {
+                PinnedApps.Remove(AppID);
+                UpdatePinnedApps(PinnedApps);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/TVHome/TVHome/Views/Panel.cs b/TVHome/TVHome/Views/Panel.cs
old mode 100644
new mode 100755
index f20cbb9..cd22ffd
--- a/TVHome/TVHome/Views/Panel.cs
+++ b/TVHome/TVHome/Views/Panel.cs
@@ -33,6 +33,13 @@ namespace TVHome.Views
             set { SetValue(OnFocusedCommandProperty, value); }
         }
 
+        public static readonly BindableProperty OnUnpinCommandProperty = BindableProperty.Create("OnUnpinCommand", typeof(ICommand), typeof(SubPanel));
+
+        public ICommand OnUnpinCommand
+        {
+            get { return (ICommand)GetValue(OnUnpinCommandProperty); }
+            set { SetValue(OnUnpinCommandProperty, value); }
+        }
         public static readonly BindableProperty ItemsSourceProperty = BindableProperty.Create("ItemsSource", typeof(IEnumerable<ShortcutInfo>), typeof(MainPanel));
 
         public IEnumerable<ShortcutInfo> ItemsSource
diff --git a/TVHome/TVHome/Views/SubPanel.xaml.cs b/TVHome/TVHome/Views/SubPanel.xaml.cs
index 48ae9a1..b48a7c9 100755
--- a/TVHome/TVHome/Views/SubPanel.xaml.cs
+++ b/TVHome/TVHome/Views/SubPanel.xaml.cs
@@ -71,12 +71,28 @@ namespace TVHome.Views
                 });
                 button.OnClickedCommand = new Command(() =>
                 {
-                    item.DoAction();
+                    if (item is AppShortcutInfo)
+                    {
+                        OnUnpinCommand.Execute((item as AppShortcutInfo).AppID);
+                    }
+                    else
+                    {
+                        item.DoAction();
+                    }
                 });
                 PanelButtonStack.Children.Add(button.View);
             }
 
-            HidePanel();
+            if (!isFocused)
+            {
+                HidePanel();
+            }
+            else
+            {
+                isFocused = false;
+                FocusPanel();
+            }
+
         }
 
         public override async void HidePanel()