From 938aec6a3432aa3ad0ebca3266d24f464a235398 Mon Sep 17 00:00:00 2001
From: "jjie.choi" <jjie.choi@samsung.com>
Date: Mon, 5 Jun 2017 16:14:21 +0900
Subject: [PATCH 01/16] Implement Music Tab

Change-Id: I66341dcfd7bb70abc5caeb106e3a00f6ed8a6292
Signed-off-by: jjie.choi <jjie.choi@samsung.com>
---
 .../ViewModels/MusicTabViewModel.cs                |   5 +
 .../ViewModels/MusicTabViewModelLocator.cs         |  39 +++++++
 .../TVMediaHub.Tizen/Views/MediaHubMainPage.xaml   |   3 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml  |  16 +++
 .../TVMediaHub.Tizen/Views/MusicGroup.xaml.cs      |  97 ++++++++++++++++
 TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml   |  35 ++++++
 .../TVMediaHub.Tizen/Views/MusicItem.xaml.cs       | 126 +++++++++++++++++++++
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml    |  37 +++---
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs | 108 ++++++++++++++++++
 9 files changed, 449 insertions(+), 17 deletions(-)
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModelLocator.cs
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs

diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
index 2709d99..fafed95 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
@@ -83,5 +83,10 @@ namespace TVMediaHub.Tizen.ViewModels
                 MusicList.Add(group);
             }
         }
+
+        public void TestRead()
+        {
+            ReadMusicList(option);
+        }
     }
 }
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModelLocator.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModelLocator.cs
new file mode 100644
index 0000000..319961b
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModelLocator.cs
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+namespace TVMediaHub.Tizen.ViewModels
+{
+    /// <summary>
+    /// A class to have static instance of MusicTabViewModel
+    /// </summary>
+    public static class MusicTabViewModelLocator
+    {
+        /// <summary>
+        /// An instance of the MusicTabViewModel
+        /// </summary>
+        private static MusicTabViewModel _viewModel = new MusicTabViewModel();
+        /// <summary>
+        /// Gets the instance of the MusicTabViewModel
+        /// </summary>
+        public static MusicTabViewModel ViewModel
+        {
+            get
+            {
+                return _viewModel;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml
index 2e09079..aa5f343 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml
@@ -6,6 +6,5 @@
             Title="MEDIA HUB">
     <Views:VideoTab/>
     <Views:ImageTab/>
-    <!-- TODO : revert this after TDC event -->
-    <!--<Views:MusicTab/>-->
+    <Views:MusicTab/>
 </TabbedPage>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
new file mode 100644
index 0000000..41301b1
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RelativeLayout xmlns="http://xamarin.com/schemas/2014/forms"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                x:Class="TVMediaHub.Tizen.Views.MusicGroup"
+                ItemsSource="{Binding Contents}">
+    <Button x:Name="TitleFocusArea" Opacity ="0"
+            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.085}"/>
+
+    <Label x:Name="GroupTitle" Text="{Binding Title}"
+           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.085}"/>
+
+    <Grid x:Name="GroupContentArea"
+          RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.915}"
+          RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.085}">
+    </Grid>
+</RelativeLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
new file mode 100644
index 0000000..6aab07b
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
@@ -0,0 +1,97 @@
+/*
+ * 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.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TVMediaHub.Tizen.Models;
+using TVMediaHub.Tizen.Utils;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace TVMediaHub.Tizen.Views
+{
+    /// <summary>
+    ///  A custom view for displaying Music group
+    /// </summary>
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class MusicGroup : RelativeLayout
+    {
+        /// <summary>
+        /// Identifies the ItemsSource bindable property
+        /// </summary>
+        public static readonly BindableProperty ItemsSourceProperty = BindableProperty.Create("ItemsSource", typeof(IEnumerable<MediaShortcutInfo>), typeof(MusicTab), default(IEnumerable<MediaShortcutInfo>));
+
+        /// <summary>
+        /// Gets or set ItemSource to display item
+        /// </summary>
+        public IEnumerable<MediaShortcutInfo> ItemsSource
+        {
+            get { return (IEnumerable<MediaShortcutInfo>)GetValue(ItemsSourceProperty); }
+            set { SetValue(ItemsSourceProperty, value); }
+        }
+
+        /// <summary>
+        /// A constructor
+        /// </summary>
+        public MusicGroup()
+        {
+            InitializeComponent();
+            InitializeSize();
+            PropertyChanged += MusicGroupPropertyChanged;
+        }
+
+        /// <summary>
+        /// A method for initializing sizes
+        /// </summary>
+        private void InitializeSize()
+        {
+            GroupTitle.FontSize = Utils.SizeUtils.GetFontSize(28);
+            GroupTitle.HeightRequest = Utils.SizeUtils.GetHeightSize(50);
+            GroupTitle.Margin = new Thickness(SizeUtils.GetWidthSize(12), 0, 0, 0);
+
+            TitleFocusArea.WidthRequest = SizeUtils.GetWidthSize(180);
+            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(134) });
+            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(134) });
+            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(134) });
+            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(134) });
+            GroupContentArea.RowSpacing = SizeUtils.GetHeightSize(2);
+        }
+
+        /// <summary>
+        /// This method is called when the properties is changed
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A propertyChanged event argument</param>
+        private void MusicGroupPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if(e.PropertyName.Equals("ItemsSource"))
+            {
+                var index = 0;
+                foreach(var item in ItemsSource)
+                {
+                    var itemView = new MusicItem();
+                    itemView.BindingContext = item;
+                    GroupContentArea.Children.Add(itemView, index / 4, index % 4);
+                    index++;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
new file mode 100644
index 0000000..174bf6e
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RelativeLayout xmlns="http://xamarin.com/schemas/2014/forms"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                x:Class="TVMediaHub.Tizen.Views.MusicItem"
+                xmlns:Utils="clr-namespace:TVMediaHub.Tizen.Utils"
+                xmlns:Views="clr-namespace:TVMediaHub.Tizen.Views"
+                MusicInfo="{Binding Information}">
+    <Button x:Name="FocusArea"
+            Opacity="0"
+            Clicked="OnItemClicked"
+            Focused="OnItemFocused"
+            Unfocused="OnItemUnfocused"/>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="3*" />
+            <RowDefinition Height="2*" />
+            <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+        <Image x:Name="AlbumCover"
+               Grid.Row="0"
+               Grid.RowSpan="3"
+               Grid.Column="0"
+               Source="{Binding ThumbnailPath}"/>
+        <Label x:Name="SongTitle"
+               Grid.Row="0"
+               Grid.Column="1"
+               Text="{Binding ContentName}"/>
+        <Label x:Name="Artist"
+               Grid.Row="1"
+               Grid.Column="1"/>
+        <Label x:Name="AlbumTitle"
+               Grid.Row="2"
+               Grid.Column="1"/>
+    </Grid>
+</RelativeLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
new file mode 100644
index 0000000..a35021e
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
@@ -0,0 +1,126 @@
+/*
+ * 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.ComponentModel;
+using Tizen.Content.MediaContent;
+using TVMediaHub.Tizen.DataModels;
+using TVMediaHub.Tizen.Utils;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace TVMediaHub.Tizen.Views
+{
+    /// <summary>
+    /// A custom view for displaying music item
+    /// </summary>
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class MusicItem : RelativeLayout
+    {
+
+        /// <summary>
+        /// Identifies the MusicInfo bindable property
+        /// </summary>
+        public static readonly BindableProperty MusicInfoProperty = BindableProperty.Create("MusicInfo", typeof(MediaInformationEx), typeof(MusicItem), null);
+
+        /// <summary>
+        /// Gets or sets the MusicInfo of current music
+        /// </summary>
+        public MediaInformationEx MusicInfo
+        {
+            set
+            {
+                SetValue(MusicInfoProperty, value);
+            }
+
+            get
+            {
+                return (MediaInformationEx)GetValue(MusicInfoProperty);
+            }
+        }
+
+        /// <summary>
+        /// A constructor
+        /// Initializes the size of the items that are used in this class
+        /// </summary>
+        public MusicItem()
+        {
+            InitializeComponent();
+            InitializeSize();
+            PropertyChanged += MusicItemPropertyChanged;
+        }
+
+        /// <summary>
+        /// A method for initializing size of the items that are used in this class
+        /// </summary>
+        private void InitializeSize()
+        {
+            WidthRequest = SizeUtils.GetWidthSize(400);
+            HeightRequest = SizeUtils.GetHeightSize(134);
+            AlbumCover.WidthRequest = SizeUtils.GetWidthSize(134);
+            AlbumCover.HeightRequest = SizeUtils.GetHeightSize(134);
+            SongTitle.FontSize = SizeUtils.GetFontSize(20);
+            Artist.FontSize = SizeUtils.GetFontSize(17);
+            AlbumTitle.FontSize = SizeUtils.GetFontSize(17);
+        }
+
+        /// <summary>
+        /// This method is called when item is clicked
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A Focus event's argument</param>
+        private void OnItemClicked(object sender, EventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// This method is called when item is focused
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A Focus event's argument</param>
+        private void OnItemFocused(object sender, FocusEventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// This method is called when item is unfocused
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A Focus event's argument</param>
+        private void OnItemUnfocused(object sender, FocusEventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// This method is called when the properties is changed
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A propertyChanged event argument</param>
+        private void MusicItemPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName.Equals("MusicInfo"))
+            {
+                AudioInformation info = MusicInfo.MediaContentInformation as AudioInformation;
+                SongTitle.Text = info.Title;
+                Artist.Text = info.Artist;
+                AlbumTitle.Text = info.Album;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
index 3179c60..1af1646 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <mh:ContentPageEx xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="TVMediaHub.Tizen.Views.MusicTab"
-             xmlns:mh="clr-namespace:TVMediaHub.Tizen.Controls"
-             xmlns:Views="clr-namespace:TVMediaHub.Tizen.Views"
-             Title="Music">
+                  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                  x:Class="TVMediaHub.Tizen.Views.MusicTab"
+                  xmlns:mh="clr-namespace:TVMediaHub.Tizen.Controls"
+                  xmlns:Views="clr-namespace:TVMediaHub.Tizen.Views"
+                  Title="Music"
+                  ChangeSortOptionCommand="{Binding ChangeSortOptionCommand}"
+                  ItemsSource="{Binding MusicList}">
     <!-- TODO : Fix to Guide  -->
 
     <RelativeLayout RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
@@ -12,22 +14,27 @@
         <RelativeLayout RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                         RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
             <Views:FooterNormalStatus x:Name="FooterNormal"  IsVisible="True"
-                                      IsFooterEnabled="False"
+                                      IsFooterEnabled="True"
                                       RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                                       RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
                                       SourceList="{Binding SourceList}"
                                       SortOptions="{Binding SortOptions}"
                                       OptionList="{Binding OptionList}"/>
         </RelativeLayout>
-
-        <RelativeLayout x:Name="NoContentsArea"
-                        RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
-                        RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
-            <StackLayout x:Name="MusicNoContents" Orientation="Vertical" IsVisible="True"
-                            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
-                <Image x:Name="ImgNoContents" Source="img_media_no_contents.png" HorizontalOptions="Center"/>
-                <Label x:Name="LabelNoContents" Text="No content" FontFamily="BreezeSans" HorizontalOptions="Center"/>
+        <ScrollView x:Name="MusicTabScrollView"
+                    RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
+                    RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
+                    Orientation="Horizontal" IsVisible="False">
+            <StackLayout x:Name="MusicContentView"
+                         Orientation="Horizontal"
+                         HorizontalOptions="Start"
+                         RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.1}">
             </StackLayout>
-        </RelativeLayout>
+        </ScrollView>
+        <StackLayout x:Name="MusicNoContents" Orientation="Vertical" IsVisible="True"
+                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
+            <Image x:Name="ImgNoContents" Source="img_media_no_contents.png" HorizontalOptions="Center"/>
+            <Label x:Name="LabelNoContents" Text="No content" FontFamily="BreezeSans" HorizontalOptions="Center"/>
+        </StackLayout>
     </RelativeLayout>
 </mh:ContentPageEx>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
index 60ff382..0aaa5cd 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
@@ -14,8 +14,15 @@
  * limitations under the License.
  */
 
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Windows.Input;
 using TVMediaHub.Tizen.Controls;
+using TVMediaHub.Tizen.DataModels;
+using TVMediaHub.Tizen.Models;
 using TVMediaHub.Tizen.Utils;
+using TVMediaHub.Tizen.ViewModels;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
@@ -26,17 +33,53 @@ namespace TVMediaHub.Tizen.Views
     /// </summary>
     public partial class MusicTab : ContentPageEx
     {
+
+        /// <summary>
+        /// Identifies the ItemsSource bindable property
+        /// </summary>
+        public static readonly BindableProperty ItemsSourceProperty = BindableProperty.Create("ItemsSource", typeof(ObservableCollection<GroupItem>), typeof(MusicTab), default(ObservableCollection<GroupItem>));
+
+        /// <summary>
+        /// Gets or set ItemSource to display music tab
+        /// </summary>
+        public ObservableCollection<GroupItem> ItemsSource
+        {
+            get { return (ObservableCollection<GroupItem>)GetValue(ItemsSourceProperty); }
+            set { SetValue(ItemsSourceProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the ChangeSortOptionCommand bindable property
+        /// </summary>
+        public static readonly BindableProperty ChangeSortOptionCommandProperty = BindableProperty.Create("ChangeSortOptionCommand", typeof(ICommand), typeof(MusicTab), default(ICommand));
+
+        /// <summary>
+        /// Gets or sets ChangeTabStatus Command
+        /// </summary>
+        public ICommand ChangeSortOptionCommand
+        {
+            get { return (ICommand)GetValue(ChangeSortOptionCommandProperty); }
+            set { SetValue(ChangeSortOptionCommandProperty, value); }
+        }
         /// <summary>
         /// A constructor
         /// Initializes the size of the items that are used in Music tab
         /// </summary>
         public MusicTab()
         {
+            BindingContext = MusicTabViewModelLocator.ViewModel;
             InitializeComponent();
             InitializeSize();
             InitializeFonts();
+            InitializeFooter();
+
+            ItemsSource.CollectionChanged += ItemsSourceCollectionChanged;
+
+            MusicTabViewModelLocator.ViewModel.TestRead();
+            // TODO : for the test
         }
 
+
         /// <summary>
         /// A method for initializing the size of the items that are used in Music tab
         /// </summary>
@@ -59,6 +102,19 @@ namespace TVMediaHub.Tizen.Views
         }
 
         /// <summary>
+        /// Initialize elements on footer area
+        /// </summary>
+        private void InitializeFooter()
+        {
+            FooterNormal.OnDropdownSourceItemSelected += OnSourceChanged;
+
+            FooterNormal.OnDropdownSortItemSelected += OnSortOptionChanged;
+
+            FooterNormal.OnSelectedOptionIndexChanged += OnOptionSelected;
+
+        }
+
+        /// <summary>
         /// A method for initializing page when the page is appeared
         /// </summary>
         protected override void InitializePage()
@@ -85,5 +141,57 @@ namespace TVMediaHub.Tizen.Views
         public override void RunShowAnimation()
         {
         }
+
+        /// <summary>
+        /// Occurs when an item is added, removed, changed, moved, or the entire list is refreshed.
+        /// </summary>
+        /// <param name="sender">The object that raised the event</param>
+        /// <param name="e">Information about the event</param>
+        private void ItemsSourceCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action.ToString().Equals("Add"))
+            {
+                if (MusicNoContents.IsVisible)
+                {
+                    MusicNoContents.IsVisible = false;
+                    MusicTabScrollView.IsVisible = true;
+                }
+                MusicGroup groupView = new MusicGroup();
+
+                var groupItem = e.NewItems[0];
+                groupView.BindingContext = groupItem;
+                MusicContentView.Children.Add(groupView);
+            }
+
+        }
+
+        /// <summary>
+        /// This method is called when Source option is changed
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A SelectedItemChanged event's argument</param>
+        private void OnSourceChanged(object sender, SelectedItemChangedEventArgs e)
+        {
+            // TODO : Source Change
+        }
+
+        /// <summary>
+        /// This method is called when Sort option is changed
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A SelectedItemChanged event's argument</param>
+        private void OnSortOptionChanged(object sender, SelectedItemChangedEventArgs e)
+        {
+            ChangeSortOptionCommand?.Execute(e.SelectedItem);
+        }
+
+        /// <summary>
+        /// This method is called when option menu is changed
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A SelectedItemChanged event's argument</param>
+        private void OnOptionSelected(object sender, ContextPopupSelectedEventArgs e)
+        {
+        }
     }
 }
-- 
2.7.4


From 26c81a958899b5de8d150a650587e7af0765e113 Mon Sep 17 00:00:00 2001
From: Hyerim Kim <rimi.kim@samsung.com>
Date: Mon, 5 Jun 2017 18:23:09 +0900
Subject: [PATCH 02/16] Fixed Coding rule check

Change-Id: I814ab960b9b341f5a017132c5b9dd608b01f043c
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>
---
 TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs       | 3 ++-
 TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs         | 1 +
 TVMediaHub/TVMediaHub.Tizen/Models/MusicProvider.cs         | 1 +
 TVMediaHub/TVMediaHub.Tizen/Models/VideoProvider.cs         | 1 +
 TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs | 3 ++-
 TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs | 7 +++++--
 TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs        | 1 +
 TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs         | 5 +++--
 TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs          | 2 ++
 TVMediaHub/TVMediaHub.Tizen/Views/ImageViewer.xaml.cs       | 4 ++--
 TVMediaHub/TVMediaHub.Tizen/Views/SimpleImageViewer.xaml.cs | 1 +
 TVMediaHub/TVMediaHub.Tizen/Views/VideoGroup.xaml.cs        | 3 ++-
 TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs         | 7 ++++---
 TVMediaHub/TVMediaHub.Tizen/Views/VideoPlayer.xaml.cs       | 4 +++-
 TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs          | 8 ++++----
 15 files changed, 34 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 TVMediaHub/TVMediaHub.Tizen/Views/SimpleImageViewer.xaml.cs

diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
index c15c604..672cfd0 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
@@ -52,6 +52,7 @@ namespace TVMediaHub.Tizen.Models
         /// <summary>
         /// An abstract method to determine the availability of the content.
         /// </summary>
+        /// <param name="mediaContent">A media content to be checked the availability</param>
         abstract protected void CheckUnavailableContent(MediaInformationEx mediaContent);
 
         /// <summary>
@@ -304,7 +305,7 @@ namespace TVMediaHub.Tizen.Models
         /// A method for making thumbnail of Media contents.
         /// </summary>
         /// <param name="list">A list of media contents</param>
-        /// <returns></returns>
+        /// <returns>A path of thumbnail</returns>
         public async Task CheckThumbnail(IEnumerable<MediaShortcutInfo> list)
         {
             foreach (var info in list)
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs
index 63f1f5f..7a0cd72 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs
@@ -46,6 +46,7 @@ namespace TVMediaHub.Tizen.Models
         /// <summary>
         /// A method to determine the availability of the content.
         /// </summary>
+        /// <param name="mediaContent">A media content to be checked the availability</param>
         protected override void CheckUnavailableContent(MediaInformationEx mediaContent)
         {
             if (mediaContent.MediaContentInformation.FilePath != null)
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/MusicProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/MusicProvider.cs
index d874120..381a321 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/MusicProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/MusicProvider.cs
@@ -44,6 +44,7 @@ namespace TVMediaHub.Tizen.Models
         /// <summary>
         /// A method to determine the availability of the content.
         /// </summary>
+        /// <param name="mediaContent">A media content to be checked the availability</param>
         protected override void CheckUnavailableContent(MediaInformationEx mediaContent)
         {
             // TODO : Add unsupported mime type here
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/VideoProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/VideoProvider.cs
index 7417734..ed9ca1b 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/VideoProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/VideoProvider.cs
@@ -47,6 +47,7 @@ namespace TVMediaHub.Tizen.Models
         /// <summary>
         /// A method to determine the availability of the content.
         /// </summary>
+        /// <param name="mediaContent">A media content to be checked the availability</param>
         protected override void CheckUnavailableContent(MediaInformationEx mediaContent)
         {
             // TODO : Add unsupported mime type here
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
index b36e2e5..90c384f 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
@@ -466,13 +466,14 @@ namespace TVMediaHub.Tizen.ViewModels
                     SelectedList.Clear();
                     SelectedList.Add(SelectedItem);
                 }
+
                 foreach (var info in SelectedList)
                 {
                     try
                     {
                         File.Delete(info.MediaContentInformation.FilePath);
                     }
-                    catch(Exception exception)
+                    catch (Exception exception)
                     {
                         // TODO: Handling exceptions
                         DbgPort.E("Exception - " + exception.Message);
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs
index 749edca..372eb07 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs
@@ -142,7 +142,8 @@ namespace TVMediaHub.Tizen.ViewModels
         public int CurrentVideoIndex { get; set; }
         public List<MediaInformationEx> PlayList { get; set; }
 
-        public bool IsLastVideo {
+        public bool IsLastVideo
+        {
             get
             {
                 return (PlayList.Count - 1) == CurrentVideoIndex;
@@ -255,13 +256,14 @@ namespace TVMediaHub.Tizen.ViewModels
                     SelectedList.Clear();
                     SelectedList.Add(SelectedItem);
                 }
+
                 foreach (var info in SelectedList)
                 {
                     try
                     {
                         File.Delete(info.MediaContentInformation.FilePath);
                     }
-                    catch(Exception exception)
+                    catch (Exception exception)
                     {
                         // TODO: Handling exceptions
                         DbgPort.E("Exception - " + exception.Message);
@@ -434,6 +436,7 @@ namespace TVMediaHub.Tizen.ViewModels
         /// A method for reading video contents through VideoProvider and updating VideoList
         /// </summary>
         /// <param name="option">A current sort option</param>
+        /// <param name="storageId">A storage id</param>
         private async void ReadVideoList(SortOption option, string storageId = null)
         {
             VideoList.Clear();
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs
index 4a5fe66..f87f44f 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs
@@ -363,6 +363,7 @@ namespace TVMediaHub.Tizen.Views
                 focusedItem.ShowContextPopup();
                 return true;
             }
+
             return false;
         }
     }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs
index 856e647..a3d7c88 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs
@@ -419,6 +419,7 @@ namespace TVMediaHub.Tizen.Views
                 IsLoaded = true;
             }
         }
+
         public void ShowContextPopup()
         {
             if (!FocusArea.IsFocused)
@@ -429,12 +430,12 @@ namespace TVMediaHub.Tizen.Views
             ContextPopup popup = new ContextPopup();
             popup.Items.Add(new ContextPopupItem("FILE INFO"));
             popup.Items.Add(new ContextPopupItem("DELETE"));
-            popup.SelectedIndexChanged += selectedIndexChanged;
+            popup.SelectedIndexChanged += SelectedIndexChanged;
             popup.Show(this, this.Width / 2, this.Height + SizeUtils.GetHeightSize(72));
 
         }
 
-        private void selectedIndexChanged(object sender, EventArgs e)
+        private void SelectedIndexChanged(object sender, EventArgs e)
         {
             var ctxPopup = sender as ContextPopup;
             switch (ctxPopup.SelectedIndex)
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
index 00c50de..731d840 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
@@ -676,6 +676,7 @@ namespace TVMediaHub.Tizen.Views
             App.MainWindow.KeyUp -= MenuKeyListener;
             App.MainWindow.KeyUngrab(ElmSharp.EvasKeyEventArgs.PlatformMenuButtonName);
         }
+
         private void MenuKeyListener(object sender, ElmSharp.EvasKeyEventArgs e)
         {
             if (e.KeyName.Equals(ElmSharp.EvasKeyEventArgs.PlatformMenuButtonName))
@@ -719,6 +720,7 @@ namespace TVMediaHub.Tizen.Views
                     {
                         DeleteContentCommand?.Execute(item);
                     }
+
                     break;
             }
 
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewer.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewer.xaml.cs
index e0b854a..b858412 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewer.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewer.xaml.cs
@@ -451,7 +451,7 @@ namespace TVMediaHub.Tizen.Views
         /// <summary>
         /// A method for getting visible image
         /// </summary>
-        /// <returns></returns>
+        /// <returns>The image to be seen</returns>
         private Xamarin.Forms.Image GetVisibleImage()
         {
             Xamarin.Forms.Image visibleImage = null;
@@ -477,7 +477,7 @@ namespace TVMediaHub.Tizen.Views
         /// <summary>
         /// A method for getting invisible image
         /// </summary>
-        /// <returns></returns>
+        /// <returns>The image to be unseen</returns>
         private Xamarin.Forms.Image GetUnVisibleImage()
         {
             Xamarin.Forms.Image unVisibleImage = null;
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/SimpleImageViewer.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/SimpleImageViewer.xaml.cs
old mode 100644
new mode 100755
index 27593f9..e404f83
--- a/TVMediaHub/TVMediaHub.Tizen/Views/SimpleImageViewer.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/SimpleImageViewer.xaml.cs
@@ -711,6 +711,7 @@ namespace TVMediaHub.Tizen.Views
         /// <summary>e
         /// A method for hiding control area when timer is over
         /// </summary>
+        /// <param name="state">The status to be set</param>
         private void HideControlAreaHandler(object state)
         {
             SetControlAreaState(ControlAreaState.HIDE);
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/VideoGroup.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/VideoGroup.xaml.cs
index 444ff48..ebc6a72 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/VideoGroup.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/VideoGroup.xaml.cs
@@ -395,11 +395,12 @@ namespace TVMediaHub.Tizen.Views
         /// <returns>If group has a focused video item, true; otherwise, false</returns>
         public bool NotifyMenuKeyPressedToFocusedItem()
         {
-            if(focusedItem != null)
+            if (focusedItem != null)
             {
                 focusedItem.ShowContextPopup();
                 return true;
             }
+
             return false;
         }
     }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs
index 88c1125..2318310 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs
@@ -459,12 +459,12 @@ namespace TVMediaHub.Tizen.Views
             ContextPopup popup = new ContextPopup();
             popup.Items.Add(new ContextPopupItem("          FILE INFO           "));
             popup.Items.Add(new ContextPopupItem("DELETE"));
-            popup.SelectedIndexChanged += selectedIndexChanged;
-            popup.Show(this, this.Width/2, this.Height + SizeUtils.GetHeightSize(72));
+            popup.SelectedIndexChanged += SelectedIndexChanged;
+            popup.Show(this, this.Width / 2, this.Height + SizeUtils.GetHeightSize(72));
 
         }
 
-        private void selectedIndexChanged(object sender, EventArgs e)
+        private void SelectedIndexChanged(object sender, EventArgs e)
         {
             var ctxPopup = sender as ContextPopup;
             switch (ctxPopup.SelectedIndex)
@@ -476,6 +476,7 @@ namespace TVMediaHub.Tizen.Views
                     ContextPopupItemSelectedHandler?.Invoke(VideoInfo, VideoContextPopupItem.Delete);
                     break;
             }
+
             ctxPopup.Dismiss();
         }
     }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/VideoPlayer.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/VideoPlayer.xaml.cs
index 5ad9244..8ef7fe9 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/VideoPlayer.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/VideoPlayer.xaml.cs
@@ -270,6 +270,7 @@ namespace TVMediaHub.Tizen.Views
                         DbgPort.D(ex.Message);
                         return;
                     }
+
                     PrepareAsync();
                 }
             }
@@ -499,7 +500,7 @@ namespace TVMediaHub.Tizen.Views
         /// <summary>
         /// Sets the play time on the control area
         /// </summary>
-        /// <param name="time"></param>
+        /// <param name="time">A current playing time</param>
         private void SetPlayTime(int time)
         {
             int second = (time / 1000) % 60;
@@ -558,6 +559,7 @@ namespace TVMediaHub.Tizen.Views
         /// <summary>e
         /// A method for hiding control area when timer is over
         /// </summary>
+        /// <param name="state">The status to be set</param>
         private void HideControlAreaHandler(object state)
         {
             SetControlAreaState(ControlAreaState.HIDE);
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs
index 868e5e6..86b10dd 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs
@@ -25,12 +25,10 @@ using TVMediaHub.Tizen.Utils;
 using TVMediaHub.Tizen.ViewModels;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
-using Tizen.Content.MediaContent;
-using static TVMediaHub.Tizen.Views.VideoItem;
-using Tizen.Xamarin.Forms.Extension;
 
 namespace TVMediaHub.Tizen.Views
 {
+    using static TVMediaHub.Tizen.Views.VideoItem;
     /// <summary>
     /// A custom ContentPage for displaying the video tab
     /// </summary>
@@ -663,6 +661,7 @@ namespace TVMediaHub.Tizen.Views
             App.MainWindow.KeyUp -= MenuKeyListener;
             App.MainWindow.KeyUngrab(ElmSharp.EvasKeyEventArgs.PlatformMenuButtonName);
         }
+
         private void MenuKeyListener(object sender, ElmSharp.EvasKeyEventArgs e)
         {
             if (e.KeyName.Equals(ElmSharp.EvasKeyEventArgs.PlatformMenuButtonName))
@@ -675,7 +674,7 @@ namespace TVMediaHub.Tizen.Views
         {
             if (VideoTabList.Children.Count > 0)
             {
-                foreach(VideoGroup group in VideoTabList.Children)
+                foreach (VideoGroup group in VideoTabList.Children)
                 {
                     if (group.NotifyMenuKeyPressedToFocusedItem())
                     {
@@ -705,6 +704,7 @@ namespace TVMediaHub.Tizen.Views
                     {
                         DeleteContentCommand?.Execute(item);
                     }
+
                     break;
             }
         }
-- 
2.7.4


From 241ef878bba9350dacd7a1234dc1e17c44d1e693 Mon Sep 17 00:00:00 2001
From: "Geunsun, Lee" <gs86.lee@samsung.com>
Date: Wed, 7 Jun 2017 10:13:54 +0900
Subject: [PATCH 03/16] Add files for Music tab

Change-Id: I4a69251d327825fd904e913f0066f02471e49ec8
---
 TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
index b1cbfcd..ebf69fe 100755
--- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
+++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
@@ -86,6 +86,7 @@
     <Compile Include="ViewModels\ImageTabViewModelLocator.cs" />
     <Compile Include="ViewModels\MediaHubMainPageViewModel.cs" />
     <Compile Include="ViewModels\MusicTabViewModel.cs" />
+    <Compile Include="ViewModels\MusicTabViewModelLocator.cs" />
     <Compile Include="ViewModels\VideoPlayerViewModel.cs" />
     <Compile Include="ViewModels\VideoTabViewModel.cs" />
     <Compile Include="ViewModels\VideoTabViewModelLocator.cs" />
@@ -105,6 +106,12 @@
     <Compile Include="Views\ImageTab.xaml.cs">
       <DependentUpon>ImageTab.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\MusicGroup.xaml.cs">
+      <DependentUpon>MusicGroup.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MusicItem.xaml.cs">
+      <DependentUpon>MusicItem.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\SimpleImageViewer.xaml.cs">
       <DependentUpon>SimpleImageViewer.xaml</DependentUpon>
     </Compile>
@@ -301,6 +308,18 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\MusicGroup.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\MusicItem.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
 		Other similar extension points exist, see Microsoft.Common.targets.
@@ -331,4 +350,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
-- 
2.7.4


From 07eb82e244741e23b13122e746de10b100c25353 Mon Sep 17 00:00:00 2001
From: "kyuho.jo" <kyuho.jo@samsung.com>
Date: Mon, 5 Jun 2017 20:35:47 +0900
Subject: [PATCH 04/16] Show 'unavailable' icon for not supported contents

Change-Id: I3ed9fda3eeae5c633e90569f748c682ddd49c9fe
Signed-off-by: kyuho.jo <kyuho.jo@samsung.com>
---
 .../DataModels/MediaInformationEx.cs               |   9 ++++++-
 .../TVMediaHub.Tizen/Models/ContentProvider.cs     |   1 -
 .../TVMediaHub.Tizen/Models/ImageProvider.cs       |   3 ++-
 .../TVMediaHub.Tizen/Models/VideoProvider.cs       |   1 +
 .../TVMediaHub.Tizen/TVMediaHub.Tizen.csproj       |   3 +++
 TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml   |   3 +++
 .../TVMediaHub.Tizen/Views/ImageItem.xaml.cs       |  23 +++++++++++++++++
 TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml   |   3 +++
 .../TVMediaHub.Tizen/Views/VideoItem.xaml.cs       |  28 ++++++++++++++++++---
 .../res/img_gallery_unavailable_photo.png          | Bin 0 -> 3234 bytes
 .../res/img_gallery_unavailable_video.png          | Bin 0 -> 2950 bytes
 .../TVMediaHub.Tizen/res/img_movie_unavailable.png | Bin 0 -> 3179 bytes
 12 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/res/img_gallery_unavailable_photo.png
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/res/img_gallery_unavailable_video.png
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/res/img_movie_unavailable.png

diff --git a/TVMediaHub/TVMediaHub.Tizen/DataModels/MediaInformationEx.cs b/TVMediaHub/TVMediaHub.Tizen/DataModels/MediaInformationEx.cs
index 223cd9c..92fe788 100644
--- a/TVMediaHub/TVMediaHub.Tizen/DataModels/MediaInformationEx.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/DataModels/MediaInformationEx.cs
@@ -20,7 +20,14 @@ namespace TVMediaHub.Tizen.DataModels
 {
     public class MediaInformationEx
     {
+        /// <summary>
+        /// The media content information
+        /// </summary>
         public MediaInformation MediaContentInformation;
-        public bool IsAvailable;
+
+        /// <summary>
+        /// An attribute of the availability of this media content
+        /// </summary>
+        public bool IsAvailable = true;
     };
 }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
index 672cfd0..fee6c63 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
@@ -218,7 +218,6 @@ namespace TVMediaHub.Tizen.Models
                 {
                     result.Add(currentGroupItem);
                     lastGroupItem = currentGroupItem;
-                    DbgPort.D("new Group : " + currentGroupItem.Title);
                 }
 
                 if (currentGroupItem != null)
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs
index 7a0cd72..1db692b 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs
@@ -54,8 +54,9 @@ namespace TVMediaHub.Tizen.Models
                 // Check 1 : The size of the image file must be less than 4MB.
                 var fileInfo = new FileInfo(mediaContent.MediaContentInformation.FilePath);
 
-                if (fileInfo != null && fileInfo.Length > 4 * 1024 * 1024)
+                if (fileInfo != null && fileInfo.Length > 8 * 1024 * 1024)
                 {
+                    DbgPort.D(mediaContent.MediaContentInformation.DisplayName + ": This content is not available");
                     mediaContent.IsAvailable = false;
                 }
             }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/VideoProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/VideoProvider.cs
index ed9ca1b..0bcb5e8 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/VideoProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/VideoProvider.cs
@@ -54,6 +54,7 @@ namespace TVMediaHub.Tizen.Models
             if (mediaContent.MediaContentInformation.IsDrm ||
                 mediaContent.MediaContentInformation.MimeType.Contains("ogg"))
             {
+                DbgPort.D(mediaContent.MediaContentInformation.DisplayName + " : This content is not available");
                 mediaContent.IsAvailable = false;
             }
         }
diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
index b1cbfcd..b7aed71 100755
--- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
+++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
@@ -210,8 +210,11 @@
     <Content Include="res\img_dimmed.9.png" />
     <Content Include="res\img_dimmed_opacity75.9.png" />
     <Content Include="res\img_dimmed_opacity85.9.png" />
+    <Content Include="res\img_gallery_unavailable_photo.png" />
+    <Content Include="res\img_gallery_unavailable_video.png" />
     <Content Include="res\img_gradient_topbottom.9.png" />
     <Content Include="res\img_media_no_contents.png" />
+    <Content Include="res\img_movie_unavailable.png" />
     <Content Include="res\img_photozoom_gradient.9.png" />
     <Content Include="res\img_stroke.9.png" />
     <Content Include="res\img_stroke2.9.png" />
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml
index 1126cb2..1c056c3 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml
@@ -20,6 +20,9 @@
         <Image x:Name="ContentImage"
                Source="{Binding ThumbnailPath}"/>
     </Views:CustomImageControl>
+    <Image x:Name="UnavailableIcon"
+         Source="img_gallery_unavailable_photo.png"
+         IsVisible="false"/>
     <Utils:NinePatch x:Name="ImgDimmed"
                      Source="img_thumbnail_gradient_normal.9.png"
                      IsVisible="False" />
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs
index a3d7c88..08eb93e 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs
@@ -316,6 +316,14 @@ namespace TVMediaHub.Tizen.Views
                     UpdateView();
                 }
             }
+            else if (e.PropertyName.CompareTo("SelectedImage") == 0)
+            {
+                if (SelectedImage.IsAvailable == false)
+                {
+                    ContentImage.IsVisible = false;
+                    UnavailableIcon.IsVisible = true;
+                }
+            }
         }
 
         /// <summary>
@@ -363,6 +371,13 @@ namespace TVMediaHub.Tizen.Views
                         ImgDimmed.LayoutTo(ImageAreaFocusedBounds, 500, easing);
                         ImgFocused.LayoutTo(ShadowFocusedBounds, 500, easing);
                         ContentImage.LayoutTo(ImageFocusedBounds, 500, easing);
+
+                        if (SelectedImage.IsAvailable == false)
+                        {
+                            UnavailableIcon.ScaleTo(1.3, 167, easing);
+                            UnavailableIcon.LayoutTo(ImageFocusedBounds, 500, easing);
+                        }
+
                         if (IsDeleteMode)
                         {
                             ImgCheckDimmed.LayoutTo(ImageAreaFocusedBounds, 500, easing);
@@ -387,6 +402,13 @@ namespace TVMediaHub.Tizen.Views
             ImgFocused.Opacity = 0.0;
             ContentImage.ScaleTo(1.0, 167, easing);
             ContentImage.LayoutTo(ImageBounds, 167, easing);
+
+            if (SelectedImage.IsAvailable == false)
+            {
+                UnavailableIcon.ScaleTo(1.0, 167, easing);
+                UnavailableIcon.Layout(ImageBounds);
+            }
+
             ImgFocused.LayoutTo(ShadowNormalBounds, 167, easing);
             ImgDimmed.LayoutTo(ImageAreaNormalBounds, 167, easing);
             if (IsDeleteMode)
@@ -416,6 +438,7 @@ namespace TVMediaHub.Tizen.Views
                 ImgDimmed.Layout(ImageBounds);
                 ImgCheckDimmed.Layout(ImageAreaNormalBounds);
                 ImgCheck.Layout(ImageAreaNormalBounds);
+                UnavailableIcon.Layout(ImageAreaNormalBounds);
                 IsLoaded = true;
             }
         }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml
index 1d934f6..95562da 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml
@@ -33,6 +33,9 @@
     <Image x:Name="PlayImage"
            Source="btn_list_thumbnail_play.png"
            Opacity="0"/>
+    <Image x:Name="UnavailableIcon"
+         Source="img_movie_unavailable.png"
+         IsVisible="false"/>
     <Utils:NinePatch x:Name="CheckDimImage"
                      VerticalOptions="CenterAndExpand"
                      HorizontalOptions="CenterAndExpand"
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs
index 2318310..a8a0481 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs
@@ -166,7 +166,7 @@ namespace TVMediaHub.Tizen.Views
         {
             InitializeComponent();
             InitializeSize();
-            PropertyChanged += VideoTabPropertyChanged;
+            PropertyChanged += VideoItemPropertyChanged;
         }
 
         /// <summary>
@@ -248,6 +248,7 @@ namespace TVMediaHub.Tizen.Views
                 PlayImage.Layout(PlayIconBounds);
                 CheckDimImage.Layout(NormalBounds);
                 CheckImage.Layout(NormalBounds);
+                UnavailableIcon.Layout(NormalBounds);
                 IsLoaded = true;
             }
         }
@@ -278,7 +279,12 @@ namespace TVMediaHub.Tizen.Views
             DimImage.LayoutTo(NormalBounds, 167, easing);
             ContentImage.LayoutTo(NormalContentImageBounds, 167, easing);
             BgDimImage.LayoutTo(NormalShadowBounds, 167, easing);
-            PlayImage.FadeTo(0.0, 167);
+
+            if (VideoInfo.IsAvailable)
+            {
+                PlayImage.FadeTo(0.0, 167);
+            }
+
             if (IsDeleteMode)
             {
                 CheckDimImage.LayoutTo(NormalBounds, 167, easing);
@@ -331,7 +337,12 @@ namespace TVMediaHub.Tizen.Views
                         DimImage.LayoutTo(FocusedBounds, 500, easing);
                         ContentImage.LayoutTo(FocusedContentImageBounds, 500, easing);
                         BgDimImage.LayoutTo(FocusedShadowBounds, 500, easing);
-                        PlayImage.FadeTo(0.99, 167);
+
+                        if (VideoInfo.IsAvailable)
+                        {
+                            PlayImage.FadeTo(0.99, 167);
+                        }
+
                         if (IsDeleteMode)
                         {
                             CheckDimImage.LayoutTo(FocusedBounds, 167, easing);
@@ -437,7 +448,7 @@ namespace TVMediaHub.Tizen.Views
         /// </summary>
         /// <param name="sender">The source of the event</param>
         /// <param name="e">A propertyChanged event argument</param>
-        private void VideoTabPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void VideoItemPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName.CompareTo("IsDeleteMode") == 0)
             {
@@ -447,6 +458,15 @@ namespace TVMediaHub.Tizen.Views
                     UpdateView();
                 }
             }
+            else if (e.PropertyName.CompareTo("VideoInfo") == 0)
+            {
+                if (VideoInfo.IsAvailable == false)
+                {
+                    ContentImage.IsVisible = false;
+                    UnavailableIcon.IsVisible = true;
+                }
+            }
+
         }
 
         public void ShowContextPopup()
diff --git a/TVMediaHub/TVMediaHub.Tizen/res/img_gallery_unavailable_photo.png b/TVMediaHub/TVMediaHub.Tizen/res/img_gallery_unavailable_photo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7a6f661ca2e0752200e384f9da17589cc558fa8
GIT binary patch
literal 3234
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
NaK(6{ub@I>{|WU1dmI1&

literal 0
HcmV?d00001

diff --git a/TVMediaHub/TVMediaHub.Tizen/res/img_gallery_unavailable_video.png b/TVMediaHub/TVMediaHub.Tizen/res/img_gallery_unavailable_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..51497dde283b337bfd49e34b44e8aa4f0a36bc71
GIT binary patch
literal 2950
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
L6Zr<|NaTM2LBZP2

literal 0
HcmV?d00001

diff --git a/TVMediaHub/TVMediaHub.Tizen/res/img_movie_unavailable.png b/TVMediaHub/TVMediaHub.Tizen/res/img_movie_unavailable.png
new file mode 100644
index 0000000000000000000000000000000000000000..463709d9270ad395ee3816d2352b090e332f06d6
GIT binary patch
literal 3179
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
Chee10

literal 0
HcmV?d00001

-- 
2.7.4


From 307a00e2a0568e61d73710ddfb0daea4ed521b69 Mon Sep 17 00:00:00 2001
From: Heonjae Jang <heonjae.jang@samsung.com>
Date: Wed, 7 Jun 2017 14:29:37 +0900
Subject: [PATCH 05/16] Change label slide animation

Change-Id: Id767f1bec4a480f303478457d7a0c120a63ab6f6
Signed-off-by: Heonjae Jang <heonjae.jang@samsung.com>
---
 .../TVMediaHub.Tizen/TVMediaHub.Tizen.project.json |  4 +--
 .../TVMediaHub.Tizen/Views/VideoItem.xaml.cs       | 42 ++++++++++++++++------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.project.json b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.project.json
index f34ad0b..542d989 100755
--- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.project.json
+++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.project.json
@@ -12,9 +12,9 @@
     "Tizen.Content.MediaContent": "1.0.19",
     "Tizen.Multimedia": "1.2.0",
     "Tizen.Multimedia.MediaPlayer": "1.0.0",
-    "Tizen.Xamarin.Forms.Extension": "2.3.5-r233-002",
+    "Tizen.Xamarin.Forms.Extension": "2.3.5-r233-004",
     "Xamarin.Forms": "2.3.5-r233-004",
-    "Xamarin.Forms.Platform.Tizen": "2.3.5-r233-004"
+    "Xamarin.Forms.Platform.Tizen": "2.3.5-r233-008"
   },
   "runtimes": {
     "win": {},
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs
index a8a0481..4c16c24 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/VideoItem.xaml.cs
@@ -166,10 +166,39 @@ namespace TVMediaHub.Tizen.Views
         {
             InitializeComponent();
             InitializeSize();
+            InitializeLabelSlide();
             PropertyChanged += VideoItemPropertyChanged;
         }
 
         /// <summary>
+        /// A method for initializing label slide
+        /// </summary>
+        private void InitializeLabelSlide()
+        {
+            ContentTitle.SetValue(SlideEffect.SlideModeProperty, SlideMode.Always);
+            ContentTitle.SetValue(SlideEffect.SlideStyleProperty, SlideStyle.Long);
+            ContentTitle.SetValue(SlideEffect.HasSlideProperty, false);
+
+            ContentTitle.PropertyChanged += SetSlideDuration;
+        }
+
+        /// <summary>
+        /// This method is called when the ContentTitle property is changed
+        /// Sets label slide duration
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A propertyChanged event argument</param>
+        private void SetSlideDuration(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName.Equals("Width"))
+            {
+                double slideDuration = ContentTitle.Width * 12000 / 480;
+                ContentTitle.SetValue(SlideEffect.SlideDurationProperty, slideDuration);
+                ContentTitle.PropertyChanged -= SetSlideDuration;
+            }
+        }
+
+        /// <summary>
         /// A method for initializing size of the items that are used in this class
         /// </summary>
         private void InitializeSize()
@@ -273,6 +302,7 @@ namespace TVMediaHub.Tizen.Views
             Easing easing = new Easing(EasingFunction.EasyIn2);
             this.AbortAnimation("TextSliding");
             this.AbortAnimation("FocusAnimation");
+            ContentTitle.SetValue(SlideEffect.HasSlideProperty, false);
 
             BgDimImage.Opacity = 0;
             ContentImage.ScaleTo(1.0, 167, easing);
@@ -309,17 +339,7 @@ namespace TVMediaHub.Tizen.Views
                 {
                     if (!IsCanceled)
                     {
-                        uint animationLength = (uint)(ContentTitle.Width * 12000 / 480);
-                        this.Animate("TextSliding",
-                            (v2) =>
-                            {
-                                ContentTitle.TranslationX = -ContentTitle.Width * v2;
-                            },
-                            length: animationLength,
-                            finished: (v2, c2) =>
-                             {
-                                 ContentTitle.TranslationX = 0;
-                             });
+                        ContentTitle.SetValue(SlideEffect.HasSlideProperty, true);
                     }
                 });
 
-- 
2.7.4


From a5f56fc91619a163b0738d3a7fbf0588eb08ced5 Mon Sep 17 00:00:00 2001
From: "jjie.choi" <jjie.choi@samsung.com>
Date: Wed, 7 Jun 2017 17:08:40 +0900
Subject: [PATCH 06/16] Implement MusicTab sortby

Change-Id: I61d6a7aecceefee560d17e7a1e668e2a96467f50
Signed-off-by: jjie.choi <jjie.choi@samsung.com>
---
 .../TVMediaHub.Tizen/Models/ContentProvider.cs     | 26 ++++++
 .../ViewModels/MusicTabViewModel.cs                | 93 +++++++++++++++++++++-
 TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs |  5 --
 TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml   |  7 +-
 .../TVMediaHub.Tizen/Views/MusicItem.xaml.cs       |  3 +
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml    |  7 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs | 43 ++++++++--
 7 files changed, 169 insertions(+), 15 deletions(-)

diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
index fee6c63..3d21b0b 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
@@ -162,6 +162,20 @@ namespace TVMediaHub.Tizen.Models
                         newGroupFlag = true;
                         newTitle = mediaInformationEx.MediaContentInformation.MediaType.ToString();
                     }
+                    break;
+                case SortOption.Album:
+                    if (lastGroupItem == null || lastGroupItem.Title != (mediaInformationEx.MediaContentInformation as AudioInformation).Album)
+                    {
+                        newGroupFlag = true;
+                        newTitle = (mediaInformationEx.MediaContentInformation as AudioInformation).Album.ToString();
+                    }
+                    break;
+                case SortOption.Artist:
+                    if (lastGroupItem == null || lastGroupItem.Title != (mediaInformationEx.MediaContentInformation as AudioInformation).Artist)
+                    {
+                        newGroupFlag = true;
+                        newTitle = (mediaInformationEx.MediaContentInformation as AudioInformation).Artist.ToString();
+                    }
 
                     break;
                 default:
@@ -256,6 +270,12 @@ namespace TVMediaHub.Tizen.Models
                 case SortOption.Type:
                     contentFilter.OrderKey = "MEDIA_TYPE";
                     break;
+                case SortOption.Album:
+                    contentFilter.OrderKey = "MEDIA_ALBUM";
+                    break;
+                case SortOption.Artist:
+                    contentFilter.OrderKey = "MEDIA_ARTIST";
+                    break;
                 default:
                     throw new System.ArgumentException("Invalid sorting option.");
             }
@@ -352,6 +372,12 @@ namespace TVMediaHub.Tizen.Models
                 case SortOption.Type:
                     contentFilter.OrderKey = "MEDIA_TYPE";
                     break;
+                case SortOption.Album:
+                    contentFilter.OrderKey = "MEDIA_ALBUM";
+                    break;
+                case SortOption.Artist:
+                    contentFilter.OrderKey = "MEDIA_ARTIST";
+                    break;
                 default:
                     throw new System.ArgumentException("Invalid sorting option.");
             }
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
index fafed95..f05af0c 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
@@ -17,8 +17,11 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Threading;
+using System.Windows.Input;
 using TVMediaHub.Tizen.Models;
 using TVMediaHub.Tizen.Utils;
+using Xamarin.Forms;
 
 namespace TVMediaHub.Tizen.ViewModels
 {
@@ -32,9 +35,34 @@ namespace TVMediaHub.Tizen.ViewModels
         /// </summary>
         public ObservableCollection<GroupItem> MusicList { get; set; }
 
+        /// <summary>
+        /// Gets or sets the SortOption list
+        /// </summary>
+        public IEnumerable<string> SortOptions { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Option list
+        /// </summary>
+        public IEnumerable<string> OptionList { get; set; }
+
+        /// <summary>
+        /// A dictionary list of the source and storage id
+        /// </summary>
+        private Dictionary<string, string> sourcePairList;
+
+        /// <summary>
+        /// A command for executing when SortOption is changed
+        /// </summary>
+        public ICommand ChangeSortOptionCommand { get; set; }
+
         private SortOption option = SortOption.Title;
 
         /// <summary>
+        /// A command for executing to get informations
+        /// </summary>
+        public ICommand GetInformationsCommand { get; set; }
+
+        /// <summary>
         /// An event that is occurred when property of ViewModel is changed
         /// </summary>
         public event PropertyChangedEventHandler PropertyChanged;
@@ -58,6 +86,9 @@ namespace TVMediaHub.Tizen.ViewModels
         public MusicTabViewModel()
         {
             MusicList = new ObservableCollection<GroupItem>();
+            InitializeFooterItemsSource();
+            InitializeCommands();
+
             OnPropertyChanged("MusicList");
             MediaHubImpl.GetInstance.MusicProviderInstance.SetContentUpdatedEventListener((s, e) =>
             {
@@ -84,9 +115,67 @@ namespace TVMediaHub.Tizen.ViewModels
             }
         }
 
-        public void TestRead()
+        /// <summary>
+        /// A method for initializing the SourceList, SortOptionList and OptionList
+        /// </summary>
+        private void InitializeFooterItemsSource()
         {
-            ReadMusicList(option);
+            var list = new List<string>
+            {
+                "SONG",
+                "ALBUM",
+                "ARTIST",
+                "GENRE",
+            };
+            SortOptions = list;
+            OnPropertyChanged("SortOptions");
+
+            list = new List<string>
+            {
+                "DETAIL INFO",
+                "DELETE"
+            };
+            OptionList = list;
+            OnPropertyChanged("OptionList");
+        }
+
+        /// <summary>
+        /// A method for initializing commands that are used in Image tab
+        /// </summary>
+        private void InitializeCommands()
+        {
+            ChangeSortOptionCommand = new Command<string>((opt) =>
+            {
+                var optionString = opt.ToLower();
+                switch (optionString)
+                {
+                    case "song":
+                        ReadMusicList(SortOption.Title);
+                        option = SortOption.Title;
+                        break;
+                    case "album":
+                        ReadMusicList(SortOption.Album);
+                        option = SortOption.Album;
+                        break;
+                    case "artist":
+                        ReadMusicList(SortOption.Artist);
+                        option = SortOption.Artist;
+                        break;
+                    case "genre":
+                        ReadMusicList(SortOption.Genre);
+                        option = SortOption.Genre;
+                        break;
+                }
+            });
+
+            GetInformationsCommand = new Command(() =>
+            {
+                SynchronizationContext.Current.Post((o) =>
+                {
+                    ReadMusicList(option);
+                }, "");
+            });
+            OnPropertyChanged("ChangeSortOptionCommand");
         }
     }
 }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
index 731d840..8ae6b99 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
@@ -235,11 +235,6 @@ namespace TVMediaHub.Tizen.Views
             InitializeFooter();
             ItemsSource.CollectionChanged += ItemsSourceCollectionChanged;
             PropertyChanged += ImageTabPropertyChanged;
-
-            SynchronizationContext.Current.Post((o) =>
-            {
-                InitializePage();
-            }, "");
         }
 
         /// <summary>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
index 174bf6e..9404527 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
@@ -24,12 +24,15 @@
         <Label x:Name="SongTitle"
                Grid.Row="0"
                Grid.Column="1"
+               LineBreakMode="TailTruncation"
                Text="{Binding ContentName}"/>
         <Label x:Name="Artist"
                Grid.Row="1"
-               Grid.Column="1"/>
+               Grid.Column="1"
+               LineBreakMode="TailTruncation"/>
         <Label x:Name="AlbumTitle"
                Grid.Row="2"
-               Grid.Column="1"/>
+               Grid.Column="1"
+               LineBreakMode="TailTruncation"/>
     </Grid>
 </RelativeLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
index a35021e..840f471 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
@@ -72,8 +72,11 @@ namespace TVMediaHub.Tizen.Views
             HeightRequest = SizeUtils.GetHeightSize(134);
             AlbumCover.WidthRequest = SizeUtils.GetWidthSize(134);
             AlbumCover.HeightRequest = SizeUtils.GetHeightSize(134);
+            SongTitle.WidthRequest = SizeUtils.GetWidthSize(266);
             SongTitle.FontSize = SizeUtils.GetFontSize(20);
+            Artist.WidthRequest = SizeUtils.GetWidthSize(266);
             Artist.FontSize = SizeUtils.GetFontSize(17);
+            AlbumTitle.WidthRequest = SizeUtils.GetWidthSize(266);
             AlbumTitle.FontSize = SizeUtils.GetFontSize(17);
         }
 
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
index 1af1646..78f5d61 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
@@ -6,6 +6,7 @@
                   xmlns:Views="clr-namespace:TVMediaHub.Tizen.Views"
                   Title="Music"
                   ChangeSortOptionCommand="{Binding ChangeSortOptionCommand}"
+                  GetInformationsCommand="{Binding GetInformationsCommand}"
                   ItemsSource="{Binding MusicList}">
     <!-- TODO : Fix to Guide  -->
 
@@ -13,6 +14,10 @@
                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
         <RelativeLayout RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                         RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
+            <Views:FooterDeleteStatus x:Name="FooterDelete" IsVisible="False"
+                                      RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
+                                      RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
+                                      SelectedCount="{Binding SelectedCount}"/>
             <Views:FooterNormalStatus x:Name="FooterNormal"  IsVisible="True"
                                       IsFooterEnabled="True"
                                       RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
@@ -22,7 +27,7 @@
                                       OptionList="{Binding OptionList}"/>
         </RelativeLayout>
         <ScrollView x:Name="MusicTabScrollView"
-                    RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
+                    RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.855}"
                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
                     Orientation="Horizontal" IsVisible="False">
             <StackLayout x:Name="MusicContentView"
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
index 0aaa5cd..69ff533 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
@@ -17,6 +17,8 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Threading;
 using System.Windows.Input;
 using TVMediaHub.Tizen.Controls;
 using TVMediaHub.Tizen.DataModels;
@@ -28,11 +30,16 @@ using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVMediaHub.Tizen.Views
 {
+
     /// <summary>
     /// A custom ContentPage for displaying Music tab
     /// </summary>
     public partial class MusicTab : ContentPageEx
     {
+        /// <summary>
+        /// The flag whether content is ready
+        /// </summary>
+        private bool IsContentReady = false;
 
         /// <summary>
         /// Identifies the ItemsSource bindable property
@@ -61,6 +68,21 @@ namespace TVMediaHub.Tizen.Views
             get { return (ICommand)GetValue(ChangeSortOptionCommandProperty); }
             set { SetValue(ChangeSortOptionCommandProperty, value); }
         }
+
+        /// <summary>
+        /// Identifies the GetInformationsCommand bindable property
+        /// </summary>
+        public static readonly BindableProperty GetInformationsCommandProperty = BindableProperty.Create("GetInformationsCommand", typeof(ICommand), typeof(MusicTab), default(ICommand));
+
+        /// <summary>
+        /// Gets or sets GetInformationsCommand
+        /// </summary>
+        public ICommand GetInformationsCommand
+        {
+            get { return (ICommand)GetValue(GetInformationsCommandProperty); }
+            set { SetValue(GetInformationsCommandProperty, value); }
+        }
+
         /// <summary>
         /// A constructor
         /// Initializes the size of the items that are used in Music tab
@@ -74,12 +96,8 @@ namespace TVMediaHub.Tizen.Views
             InitializeFooter();
 
             ItemsSource.CollectionChanged += ItemsSourceCollectionChanged;
-
-            MusicTabViewModelLocator.ViewModel.TestRead();
-            // TODO : for the test
         }
 
-
         /// <summary>
         /// A method for initializing the size of the items that are used in Music tab
         /// </summary>
@@ -119,6 +137,11 @@ namespace TVMediaHub.Tizen.Views
         /// </summary>
         protected override void InitializePage()
         {
+            if (IsContentReady == false)
+            {
+                GetInformationsCommand?.Execute("");
+                IsContentReady = true;
+            }
         }
 
         /// <summary>
@@ -142,6 +165,7 @@ namespace TVMediaHub.Tizen.Views
         {
         }
 
+
         /// <summary>
         /// Occurs when an item is added, removed, changed, moved, or the entire list is refreshed.
         /// </summary>
@@ -149,7 +173,7 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">Information about the event</param>
         private void ItemsSourceCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            if (e.Action.ToString().Equals("Add"))
+            if (e.Action.ToString().Equals(NotifyCollectionChangedAction.Add.ToString()))
             {
                 if (MusicNoContents.IsVisible)
                 {
@@ -162,6 +186,15 @@ namespace TVMediaHub.Tizen.Views
                 groupView.BindingContext = groupItem;
                 MusicContentView.Children.Add(groupView);
             }
+            else if (e.Action.ToString().Equals(NotifyCollectionChangedAction.Reset.ToString()))
+            {
+                MusicContentView.Children.Clear();
+                if (!MusicNoContents.IsVisible)
+                {
+                    MusicTabScrollView.IsVisible = false;
+                    MusicNoContents.IsVisible = true;
+                }
+            }
 
         }
 
-- 
2.7.4


From 3f1e3ed495078979b6f09ec0a184d6950d0b2ae8 Mon Sep 17 00:00:00 2001
From: Hyerim Kim <rimi.kim@samsung.com>
Date: Thu, 8 Jun 2017 16:10:41 +0900
Subject: [PATCH 07/16] Modifies DeleteContentCommand in MediaHub

Change-Id: I7566087bd10f6b620654963a726c3c753b9b2887
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>
---
 TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs | 2 +-
 TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs | 2 +-
 TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs          | 5 +++--
 TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs          | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
index 90c384f..fff156c 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
@@ -461,7 +461,7 @@ namespace TVMediaHub.Tizen.ViewModels
 
             DeleteContentCommand = new Command<MediaInformationEx>((SelectedItem) =>
             {
-                if (!SelectedItem.Equals(""))
+                if (SelectedItem != null)
                 {
                     SelectedList.Clear();
                     SelectedList.Add(SelectedItem);
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs
index 372eb07..5b75e26 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs
@@ -251,7 +251,7 @@ namespace TVMediaHub.Tizen.ViewModels
             });
             DeleteContentCommand = new Command<MediaInformationEx>((SelectedItem) =>
             {
-                if (!SelectedItem.Equals(""))
+                if (SelectedItem != null)
                 {
                     SelectedList.Clear();
                     SelectedList.Add(SelectedItem);
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
index 8ae6b99..81b7d10 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
@@ -564,7 +564,7 @@ namespace TVMediaHub.Tizen.Views
 
             if (answer)
             {
-                DeleteContentCommand?.Execute("");
+                DeleteContentCommand?.Execute(null);
                 GetInformationsCommand?.Execute("");
             }
 
@@ -713,7 +713,8 @@ namespace TVMediaHub.Tizen.Views
                     bool answer = await DisplayAlert("Delete", "Delete '" + info.MediaContentInformation.Title + "'?", "Yes", "No");
                     if (answer)
                     {
-                        DeleteContentCommand?.Execute(item);
+                        DeleteContentCommand?.Execute(info);
+                        GetInformationsCommand?.Execute("");
                     }
 
                     break;
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs
index 86b10dd..9f27157 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs
@@ -560,7 +560,7 @@ namespace TVMediaHub.Tizen.Views
 
             if (answer)
             {
-                DeleteContentCommand?.Execute("");
+                DeleteContentCommand?.Execute(null);
                 GetInformationsCommand?.Execute("");
             }
 
@@ -702,7 +702,8 @@ namespace TVMediaHub.Tizen.Views
                     bool answer = await DisplayAlert("Delete", "Delete '" + info.MediaContentInformation.Title + "'?", "Yes", "No");
                     if (answer)
                     {
-                        DeleteContentCommand?.Execute(item);
+                        DeleteContentCommand?.Execute(info);
+                        GetInformationsCommand?.Execute("");
                     }
 
                     break;
-- 
2.7.4


From d0e482dd6aabc55b9fa77b161e28302de7b601ac Mon Sep 17 00:00:00 2001
From: "Geunsun, Lee" <gs86.lee@samsung.com>
Date: Wed, 7 Jun 2017 19:26:16 +0900
Subject: [PATCH 08/16] Implement the music player for the music tab

Change-Id: I89095aac77e014ae8ba0ad5a73c237468b7f18d3
---
 .../TVMediaHub.Tizen/Models/ContentProvider.cs     |   2 +
 TVMediaHub/TVMediaHub.Tizen/Models/MediaHubImpl.cs |   4 +
 .../TVMediaHub.Tizen/Models/MusicPlayerModel.cs    | 260 +++++++++++++++++++++
 .../TVMediaHub.Tizen/Models/MusicProvider.cs       |   1 -
 .../TVMediaHub.Tizen/TVMediaHub.Tizen.csproj       |  12 +
 .../TVMediaHub.Tizen/Utils/EasingFunction.cs       |  21 ++
 .../ViewModels/ImageTabViewModel.cs                |   5 +-
 .../ViewModels/MusicPlayerViewModel.cs             | 105 +++++++++
 .../ViewModels/MusicPlayerViewModelLocator.cs      |  40 ++++
 .../ViewModels/MusicTabViewModel.cs                |  26 ++-
 .../ViewModels/MusicTabViewModelLocator.cs         |   1 +
 .../ViewModels/VideoTabViewModelLocator.cs         |   1 +
 .../TVMediaHub.Tizen/Views/ImageItem.xaml.cs       |   1 +
 .../TVMediaHub.Tizen/Views/ImageViewer.xaml.cs     |   3 +-
 .../TVMediaHub.Tizen/Views/MusicGroup.xaml.cs      |   4 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml   |  20 +-
 .../TVMediaHub.Tizen/Views/MusicItem.xaml.cs       |   8 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml |  18 ++
 .../TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs     |  37 +++
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml    |   8 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs |   1 +
 21 files changed, 558 insertions(+), 20 deletions(-)
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModelLocator.cs
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs

diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
index 3d21b0b..3ffb646 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
@@ -162,6 +162,7 @@ namespace TVMediaHub.Tizen.Models
                         newGroupFlag = true;
                         newTitle = mediaInformationEx.MediaContentInformation.MediaType.ToString();
                     }
+
                     break;
                 case SortOption.Album:
                     if (lastGroupItem == null || lastGroupItem.Title != (mediaInformationEx.MediaContentInformation as AudioInformation).Album)
@@ -169,6 +170,7 @@ namespace TVMediaHub.Tizen.Models
                         newGroupFlag = true;
                         newTitle = (mediaInformationEx.MediaContentInformation as AudioInformation).Album.ToString();
                     }
+
                     break;
                 case SortOption.Artist:
                     if (lastGroupItem == null || lastGroupItem.Title != (mediaInformationEx.MediaContentInformation as AudioInformation).Artist)
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/MediaHubImpl.cs b/TVMediaHub/TVMediaHub.Tizen/Models/MediaHubImpl.cs
index 4e89dcc..4d4a51d 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/MediaHubImpl.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/MediaHubImpl.cs
@@ -26,6 +26,7 @@ namespace TVMediaHub.Tizen.Models
         /// An instance of the MediaHubImpl
         /// </summary>
         private static readonly MediaHubImpl instance = new MediaHubImpl();
+
         /// <summary>
         /// Gets an instance of the MediaHubImpl
         /// </summary>
@@ -56,6 +57,7 @@ namespace TVMediaHub.Tizen.Models
         /// An instance of the MusicProvider
         /// </summary>
         private static readonly MusicProvider musicProviderInstance = new MusicProvider();
+
         /// <summary>
         /// Gets an instance of the MusicProvider
         /// </summary>
@@ -71,6 +73,7 @@ namespace TVMediaHub.Tizen.Models
         /// An instance of the MusicProvider
         /// </summary>
         private static readonly VideoProvider videoProviderInstance = new VideoProvider();
+
         /// <summary>
         /// Gets an instance of the MusicProvider
         /// </summary>
@@ -86,6 +89,7 @@ namespace TVMediaHub.Tizen.Models
         /// An instance of the StorageProvider
         /// </summary>
         private static readonly StorageProvider storageProviderInstance = new StorageProvider();
+
         /// <summary>
         /// Gets an instance of the StorageProvider
         /// </summary>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs b/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs
new file mode 100644
index 0000000..74c1294
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs
@@ -0,0 +1,260 @@
+/*
+ * 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.Threading;
+using System.Threading.Tasks;
+using Tizen.Content.MediaContent;
+using Tizen.Multimedia;
+using TVMediaHub.Tizen.DataModels;
+using TVMediaHub.Tizen.Utils;
+
+namespace TVMediaHub.Tizen.Models
+{
+    /// <summary>
+    /// A custom EventArgs with string fields
+    /// </summary>
+    public class MusicPlayerInfoEventArgs : EventArgs
+    {
+        public string Title;
+        public string Artist;
+        public string AlbumCover;
+    }
+
+    /// <summary>
+    /// A custom EventArgs with double field
+    /// </summary>
+    public class MusicPlayerProgressEventArgs : EventArgs
+    {
+        public double Progress;
+    }
+
+    /// <summary>
+    /// An instance of the MusicPlayerModel
+    /// </summary>
+    public class MusicPlayerModel
+    {
+        /// <summary>
+        /// A main instance class of the music player model instance
+        /// </summary>
+        private static readonly MusicPlayerModel instance = new MusicPlayerModel();
+
+        /// <summary>
+        /// An instance of the player
+        /// </summary>
+        private Player playerInstance;
+
+        /// <summary>
+        /// An timer for the progressbar
+        /// </summary>
+        private Timer progressbarTimer;
+
+        /// <summary>
+        /// The period of the timer
+        /// </summary>
+        private int timerPeriod = 1000;
+
+        /// <summary>
+        /// An event handler for handling the current music information
+        /// </summary>
+        private EventHandler<MusicPlayerInfoEventArgs> MusicPlayerInfoListener;
+
+        /// <summary>
+        /// An event handler for handling the percentage of the progressbar
+        /// </summary>
+        private EventHandler<MusicPlayerProgressEventArgs> MusicPlayerProgressListener;
+
+        /// <summary>
+        /// The information of the current music
+        /// </summary>
+        public MediaInformationEx currentMusic;
+
+        /// <summary>
+        /// Gets or sets the current music
+        /// </summary>
+        public MediaInformationEx CurrentMusic
+        {
+            get
+            {
+                return currentMusic;
+            }
+
+            set
+            {
+                if (currentMusic != value)
+                {
+                    currentMusic = value;
+
+                    /// 1. Stop the player
+                    if (playerInstance.State == PlayerState.Playing)
+                    {
+                        StopPlayer();
+                    }
+
+                    /// 2. Play the current music
+                    StartPlayerAsync((currentMusic.MediaContentInformation as AudioInformation).FilePath);
+
+                    /// 3. Update the information of the current music
+                    MusicPlayerInfoListener?.Invoke(this, new MusicPlayerInfoEventArgs()
+                    {
+                        Title = (currentMusic.MediaContentInformation as AudioInformation).Title,
+                        Artist = (currentMusic.MediaContentInformation as AudioInformation).Artist,
+                        AlbumCover = ((currentMusic.MediaContentInformation as AudioInformation).ThumbnailPath.Length != 0) ? (currentMusic.MediaContentInformation as AudioInformation).ThumbnailPath : "img_media_no_contents.png",
+                    });
+
+                    /// 4. Update the progressbar of the current music
+                    MusicPlayerProgressListener?.Invoke(this, new MusicPlayerProgressEventArgs()
+                    {
+                        Progress = (playerInstance.State == PlayerState.Idle || playerInstance.State == PlayerState.Preparing) ? 0 : Convert.ToDouble(playerInstance.GetPlayPosition()) / (currentMusic.MediaContentInformation as AudioInformation).Duration,
+                    });
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets an instance of the music player model
+        /// </summary>
+        public static MusicPlayerModel Instance
+        {
+            get
+            {
+                return instance;
+            }
+        }
+
+        /// <summary>
+        /// A constructor
+        /// </summary>
+        public MusicPlayerModel()
+        {
+            InitializePlayer();
+            InitializeProgressbarTimer();
+        }
+
+        /// <summary>
+        /// Initialize the player instance
+        /// Register event handler for the player
+        /// </summary>
+        private void InitializePlayer()
+        {
+            playerInstance = new Player();
+
+            playerInstance.PlaybackCompleted += ((s, e) =>
+            {
+                StopPlayer();
+            });
+
+            playerInstance.PlaybackInterrupted += ((s, e) =>
+            {
+                DbgPort.E("Error : " + Enum.GetName(typeof(PlayerError), e.Reason));
+
+                StopPlayer();
+            });
+
+            playerInstance.ErrorOccurred += ((s, e) =>
+            {
+                DbgPort.E("Error : " + Enum.GetName(typeof(PlayerError), e.Error));
+
+                StopPlayer();
+            });
+        }
+
+        /// <summary>
+        /// Initialize the timer for the progressbar
+        /// </summary>
+        private void InitializeProgressbarTimer()
+        {
+            progressbarTimer = new Timer((object o) =>
+            {
+                MusicPlayerProgressListener?.Invoke(this, new MusicPlayerProgressEventArgs()
+                {
+                    Progress = (playerInstance.State == PlayerState.Idle || playerInstance.State == PlayerState.Preparing) ? 0 : Convert.ToDouble(playerInstance.GetPlayPosition()) / (currentMusic.MediaContentInformation as AudioInformation).Duration,
+                });
+            }, null, Timeout.Infinite, Timeout.Infinite);
+        }
+
+        /// <summary>
+        /// Starts the timer for the progressbar
+        /// </summary>
+        private void StartProgressbarTimer()
+        {
+            progressbarTimer.Change(0, timerPeriod);
+        }
+
+        /// <summary>
+        /// Stops the timer for the porgressbar
+        /// </summary>
+        private void StopProgressbarTimer()
+        {
+            progressbarTimer.Change(Timeout.Infinite, Timeout.Infinite);
+        }
+
+        /// <summary>
+        /// Plays the current music
+        /// </summary>
+        /// <param name="filePath">The file path of the media source</param>
+        public void StartPlayerAsync(string filePath)
+        {
+            MediaSource source = new MediaUriSource(filePath);
+            playerInstance.SetSource(source);
+
+            Task.Run(async () =>
+            {
+                await playerInstance.PrepareAsync();
+
+                playerInstance.Start();
+
+                StartProgressbarTimer();
+            });
+        }
+
+        /// <summary>
+        /// Stops the current music
+        /// </summary>
+        public void StopPlayer()
+        {
+            StopProgressbarTimer();
+
+            try
+            {
+                playerInstance.Stop();
+                playerInstance.Unprepare();
+            }
+            catch (Exception e)
+            {
+                DbgPort.E("Error : " + e.Message);
+            }
+        }
+
+        /// <summary>
+        /// A method adds EventHandler to SetCurrentMusicInfoListener
+        /// </summary>
+        /// <param name="listener">The EventHandler for adding</param>
+        public void SetCurrentMusicInfoListener(EventHandler<MusicPlayerInfoEventArgs> listener)
+        {
+            MusicPlayerInfoListener += listener;
+        }
+
+        /// <summary>
+        /// A method adds EventHandler to SetCurrentMusicProgressListener
+        /// </summary>
+        /// <param name="listener">The EventHandler for adding</param>
+        public void SetCurrentMusicProgressListener(EventHandler<MusicPlayerProgressEventArgs> listener)
+        {
+            MusicPlayerProgressListener += listener;
+        }
+    }
+}
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/MusicProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/MusicProvider.cs
index 381a321..95a5540 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/MusicProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/MusicProvider.cs
@@ -15,7 +15,6 @@
  */
 
 using System;
-using Tizen.Content.MediaContent;
 using TVMediaHub.Tizen.DataModels;
 
 namespace TVMediaHub.Tizen.Models
diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
index 6b66f2b..0666f86 100755
--- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
+++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Models\GroupItem.cs" />
     <Compile Include="Models\ImageProvider.cs" />
     <Compile Include="Models\MediaHubImpl.cs" />
+    <Compile Include="Models\MusicPlayerModel.cs" />
     <Compile Include="Models\MusicProvider.cs" />
     <Compile Include="Models\StorageProvider.cs" />
     <Compile Include="Models\MediaShortcutInfo.cs" />
@@ -85,7 +86,9 @@
     <Compile Include="ViewModels\ImageTabViewModel.cs" />
     <Compile Include="ViewModels\ImageTabViewModelLocator.cs" />
     <Compile Include="ViewModels\MediaHubMainPageViewModel.cs" />
+    <Compile Include="ViewModels\MusicPlayerViewModel.cs" />
     <Compile Include="ViewModels\MusicTabViewModel.cs" />
+    <Compile Include="ViewModels\MusicPlayerViewModelLocator.cs" />
     <Compile Include="ViewModels\MusicTabViewModelLocator.cs" />
     <Compile Include="ViewModels\VideoPlayerViewModel.cs" />
     <Compile Include="ViewModels\VideoTabViewModel.cs" />
@@ -136,6 +139,9 @@
     <Compile Include="Views\VideoItem.xaml.cs">
       <DependentUpon>VideoItem.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\MusicPlayer.xaml.cs">
+      <DependentUpon>MusicPlayer.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\VideoPlayer.xaml.cs">
       <DependentUpon>VideoPlayer.xaml</DependentUpon>
     </Compile>
@@ -323,6 +329,12 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\MusicPlayer.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
 		Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/TVMediaHub/TVMediaHub.Tizen/Utils/EasingFunction.cs b/TVMediaHub/TVMediaHub.Tizen/Utils/EasingFunction.cs
index b5afebc..c8cae1a 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Utils/EasingFunction.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Utils/EasingFunction.cs
@@ -62,6 +62,10 @@ namespace TVMediaHub.Tizen.Utils
         /// <summary>
         /// Calculate Cubic Bezier curves
         /// </summary>
+        /// <param name="a"></param>
+        /// <param name="x1"></param>
+        /// <param name="x2"></param>
+        /// <returns></returns>
         private static double CubicBezierTGet(double a, double x1, double x2)
         {
             int limit = 100;
@@ -89,9 +93,14 @@ namespace TVMediaHub.Tizen.Utils
 
             return guessT;
         }
+
         /// <summary>
         /// Calculate Cubic Bezier curves
         /// </summary>
+        /// <param name="t"></param>
+        /// <param name="a1"></param>
+        /// <param name="a2"></param>
+        /// <returns></returns>
         private static double CubicBezierSlopeGet(double t, double a1, double a2)
         {
             return 3.0 * CubicBezierA(a1, a2) * t * t + 2.0 * CubicBezierB(a1, a2) * t + CubicBezierC(a1);
@@ -100,6 +109,10 @@ namespace TVMediaHub.Tizen.Utils
         /// <summary>
         /// Calculate Cubic Bezier curves
         /// </summary>
+        /// <param name="t"></param>
+        /// <param name="a1"></param>
+        /// <param name="a2"></param>
+        /// <returns></returns>
         private static double CubicBezierCalc(double t, double a1, double a2)
         {
             return ((CubicBezierA(a1, a2) * t + CubicBezierB(a1, a2)) * t + CubicBezierC(a1)) * t;
@@ -108,6 +121,9 @@ namespace TVMediaHub.Tizen.Utils
         /// <summary>
         /// Calculate Cubic Bezier curves
         /// </summary>
+        /// <param name="a1"></param>
+        /// <param name="a2"></param>
+        /// <returns></returns>
         private static double CubicBezierA(double a1, double a2)
         {
             return 1.0 - 3.0 * a2 + 3.0 * a1;
@@ -116,6 +132,9 @@ namespace TVMediaHub.Tizen.Utils
         /// <summary>
         /// Calculate Cubic Bezier curves
         /// </summary>
+        /// <param name="a1"></param>
+        /// <param name="a2"></param>
+        /// <returns></returns>
         private static double CubicBezierB(double a1, double a2)
         {
             return 3.0 * a2 - 6.0 * a1;
@@ -124,6 +143,8 @@ namespace TVMediaHub.Tizen.Utils
         /// <summary>
         /// Calculate Cubic Bezier curves
         /// </summary>
+        /// <param name="a1"></param>
+        /// <returns></returns>
         private static double CubicBezierC(double a1)
         {
             return 3.0 * a1;
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
index fff156c..4e8371f 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
@@ -562,10 +562,11 @@ namespace TVMediaHub.Tizen.ViewModels
         /// A method for reading image contents through ImageProvider and updating ImageList
         /// </summary>
         /// <param name="option">A current sort option</param>
-        private async void ReadImageList(SortOption option, string storageId = null)
+        /// <param name="storageID">The given storage ID</param>
+        private async void ReadImageList(SortOption option, string storageID = null)
         {
             ImageList.Clear();
-            IEnumerable<GroupItem> tempList = await MediaHubImpl.GetInstance.ImageProviderInstance.ReadAsync(option, storageId);
+            IEnumerable<GroupItem> tempList = await MediaHubImpl.GetInstance.ImageProviderInstance.ReadAsync(option, storageID);
             foreach (var group in tempList)
             {
                 await MediaHubImpl.GetInstance.ImageProviderInstance.CheckThumbnail(group.Contents);
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs
new file mode 100644
index 0000000..b4d39d9
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs
@@ -0,0 +1,105 @@
+/*
+ * 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.ComponentModel;
+using TVMediaHub.Tizen.Models;
+
+namespace TVMediaHub.Tizen.ViewModels
+{
+    /// <summary>
+    /// A class for ViewModel of the music player
+    /// </summary>
+    public class MusicPlayerViewModel : INotifyPropertyChanged
+    {
+        /// <summary>
+        /// The percentage of the progressbar to be shown
+        /// </summary>
+        public double ProgressBarPercentage { get; private set; }
+
+        /// <summary>
+        /// The album title to be shown
+        /// </summary>
+        public string AlbumTitle { get; private set; }
+
+        /// <summary>
+        /// The artist to be shown
+        /// </summary>
+        public string AlbumArtist { get; private set; }
+
+        /// <summary>
+        /// The album cover to be shown
+        /// </summary>
+        public string AlbumCover { get; private set; }
+
+        /// <summary>
+        /// An event that is occurred when property of ViewModel is changed
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// A method for invoking PropertyChanged event
+        /// </summary>
+        /// <param name="name">The name of property</param>
+        public void OnPropertyChanged(string name)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null)
+            {
+                handler(this, new PropertyChangedEventArgs(name));
+            }
+        }
+
+        /// <summary>
+        /// A constructor
+        /// </summary>
+        public MusicPlayerViewModel()
+        {
+            ProgressBarPercentage = 0.0;
+            AlbumTitle = "Title";
+            AlbumArtist = "Artist";
+            AlbumCover = "img_media_no_contents.png";
+
+            MusicPlayerModel.Instance.SetCurrentMusicInfoListener((e, args) =>
+            {
+                if (args == null)
+                {
+                    return;
+                }
+
+                AlbumTitle = args.Title;
+                OnPropertyChanged("AlbumTitle");
+
+                AlbumArtist = args.Artist;
+                OnPropertyChanged("AlbumArtist");
+
+                AlbumCover = args.AlbumCover;
+                OnPropertyChanged("AlbumCover");
+            });
+
+            MusicPlayerModel.Instance.SetCurrentMusicProgressListener((e, arg) =>
+            {
+                if (arg == null)
+                {
+                    return;
+                }
+
+                ProgressBarPercentage = arg.Progress;
+
+                OnPropertyChanged("ProgressBarPercentage");
+            });
+        }
+    }
+}
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModelLocator.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModelLocator.cs
new file mode 100644
index 0000000..bc63141
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModelLocator.cs
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+namespace TVMediaHub.Tizen.ViewModels
+{
+    /// <summary>
+    /// A class to have static instance of MusicPlayerViewModel
+    /// </summary>
+    public static class MusicPlayerViewModelLocator
+    {
+        /// <summary>
+        /// An instance of the MusicPlayerViewModel
+        /// </summary>
+        private static MusicPlayerViewModel _viewModel = new MusicPlayerViewModel();
+
+        /// <summary>
+        /// Gets the instance of the MusicPlayerViewModel
+        /// </summary>
+        public static MusicPlayerViewModel ViewModel
+        {
+            get
+            {
+                return _viewModel;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
index f05af0c..29298a4 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
@@ -19,6 +19,7 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Threading;
 using System.Windows.Input;
+using TVMediaHub.Tizen.DataModels;
 using TVMediaHub.Tizen.Models;
 using TVMediaHub.Tizen.Utils;
 using Xamarin.Forms;
@@ -55,14 +56,22 @@ namespace TVMediaHub.Tizen.ViewModels
         /// </summary>
         public ICommand ChangeSortOptionCommand { get; set; }
 
-        private SortOption option = SortOption.Title;
-
         /// <summary>
         /// A command for executing to get informations
         /// </summary>
         public ICommand GetInformationsCommand { get; set; }
 
         /// <summary>
+        /// The information of the current music
+        /// </summary>
+        public MediaInformationEx CurrentMusic { get; set; }
+
+        /// <summary>
+        /// The sort option to display items of the music tab
+        /// </summary>
+        private SortOption option = SortOption.Title;
+
+        /// <summary>
         /// An event that is occurred when property of ViewModel is changed
         /// </summary>
         public event PropertyChangedEventHandler PropertyChanged;
@@ -127,6 +136,7 @@ namespace TVMediaHub.Tizen.ViewModels
                 "ARTIST",
                 "GENRE",
             };
+
             SortOptions = list;
             OnPropertyChanged("SortOptions");
 
@@ -135,6 +145,7 @@ namespace TVMediaHub.Tizen.ViewModels
                 "DETAIL INFO",
                 "DELETE"
             };
+
             OptionList = list;
             OnPropertyChanged("OptionList");
         }
@@ -175,7 +186,18 @@ namespace TVMediaHub.Tizen.ViewModels
                     ReadMusicList(option);
                 }, "");
             });
+
             OnPropertyChanged("ChangeSortOptionCommand");
         }
+
+        /// <summary>
+        /// Sets the current music
+        /// </summary>
+        /// <param name="musicContent">The given content to be set</param>
+        public void SetCurrentMusic(MediaInformationEx musicContent)
+        {
+            CurrentMusic = MusicPlayerModel.Instance.CurrentMusic = musicContent;
+            OnPropertyChanged("CurrentMusic");
+        }
     }
 }
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModelLocator.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModelLocator.cs
index 319961b..9bab807 100644
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModelLocator.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModelLocator.cs
@@ -25,6 +25,7 @@ namespace TVMediaHub.Tizen.ViewModels
         /// An instance of the MusicTabViewModel
         /// </summary>
         private static MusicTabViewModel _viewModel = new MusicTabViewModel();
+
         /// <summary>
         /// Gets the instance of the MusicTabViewModel
         /// </summary>
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModelLocator.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModelLocator.cs
index fab84cd..838702f 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModelLocator.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModelLocator.cs
@@ -25,6 +25,7 @@ namespace TVMediaHub.Tizen.ViewModels
         /// An instance of the VideoTabViewModel
         /// </summary>
         private static VideoTabViewModel _viewModel = null;
+
         /// <summary>
         /// Gets the instance of the VideoTabViewModel
         /// </summary>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs
index 08eb93e..6a9fa7a 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageItem.xaml.cs
@@ -470,6 +470,7 @@ namespace TVMediaHub.Tizen.Views
                     ContextPopupItemSelectedHandler?.Invoke(SelectedImage, ImageContextPopupItem.Delete);
                     break;
             }
+
             ctxPopup.Dismiss();
         }
 
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewer.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewer.xaml.cs
index b858412..f1ed435 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewer.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewer.xaml.cs
@@ -915,9 +915,10 @@ namespace TVMediaHub.Tizen.Views
             UngrabRemoteKeys();
         }
 
-        /// <summary>e
+        /// <summary>
         /// A method for hiding control area when timer is over
         /// </summary>
+        /// <param name="state">The state to be changed</param>
         private void HideControlAreaHandler(object state)
         {
             SetControlAreaState(ControlAreaState.HIDE);
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
index 6aab07b..34a465f 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
@@ -81,10 +81,10 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A propertyChanged event argument</param>
         private void MusicGroupPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if(e.PropertyName.Equals("ItemsSource"))
+            if (e.PropertyName.Equals("ItemsSource"))
             {
                 var index = 0;
-                foreach(var item in ItemsSource)
+                foreach (var item in ItemsSource)
                 {
                     var itemView = new MusicItem();
                     itemView.BindingContext = item;
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
index 9404527..c74e79f 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
@@ -5,11 +5,6 @@
                 xmlns:Utils="clr-namespace:TVMediaHub.Tizen.Utils"
                 xmlns:Views="clr-namespace:TVMediaHub.Tizen.Views"
                 MusicInfo="{Binding Information}">
-    <Button x:Name="FocusArea"
-            Opacity="0"
-            Clicked="OnItemClicked"
-            Focused="OnItemFocused"
-            Unfocused="OnItemUnfocused"/>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="3*" />
@@ -19,13 +14,11 @@
         <Image x:Name="AlbumCover"
                Grid.Row="0"
                Grid.RowSpan="3"
-               Grid.Column="0"
-               Source="{Binding ThumbnailPath}"/>
+               Grid.Column="0"/>
         <Label x:Name="SongTitle"
                Grid.Row="0"
                Grid.Column="1"
-               LineBreakMode="TailTruncation"
-               Text="{Binding ContentName}"/>
+               LineBreakMode="TailTruncation"/>
         <Label x:Name="Artist"
                Grid.Row="1"
                Grid.Column="1"
@@ -35,4 +28,13 @@
                Grid.Column="1"
                LineBreakMode="TailTruncation"/>
     </Grid>
+    <Button x:Name="FocusArea"
+            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
+            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
+            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0}"
+            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0}"
+            Opacity="0"
+            Clicked="OnItemClicked"
+            Focused="OnItemFocused"
+            Unfocused="OnItemUnfocused"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
index 840f471..0285c9e 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
@@ -19,6 +19,7 @@ using System.ComponentModel;
 using Tizen.Content.MediaContent;
 using TVMediaHub.Tizen.DataModels;
 using TVMediaHub.Tizen.Utils;
+using TVMediaHub.Tizen.ViewModels;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
@@ -87,7 +88,9 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A Focus event's argument</param>
         private void OnItemClicked(object sender, EventArgs e)
         {
+            DbgPort.D("MusicItem is clicked : " + (MusicInfo.MediaContentInformation as AudioInformation).Title);
 
+            MusicTabViewModelLocator.ViewModel.SetCurrentMusic(MusicInfo);
         }
 
         /// <summary>
@@ -97,7 +100,7 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A Focus event's argument</param>
         private void OnItemFocused(object sender, FocusEventArgs e)
         {
-
+            DbgPort.D("MusicItem is focused : " + (MusicInfo.MediaContentInformation as AudioInformation).Title);
         }
 
         /// <summary>
@@ -107,7 +110,7 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A Focus event's argument</param>
         private void OnItemUnfocused(object sender, FocusEventArgs e)
         {
-
+            DbgPort.D("MusicItem is unfocused : " + (MusicInfo.MediaContentInformation as AudioInformation).Title);
         }
 
         /// <summary>
@@ -120,6 +123,7 @@ namespace TVMediaHub.Tizen.Views
             if (e.PropertyName.Equals("MusicInfo"))
             {
                 AudioInformation info = MusicInfo.MediaContentInformation as AudioInformation;
+                AlbumCover.Source = (info.ThumbnailPath.Length != 0) ? info.ThumbnailPath : "img_media_no_contents.png";
                 SongTitle.Text = info.Title;
                 Artist.Text = info.Artist;
                 AlbumTitle.Text = info.Album;
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml
new file mode 100644
index 0000000..3667788
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<StackLayout xmlns="http://xamarin.com/schemas/2014/forms"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                  x:Class="TVMediaHub.Tizen.Views.MusicPlayer">
+    <Image x:Name="MusicPlayerAlbumArt"
+           Source="{Binding AlbumCover}"
+           WidthRequest="300"
+           HeightRequest="300"
+           HorizontalOptions="Center"/>
+    <Label x:Name="MusicPlayerTitle"
+           Text="{Binding AlbumTitle}"
+           HorizontalOptions="Center"/>
+    <Label x:Name="MusicPlayerArtist"
+           Text="{Binding AlbumArtist}"
+           HorizontalOptions="Center"/>
+    <ProgressBar x:Name="MusicPlayerProgressbar"
+                 Progress="{Binding ProgressBarPercentage}"/>
+</StackLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs
new file mode 100644
index 0000000..008a402
--- /dev/null
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs
@@ -0,0 +1,37 @@
+/*
+* 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 TVMediaHub.Tizen.ViewModels;
+using Xamarin.Forms;
+
+namespace TVMediaHub.Tizen.Views
+{
+    /// <summary>
+    /// A custom ContentPage for displaying the music player
+    /// </summary>
+    public partial class MusicPlayer : StackLayout
+    {
+        /// <summary>
+        /// A constructor
+        /// </summary>
+        public MusicPlayer()
+        {
+            BindingContext = MusicPlayerViewModelLocator.ViewModel;
+
+            InitializeComponent();
+        }
+    }
+}
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
index 78f5d61..7a13d16 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
@@ -26,9 +26,15 @@
                                       SortOptions="{Binding SortOptions}"
                                       OptionList="{Binding OptionList}"/>
         </RelativeLayout>
+        <Views:MusicPlayer x:Name="MusicPlayer"
+                           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.855}"
+                           RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.3}"
+                           RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.0}">
+        </Views:MusicPlayer>
         <ScrollView x:Name="MusicTabScrollView"
                     RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.855}"
-                    RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
+                    RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.7}"
+                    RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.3}"
                     Orientation="Horizontal" IsVisible="False">
             <StackLayout x:Name="MusicContentView"
                          Orientation="Horizontal"
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
index 69ff533..918b62e 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
@@ -180,6 +180,7 @@ namespace TVMediaHub.Tizen.Views
                     MusicNoContents.IsVisible = false;
                     MusicTabScrollView.IsVisible = true;
                 }
+
                 MusicGroup groupView = new MusicGroup();
 
                 var groupItem = e.NewItems[0];
-- 
2.7.4


From 0e01209d12a66451f7c673148b451b96032d6170 Mon Sep 17 00:00:00 2001
From: "Geunsun, Lee" <gs86.lee@samsung.com>
Date: Wed, 14 Jun 2017 17:24:33 +0900
Subject: [PATCH 09/16] Sets the navigation buttons to be dimmed

The indicator of the selected direction is dimmed when the zoom is moved
to the upper/lower - left/right corner of the screen.

Change-Id: Id4817ef4e9cd07acca89b57b0c722d0bf947d1cb
---
 .../Controls/MediaHubButton.xaml.cs                |  2 +-
 ...{CustomImageButton.xaml => ZoomNaviButton.xaml} |  2 +-
 ...mImageButton.xaml.cs => ZoomNaviButton.xaml.cs} | 59 +++++++------
 ...mImageRenderer.cs => ZoomNaviButtonRenderer.cs} |  8 +-
 .../TVMediaHub.Tizen/Views/ImageViewerZoom.xaml    | 60 +++++++------
 .../TVMediaHub.Tizen/Views/ImageViewerZoom.xaml.cs | 97 ++++++++++++++++------
 6 files changed, 133 insertions(+), 95 deletions(-)
 rename TVMediaHub/TVMediaHub.Tizen/Controls/{CustomImageButton.xaml => ZoomNaviButton.xaml} (68%)
 mode change 100755 => 100644
 rename TVMediaHub/TVMediaHub.Tizen/Controls/{CustomImageButton.xaml.cs => ZoomNaviButton.xaml.cs} (69%)
 mode change 100755 => 100644
 rename TVMediaHub/TVMediaHub.Tizen/Controls/{CustomImageRenderer.cs => ZoomNaviButtonRenderer.cs} (91%)
 mode change 100755 => 100644

diff --git a/TVMediaHub/TVMediaHub.Tizen/Controls/MediaHubButton.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Controls/MediaHubButton.xaml.cs
index 165ccd8..89a265e 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Controls/MediaHubButton.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Controls/MediaHubButton.xaml.cs
@@ -15,7 +15,6 @@
  */
 
 using System;
-using TVMediaHub.Tizen.Utils;
 using Xamarin.Forms;
 
 namespace TVMediaHub.Tizen.Controls
@@ -29,6 +28,7 @@ namespace TVMediaHub.Tizen.Controls
         /// An Event Handler to notify if the button is clicked
         /// </summary>
         public event EventHandler Clicked;
+
         /// <summary>
         /// A value of effect duration
         /// </summary>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Controls/CustomImageButton.xaml b/TVMediaHub/TVMediaHub.Tizen/Controls/ZoomNaviButton.xaml
old mode 100755
new mode 100644
similarity index 68%
rename from TVMediaHub/TVMediaHub.Tizen/Controls/CustomImageButton.xaml
rename to TVMediaHub/TVMediaHub.Tizen/Controls/ZoomNaviButton.xaml
index bf9f5b4..d028754
--- a/TVMediaHub/TVMediaHub.Tizen/Controls/CustomImageButton.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Controls/ZoomNaviButton.xaml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Image xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="TVMediaHub.Tizen.Controls.CustomImageButton" >
+             x:Class="TVMediaHub.Tizen.Controls.ZoomNaviButton" >
 </Image>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Controls/CustomImageButton.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Controls/ZoomNaviButton.xaml.cs
old mode 100755
new mode 100644
similarity index 69%
rename from TVMediaHub/TVMediaHub.Tizen/Controls/CustomImageButton.xaml.cs
rename to TVMediaHub/TVMediaHub.Tizen/Controls/ZoomNaviButton.xaml.cs
index 6dac256..de2b4e6
--- a/TVMediaHub/TVMediaHub.Tizen/Controls/CustomImageButton.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Controls/ZoomNaviButton.xaml.cs
@@ -23,30 +23,42 @@ namespace TVMediaHub.Tizen.Controls
     /// <summary>
     /// A custom image for displaying the buttons of image viewer
     /// </summary>
-    public partial class CustomImageButton : Image
+    public partial class ZoomNaviButton : Image
     {
+        /// <summary>
+        /// An event handler to notify if the button is up
+        /// </summary>
         public event EventHandler<string> OnButtonUp;
+
+        /// <summary>
+        /// An event handler to notify if the button is down
+        /// </summary>
         public event EventHandler<string> OnButtonDown;
+
+        /// <summary>
+        /// An event handler to notify if the button is clicked
+        /// </summary>
         public event EventHandler Clicked;
 
-        private string imgViewerPrefix = "btn_viewer_control_";
+        /// <summary>
+        /// A prefix of the navigation button image
+        /// </summary>
         private string imgZoomPrefix = "ic_zoom_arrow_";
+
+        /// <summary>
+        /// A postfix of the navigation button image on normal status
+        /// </summary>
         private string imgNormalPostFix = "_normal.png";
-        private string imgPressedPostFix = "_pressed.png";
 
         /// <summary>
-        /// Gets or sets the button type
+        /// A postfix of the navigation button image on pressed status
         /// </summary>
-        public string Type
-        {
-            get;
-            set;
-        }
+        private string imgPressedPostFix = "_pressed.png";
 
         /// <summary>
-        /// Gets or sets the button subtype
+        /// Gets or sets the button type
         /// </summary>
-        public string SubType
+        public string Type
         {
             get;
             set;
@@ -66,17 +78,9 @@ namespace TVMediaHub.Tizen.Controls
         /// </summary>
         public void OnButtonPressed()
         {
-            if (Type.Equals("Viewer"))
-            {
-                Source = imgViewerPrefix + SubType.ToLower() + imgPressedPostFix;
-            }
+            Source = imgZoomPrefix + Type.ToLower() + imgPressedPostFix;
 
-            if (Type.Equals("Zoom"))
-            {
-                Source = imgZoomPrefix + SubType.ToLower() + imgPressedPostFix;
-            }
-
-            OnButtonDown?.Invoke(this, SubType);
+            OnButtonDown?.Invoke(this, Type);
         }
 
         /// <summary>
@@ -84,23 +88,16 @@ namespace TVMediaHub.Tizen.Controls
         /// </summary>
         public void OnButtonReleased()
         {
-            if (Type.Equals("Viewer"))
-            {
-                Source = imgViewerPrefix + SubType.ToLower() + imgNormalPostFix;
-            }
-            else if (Type.Equals("Zoom"))
-            {
-                Source = imgZoomPrefix + SubType.ToLower() + imgNormalPostFix;
-            }
+            Source = imgZoomPrefix + Type.ToLower() + imgNormalPostFix;
 
-            OnButtonUp?.Invoke(this, SubType);
+            OnButtonUp?.Invoke(this, Type);
         }
 
         /// <summary>
         /// A constructor
         /// Implements the TapGestureCommand
         /// </summary>
-        public CustomImageButton()
+        public ZoomNaviButton()
         {
             InitializeComponent();
 
diff --git a/TVMediaHub/TVMediaHub.Tizen/Controls/CustomImageRenderer.cs b/TVMediaHub/TVMediaHub.Tizen/Controls/ZoomNaviButtonRenderer.cs
old mode 100755
new mode 100644
similarity index 91%
rename from TVMediaHub/TVMediaHub.Tizen/Controls/CustomImageRenderer.cs
rename to TVMediaHub/TVMediaHub.Tizen/Controls/ZoomNaviButtonRenderer.cs
index 04baadf..b427570
--- a/TVMediaHub/TVMediaHub.Tizen/Controls/CustomImageRenderer.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Controls/ZoomNaviButtonRenderer.cs
@@ -17,18 +17,18 @@
 using Xamarin.Forms.Platform.Tizen;
 using TVMediaHub.Tizen.Controls;
 
-[assembly: ExportRenderer(typeof(CustomImageButton), typeof(CustomImageRenderer))]
+[assembly: ExportRenderer(typeof(ZoomNaviButton), typeof(ZoomNaviButtonRenderer))]
 namespace TVMediaHub.Tizen.Controls
 {
     /// <summary>
     /// A custom renderer for making custom image button.
     /// </summary>
-    public class CustomImageRenderer : ImageRenderer
+    public class ZoomNaviButtonRenderer : ImageRenderer
     {
         private ElmSharp.GestureLayer GestureRecognizer;
 
         /// <summary>
-        /// Creates GestureRecognizer and sets callbacks for tap and longtap event when Element is changed.
+        /// Creates GestureRecognizer and sets callbacks for tap and long tap event when Element is changed.
         /// </summary>
         /// <param name="args">An image element property changed event's argument</param>
         protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.Image> args)
@@ -46,7 +46,7 @@ namespace TVMediaHub.Tizen.Controls
                 GestureRecognizer.Attach(Control);
             }
 
-            CustomImageButton BtnElement = Element as CustomImageButton;
+            ZoomNaviButton BtnElement = Element as ZoomNaviButton;
             if (BtnElement == null)
             {
                 return;
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewerZoom.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewerZoom.xaml
index df2c981..077d397 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewerZoom.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewerZoom.xaml
@@ -31,38 +31,34 @@
                         RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
                         RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0}"
                         RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0}" >
-            <Controls:CustomImageButton x:Name="UpButton"
-                                        Type="Zoom"
-                                        SubType="Up"
-                                        RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.077778}"
-                                        RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.04375}"
-                                        RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.037037}"
-                                        RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.478125}"
-                                        Source="ic_zoom_arrow_up_normal.png" />
-            <Controls:CustomImageButton x:Name="DownButton"
-                                        Type="Zoom"
-                                        SubType="Down"
-                                        RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.077778}"
-                                        RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.04375}"
-                                        RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.885185}"
-                                        RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.478125}"
-                                        Source="ic_zoom_arrow_down_normal.png" />
-            <Controls:CustomImageButton x:Name="LeftButton"
-                                        Type="Zoom"
-                                        SubType="Left"
-                                        RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.077778}"
-                                        RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.04375}"
-                                        RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.461111}"
-                                        RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.02083}"
-                                        Source="ic_zoom_arrow_left_normal.png" />
-            <Controls:CustomImageButton x:Name="RightButton"
-                                        Type="Zoom"
-                                        SubType="Right"
-                                        RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.077778}"
-                                        RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.04375}"
-                                        RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.461111}"
-                                        RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.9354167}"
-                                        Source="ic_zoom_arrow_right_normal.png" />
+            <Controls:ZoomNaviButton x:Name="UpButton"
+                                     Type="Up"
+                                     RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.077778}"
+                                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.04375}"
+                                     RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.037037}"
+                                     RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.478125}"
+                                     Source="ic_zoom_arrow_up_normal.png" />
+            <Controls:ZoomNaviButton x:Name="DownButton"
+                                     Type="Down"
+                                     RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.077778}"
+                                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.04375}"
+                                     RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.885185}"
+                                     RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.478125}"
+                                     Source="ic_zoom_arrow_down_normal.png" />
+            <Controls:ZoomNaviButton x:Name="LeftButton"
+                                     Type="Left"
+                                     RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.077778}"
+                                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.04375}"
+                                     RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.461111}"
+                                     RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.02083}"
+                                     Source="ic_zoom_arrow_left_normal.png" />
+            <Controls:ZoomNaviButton x:Name="RightButton"
+                                     Type="Right"
+                                     RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.077778}"
+                                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.04375}"
+                                     RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.461111}"
+                                     RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.9354167}"
+                                     Source="ic_zoom_arrow_right_normal.png" />
             <Grid x:Name="BackKeyInfo"
                   RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Height, Factor=0.037037}"
                   RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ZoomGrid, Property=Width, Factor=0.059375}"
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewerZoom.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewerZoom.xaml.cs
index 2bf8049..6d068b7 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewerZoom.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageViewerZoom.xaml.cs
@@ -51,32 +51,32 @@ namespace TVMediaHub.Tizen.Views
         private ElmSharp.ImageOrientation imgOrientation = ElmSharp.ImageOrientation.None;
 
         /// <summary>
-        /// The background thumbnail for the minimap
+        /// The background thumbnail for the mini map
         /// </summary>
         private ElmSharp.Rectangle backgroundThumbnail;
 
         /// <summary>
-        /// The thumbnail image for the minimap
+        /// The thumbnail image for the mini map
         /// </summary>
         private ElmSharp.Image thumbnailImg;
 
         /// <summary>
-        /// The dim image for the minimap
+        /// The dim image for the mini map
         /// </summary>
         private ElmSharp.Image thumbnailDim;
 
         /// <summary>
-        /// The clipping image for the minimap
+        /// The clipping image for the mini map
         /// </summary>
         private ElmSharp.Image clippingImg;
 
         /// <summary>
-        /// The clipper for the minimap
+        /// The clipper for the mini map
         /// </summary>
         private ElmSharp.Rectangle clipper;
 
         /// <summary>
-        /// The clipper border image for the minimap
+        /// The clipper border image for the mini map
         /// </summary>
         private ElmSharp.Image clipperBorder;
 
@@ -139,14 +139,14 @@ namespace TVMediaHub.Tizen.Views
         /// </summary>
         protected override void InitializePage()
         {
-            /// Grabs the hw keys to move the given image
+            /// Grabs the hardware keys to move the given image
             GrabMoveKeys();
         }
 
         /// <summary>
         /// A method for finalizing page when the page is disappeared
         /// Ungrabs move keys of the remote controller
-        /// Releases resources of the minimap
+        /// Releases resources of the mini map
         /// </summary>
         protected override void FinalizePage()
         {
@@ -204,7 +204,7 @@ namespace TVMediaHub.Tizen.Views
         }
 
         /// <summary>
-        /// Ungrab move keys of the remote controller
+        /// Ungrabs move keys of the remote controller
         /// </summary>
         private void UngrabMoveKeys()
         {
@@ -233,7 +233,7 @@ namespace TVMediaHub.Tizen.Views
 
             int direction = MoveDirection.FindIndex(x => x.Equals(e.KeyName));
             object[] buttons = new object[4] { UpButton, DownButton, LeftButton, RightButton };
-            (buttons[direction] as CustomImageButton).OnButtonReleased();
+            (buttons[direction] as ZoomNaviButton).OnButtonReleased();
         }
 
         /// <summary>
@@ -250,15 +250,44 @@ namespace TVMediaHub.Tizen.Views
                 return;
             }
 
-            MoveCurrentImage(e.KeyName);
-
             int direction = MoveDirection.FindIndex(x => x.Equals(e.KeyName));
             object[] buttons = new object[4] { UpButton, DownButton, LeftButton, RightButton };
-            (buttons[direction] as CustomImageButton).OnButtonPressed();
+            (buttons[direction] as ZoomNaviButton).OnButtonPressed();
+        }
+
+        /// <summary>
+        /// Sets the navigation buttons to be normal
+        /// </summary>
+        private void SetNaviButtonNormal()
+        {
+            if (clipper == null)
+            {
+                return;
+            }
+
+            if (clipper.Geometry.Y != thumbnailDim.Geometry.Y)
+            {
+                UpButton.Opacity = 1.0;
+            }
+
+            if ((clipper.Geometry.Y + clipper.Geometry.Height) != (thumbnailDim.Geometry.Y + thumbnailDim.Geometry.Height))
+            {
+                DownButton.Opacity = 1.0;
+            }
+
+            if (clipper.Geometry.X != thumbnailDim.Geometry.X)
+            {
+                LeftButton.Opacity = 1.0;
+            }
+
+            if ((clipper.Geometry.X + clipper.Geometry.Width) != (thumbnailDim.Geometry.X + thumbnailDim.Geometry.Width))
+            {
+                RightButton.Opacity = 1.0;
+            }
         }
 
         /// <summary>
-        /// Moves the current image and the clipper of the minimap
+        /// Moves the current image and the clipper of the mini map
         /// </summary>
         /// <param name="direction">The direction to move</param>
         private void MoveCurrentImage(string direction)
@@ -273,16 +302,20 @@ namespace TVMediaHub.Tizen.Views
                     clipper.Move(clipper.Geometry.X, thumbnailDim.Geometry.Y);
                     CurrentImage.TranslateTo(CurrentImage.TranslationX, CurrentImage.Y, Convert.ToUInt32(moveDuration), Easing.CubicOut);
 
+                    UpButton.Opacity = 0.2;
+
                     return;
                 }
 
-                ElmSharp.EcoreAnimator.AddAmimator(delegate()
+                ElmSharp.EcoreAnimator.AddAmimator(delegate ()
                 {
-                    clipper.Move(clipper.Geometry.X, clipper.Geometry.Y - 1);
+                    clipper.Move(clipper.Geometry.X, clipper.Geometry.Y - 2);
                     if (clipper.Geometry.Y <= toY)
                     {
                         clipper.Move(clipper.Geometry.X, toY);
 
+                        SetNaviButtonNormal();
+
                         return false;
                     }
 
@@ -300,16 +333,20 @@ namespace TVMediaHub.Tizen.Views
                     clipper.Move(clipper.Geometry.X, (thumbnailDim.Geometry.Y + thumbnailDim.Geometry.Height) - clipper.Geometry.Height);
                     CurrentImage.TranslateTo(CurrentImage.TranslationX, -(CurrentImage.Height - App.MainWindow.Geometry.Height), Convert.ToUInt32(moveDuration), Easing.CubicOut);
 
+                    DownButton.Opacity = 0.2;
+
                     return;
                 }
 
-                ElmSharp.EcoreAnimator.AddAmimator(delegate()
+                ElmSharp.EcoreAnimator.AddAmimator(delegate ()
                 {
-                    clipper.Move(clipper.Geometry.X, clipper.Geometry.Y + 1);
+                    clipper.Move(clipper.Geometry.X, clipper.Geometry.Y + 2);
                     if (clipper.Geometry.Y >= toY)
                     {
                         clipper.Move(clipper.Geometry.X, toY);
 
+                        SetNaviButtonNormal();
+
                         return false;
                     }
 
@@ -327,16 +364,20 @@ namespace TVMediaHub.Tizen.Views
                     clipper.Move(thumbnailDim.Geometry.X, clipper.Geometry.Y);
                     CurrentImage.TranslateTo(CurrentImage.X, CurrentImage.TranslationY, Convert.ToUInt32(moveDuration), Easing.CubicOut);
 
+                    LeftButton.Opacity = 0.2;
+
                     return;
                 }
 
-                ElmSharp.EcoreAnimator.AddAmimator(delegate()
+                ElmSharp.EcoreAnimator.AddAmimator(delegate ()
                 {
-                    clipper.Move(clipper.Geometry.X - 1, clipper.Geometry.Y);
+                    clipper.Move(clipper.Geometry.X - 2, clipper.Geometry.Y);
                     if (clipper.Geometry.X <= toX)
                     {
                         clipper.Move(toX, clipper.Geometry.Y);
 
+                        SetNaviButtonNormal();
+
                         return false;
                     }
 
@@ -353,16 +394,20 @@ namespace TVMediaHub.Tizen.Views
                     clipper.Move((thumbnailDim.Geometry.X + thumbnailDim.Geometry.Width) - clipper.Geometry.Width, clipper.Geometry.Y);
                     CurrentImage.TranslateTo(-(CurrentImage.Width - App.MainWindow.Geometry.Width), CurrentImage.TranslationY, Convert.ToUInt32(moveDuration), Easing.CubicOut);
 
+                    RightButton.Opacity = 0.2;
+
                     return;
                 }
 
-                ElmSharp.EcoreAnimator.AddAmimator(delegate()
+                ElmSharp.EcoreAnimator.AddAmimator(delegate ()
                 {
-                    clipper.Move(clipper.Geometry.X + 1, clipper.Geometry.Y);
+                    clipper.Move(clipper.Geometry.X + 2, clipper.Geometry.Y);
                     if (clipper.Geometry.X >= toX)
                     {
                         clipper.Move(toX, clipper.Geometry.Y);
 
+                        SetNaviButtonNormal();
+
                         return false;
                     }
 
@@ -397,7 +442,7 @@ namespace TVMediaHub.Tizen.Views
         }
 
         /// <summary>
-        /// Creates the minimap
+        /// Creates the mini map
         /// </summary>
         private void CreateMiniMap()
         {
@@ -415,7 +460,7 @@ namespace TVMediaHub.Tizen.Views
                 Constraint.Constant(640), /// Width
                 Constraint.Constant(430)); /// Height
 
-            /// create the shadow of the mini map
+            /// Create the shadow of the mini map
             var backgroundShadow = new NinePatch
             {
                 Source = "img_zoom_minimap_shadow.9.png",
@@ -501,9 +546,9 @@ namespace TVMediaHub.Tizen.Views
             object[] buttons = new object[4] { UpButton, DownButton, LeftButton, RightButton };
             foreach (object button in buttons)
             {
-                (button as CustomImageButton).OnButtonDown += (s, e) =>
+                (button as ZoomNaviButton).OnButtonDown += (s, e) =>
                 {
-                    DbgPort.D("'" + e + "' is pressed");
+                    DbgPort.D("[" + e + "] is pressed");
 
                     MoveCurrentImage(e as string);
                 };
-- 
2.7.4


From 0b0da7e09c61388016533a210698ff297293ea7c Mon Sep 17 00:00:00 2001
From: Hyerim Kim <rimi.kim@samsung.com>
Date: Wed, 14 Jun 2017 17:24:57 +0900
Subject: [PATCH 10/16] Implements the method for showing toast popup source is
 removed

Change-Id: Iff30201064801f39a2244402153ff97b6b421471
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>
---
 .../TVMediaHub.Tizen/Models/ContentProvider.cs     |  1 -
 .../TVMediaHub.Tizen/Models/ImageProvider.cs       |  1 -
 .../TVMediaHub.Tizen/Models/StorageProvider.cs     | 72 +++++++++++++++++++--
 .../ViewModels/ImageTabViewModel.cs                | 21 +++---
 .../ViewModels/MediaHubMainPageViewModel.cs        | 74 +++-------------------
 .../ViewModels/VideoTabViewModel.cs                | 22 ++++---
 .../TVMediaHub.Tizen/Views/MediaHubMainPage.xaml   |  3 +-
 .../Views/MediaHubMainPage.xaml.cs                 | 39 +++++++++++-
 8 files changed, 137 insertions(+), 96 deletions(-)

diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
index 3ffb646..264090d 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/ContentProvider.cs
@@ -17,7 +17,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Tizen;
 using Tizen.Content.MediaContent;
 using TVMediaHub.Tizen.Utils;
 using TVMediaHub.Tizen.DataModels;
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs
index 1db692b..ea3aa87 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/ImageProvider.cs
@@ -16,7 +16,6 @@
 
 using System;
 using System.IO;
-using Tizen.Content.MediaContent;
 using TVMediaHub.Tizen.Utils;
 using TVMediaHub.Tizen.DataModels;
 
diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/StorageProvider.cs b/TVMediaHub/TVMediaHub.Tizen/Models/StorageProvider.cs
index 39a80d1..6dbc012 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Models/StorageProvider.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/StorageProvider.cs
@@ -14,12 +14,22 @@
  * limitations under the License.
  */
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using Tizen.Content.MediaContent;
 
 namespace TVMediaHub.Tizen.Models
 {
     /// <summary>
+    /// A custom EventArgs with string fields
+    /// </summary>
+    public class StorageInfoEventArgs : EventArgs
+    {
+        public string storageName;
+    }
+
+    /// <summary>
     /// A StorageProvider for the media hub
     /// </summary>
     public class StorageProvider
@@ -30,32 +40,82 @@ namespace TVMediaHub.Tizen.Models
         private IEnumerable<Storage> storageList = new List<Storage>();
 
         /// <summary>
-        /// A list of storage id
+        /// A dictionary list of storage name and storage id
+        /// Keeps the values when the media hub application is terminated.
+        /// </summary>
+        private Dictionary<string, string> storageTable = new Dictionary<string, string>();
+        private static int index = 1;
+
+        /// <summary>
+        /// A dictionary list of storage name and storage id
         /// </summary>
-        public List<string> StorageId { get; protected set; }
+        public Dictionary<string, string> StoragePairList { get; protected set; }
+
+        /// <summary>
+        /// An EventHandler that is occured when source is removed
+        /// </summary>
+        public EventHandler SourceRemovedEvent;
 
         /// <summary>
         /// A constructor
         /// </summary>
         public StorageProvider()
         {
-            StorageId = new List<string>();
+            StoragePairList = new Dictionary<string, string>();
             CheckStorage();
         }
 
         /// <summary>
         /// Returns the list of the storage id of the media storage.
         /// </summary>
-        /// <returns>Task with the list of the ContentCollection</returns>
         public void CheckStorage()
         {
-            StorageId.Clear();
             storageList = ContentManager.Database.SelectAll<Storage>(null);
+            if (storageList.Count() < storageTable.Count)
+            {
+                CheckRemoveStorage();
+            }
 
+            StoragePairList.Clear();
             foreach (var item in storageList)
             {
-                StorageId.Add(item.Id);
+                if (!storageTable.ContainsKey(item.Id))
+                {
+                    storageTable.Add(item.Id, "USB " + index++);
+                }
+
+                StoragePairList.Add(item.Id, storageTable[item.Id]);
             }
+
+            StoragePairList = StoragePairList.OrderBy(x => x.Value).ToDictionary(x => x.Key, x => x.Value);
+        }
+
+        /// <summary>
+        /// Checks the removed storage name and invokes the SourceRemoveedEvent with storage name.
+        /// </summary>
+        private void CheckRemoveStorage()
+        {
+            foreach (var item in storageTable)
+            {
+                Storage storage = ContentManager.Database.Select<Storage>(item.Key);
+
+                if (storage == null)
+                {
+                    StorageInfoEventArgs args = new StorageInfoEventArgs();
+                    args.storageName = item.Value;
+
+                    SourceRemovedEvent?.Invoke(this, args);
+                }
+            }
+        }
+
+        /// <summary>
+        /// A method for handling SourceRemoveEvent
+        /// </summary>
+        /// <param name="listener">A handling method</param>
+        public void SetSourceRemoveEventListener(EventHandler listener)
+        {
+            this.SourceRemovedEvent += listener;
         }
     }
 }
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
index 4e8371f..29869fe 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
@@ -57,6 +57,11 @@ namespace TVMediaHub.Tizen.ViewModels
         private SortOption option = SortOption.Date;
 
         /// <summary>
+        /// A storage id
+        /// </summary>
+        private string storageId = null;
+
+        /// <summary>
         /// Gets or sets the displayingImageIndex
         /// </summary>
         private int DisplayingImageIndex
@@ -381,14 +386,13 @@ namespace TVMediaHub.Tizen.ViewModels
             {
                 if (name == null)
                 {
-                    DbgPort.D("name is null");
                     return;
                 }
 
-                string id = sourcePairList[name];
+                storageId = sourcePairList[name];
                 SynchronizationContext.Current.Post((o) =>
                 {
-                    ReadImageList(option, id);
+                    ReadImageList(option, storageId);
                 }, "");
             });
 
@@ -455,7 +459,7 @@ namespace TVMediaHub.Tizen.ViewModels
             {
                 SynchronizationContext.Current.Post((o) =>
                 {
-                    ReadImageList(option);
+                    ReadImageList(option, storageId);
                 }, "");
             });
 
@@ -493,7 +497,6 @@ namespace TVMediaHub.Tizen.ViewModels
         /// </summary>
         private void AddSourceListItem()
         {
-            int index = 1;
             sourcePairList.Clear();
             List<string> tempList = new List<string>();
 
@@ -503,15 +506,13 @@ namespace TVMediaHub.Tizen.ViewModels
             tempList.Add("ALL SOURCE");
             tempList.Add("DEVICE");
 
-            foreach (var item in MediaHubImpl.GetInstance.StorageProviderInstance.StorageId)
+            foreach (var item in MediaHubImpl.GetInstance.StorageProviderInstance.StoragePairList)
             {
-                sourcePairList.Add("USB " + index, item);
-                tempList.Add("USB " + index);
-                index++;
+                sourcePairList.Add(item.Value, item.Key);
+                tempList.Add(item.Value);
             }
 
             SourceList = tempList;
-
             OnPropertyChanged("SourceList");
         }
 
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MediaHubMainPageViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MediaHubMainPageViewModel.cs
index 2529331..8ed51f2 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MediaHubMainPageViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MediaHubMainPageViewModel.cs
@@ -15,8 +15,9 @@
  */
 
 using System.ComponentModel;
-using Xamarin.Forms;
 using System.Runtime.CompilerServices;
+using TVMediaHub.Tizen.Models;
+using TVMediaHub.Tizen.Utils;
 
 namespace TVMediaHub.Tizen.ViewModels
 {
@@ -26,13 +27,9 @@ namespace TVMediaHub.Tizen.ViewModels
     class MediaHubMainPageViewModel : INotifyPropertyChanged
     {
         /// <summary>
-        /// A flag that whether footer is normal mode or not
+        /// A name of source
         /// </summary>
-        bool isFooterNor;
-        /// <summary>
-        /// A flag that whether footer is select mode or not
-        /// </summary>
-        bool isFooterSel;
+        public string SourceName { get; set; }
 
         /// <summary>
         /// An event that is occurred when property of MediaHubMainPageViewModel is changed
@@ -40,53 +37,11 @@ namespace TVMediaHub.Tizen.ViewModels
         public event PropertyChangedEventHandler PropertyChanged;
 
         /// <summary>
-        /// Gets or sets the isFooterNor
-        /// </summary>
-        public bool IsFooterNorStatus
-        {
-            set
-            {
-                if (isFooterNor != value)
-                {
-                    isFooterNor = value;
-                    OnPropertyChanged();
-                    IsFooterSelStatus = !IsFooterNorStatus;
-                }
-            }
-
-            get
-            {
-                return isFooterNor;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the isFooterSel
-        /// </summary>
-        public bool IsFooterSelStatus
-        {
-            set
-            {
-                if (isFooterSel != value)
-                {
-                    isFooterSel = value;
-                    OnPropertyChanged();
-                }
-            }
-
-            get
-            {
-                return isFooterSel;
-            }
-        }
-
-        /// <summary>
         /// A method for invoking PropertyChanged event
         /// </summary>
         /// <param name="propertyName">The name of property</param>
         protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-
             PropertyChangedEventHandler handler = PropertyChanged;
 
             if (handler != null)
@@ -96,27 +51,16 @@ namespace TVMediaHub.Tizen.ViewModels
         }
 
         /// <summary>
-        /// A Command for changing footer's status to select mode.
-        /// </summary>
-        public Command OnSeleteModeCommand { get; set; }
-
-        /// <summary>
         /// A consturctor
-        /// Initializes OnSelectModeCommand that is called to change the footer to select mode
+        /// Implements the SourceRemoveEventListener
         /// </summary>
         public MediaHubMainPageViewModel()
         {
-            IsFooterNorStatus = true;
-            OnSeleteModeCommand = new Command(() =>
+            MediaHubImpl.GetInstance.StorageProviderInstance.SetSourceRemoveEventListener((sender, arg) =>
             {
-                if (IsFooterNorStatus)
-                {
-                    IsFooterNorStatus = false;
-                }
-                else
-                {
-                    IsFooterNorStatus = true;
-                }
+                StorageInfoEventArgs e = arg as StorageInfoEventArgs;
+                SourceName = e.storageName;
+                OnPropertyChanged("SourceName");
             });
         }
     }
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs
index 5b75e26..480aad2 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/VideoTabViewModel.cs
@@ -25,6 +25,7 @@ using TVMediaHub.Tizen.Models;
 using TVMediaHub.Tizen.Utils;
 using TVMediaHub.Tizen.DataModels;
 using Xamarin.Forms;
+using Tizen.Xamarin.Forms.Extension;
 
 namespace TVMediaHub.Tizen.ViewModels
 {
@@ -136,6 +137,11 @@ namespace TVMediaHub.Tizen.ViewModels
         private SortOption option = SortOption.Title;
 
         /// <summary>
+        /// A storage id
+        /// </summary>
+        private string storageId = null;
+
+        /// <summary>
         /// Gets or sets the MediaInformationEx of current video
         /// </summary>
         public MediaInformationEx CurrentVideo { get; set; }
@@ -296,21 +302,20 @@ namespace TVMediaHub.Tizen.ViewModels
             {
                 SynchronizationContext.Current.Post((o) =>
                 {
-                    ReadVideoList(option);
+                    ReadVideoList(option, storageId);
                 }, "");
             });
             ChangeSourceCommand = new Command<string>((name) =>
             {
                 if (name == null)
                 {
-                    DbgPort.D("name is null");
                     return;
                 }
 
-                string id = sourcePairList[name];
+                storageId = sourcePairList[name];
                 SynchronizationContext.Current.Post((o) =>
                 {
-                    ReadVideoList(option, id);
+                    ReadVideoList(option, storageId);
                 }, "");
             });
             SetCurrentVideoInfo = new Command<MediaInformationEx>((info) =>
@@ -403,7 +408,6 @@ namespace TVMediaHub.Tizen.ViewModels
         /// </summary>
         private void AddSourceListItem()
         {
-            int index = 1;
             sourcePairList.Clear();
             List<string> tempList = new List<string>();
 
@@ -413,15 +417,13 @@ namespace TVMediaHub.Tizen.ViewModels
             tempList.Add("ALL SOURCE");
             tempList.Add("DEVICE");
 
-            foreach (var item in MediaHubImpl.GetInstance.StorageProviderInstance.StorageId)
+            foreach (var item in MediaHubImpl.GetInstance.StorageProviderInstance.StoragePairList)
             {
-                sourcePairList.Add("USB " + index, item);
-                tempList.Add("USB " + index);
-                index++;
+                sourcePairList.Add(item.Value, item.Key);
+                tempList.Add(item.Value);
             }
 
             SourceList = tempList;
-
             OnPropertyChanged("SourceList");
         }
 
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml
index aa5f343..90bb86d 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml
@@ -3,7 +3,8 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             x:Class="TVMediaHub.Tizen.Views.MediaHubMainPage"
             xmlns:Views="clr-namespace:TVMediaHub.Tizen.Views"
-            Title="MEDIA HUB">
+            Title="MEDIA HUB"
+            SourceName="{Binding SourceName}">
     <Views:VideoTab/>
     <Views:ImageTab/>
     <Views:MusicTab/>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml.cs
index ad222cd..9ba4c5d 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MediaHubMainPage.xaml.cs
@@ -17,7 +17,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Tizen.Xamarin.Forms.Extension;
 using TVMediaHub.Tizen.Controls;
+using TVMediaHub.Tizen.ViewModels;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
@@ -30,6 +32,20 @@ namespace TVMediaHub.Tizen.Views
     public partial class MediaHubMainPage : TabbedPage
     {
         /// <summary>
+        /// Identifies the SourceName bindable property
+        /// </summary>
+        public static readonly BindableProperty SourceNameProperty = BindableProperty.Create("SourceName", typeof(string), typeof(MediaHubMainPage), null, BindingMode.TwoWay);
+
+        /// <summary>
+        /// Gets or sets the source name
+        /// </summary>
+        public string SourceName
+        {
+            get { return (string)GetValue(SourceNameProperty); }
+            set { SetValue(SourceNameProperty, value); }
+        }
+
+        /// <summary>
         /// A flag that whether app is loaded or not
         /// </summary>
         private bool IsAppLoaded;
@@ -41,9 +57,28 @@ namespace TVMediaHub.Tizen.Views
         {
             IsAppLoaded = false;
             InitializeComponent();
+            BindingContext = new MediaHubMainPageViewModel();
             NavigationPage.SetHasBackButton(this, false);
             NavigationPage.SetHasNavigationBar(this, true);
-            CurrentPageChanged += MediaHubMainPage_CurrentPageChanged;
+            CurrentPageChanged += MediaHubMainPageCurrentPageChanged;
+            PropertyChanged += MediaHubMainPagePropertyChanged;
+        }
+
+        /// <summary>
+        /// This method is called when the properties is changed
+        /// </summary>
+        /// <param name="sender">The source of the event</param>
+        /// <param name="e">A propertyChanged event argument</param>
+        private void MediaHubMainPagePropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName.Equals("SourceName"))
+            {
+                if (SourceName != null)
+                {
+                    Toast.DisplayText(SourceName + " Disconnected.");
+                    SourceName = null;
+                }
+            }
         }
 
         /// <summary>
@@ -51,7 +86,7 @@ namespace TVMediaHub.Tizen.Views
         /// </summary>
         /// <param name="sender">The source of event</param>
         /// <param name="e">An event argument</param>
-        private void MediaHubMainPage_CurrentPageChanged(object sender, EventArgs e)
+        private void MediaHubMainPageCurrentPageChanged(object sender, EventArgs e)
         {
             var page = CurrentPage as ContentPageEx;
             page.RunShowAnimation();
-- 
2.7.4


From 3d782429c5b3f01ecb2f1420b1a684be5d6bbf89 Mon Sep 17 00:00:00 2001
From: "Geunsun, Lee" <gs86.lee@samsung.com>
Date: Thu, 15 Jun 2017 07:16:36 +0900
Subject: [PATCH 11/16] Fix build error : Change the file name in the csproj
 file

Change-Id: I85d3049d28851811a18adc2a7051fd111f8f1884
---
 TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
index 0666f86..3f8a617 100755
--- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
+++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
@@ -48,10 +48,10 @@
     <None Include="shared\res\xamediahub.png" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Controls\CustomImageButton.xaml.cs">
-      <DependentUpon>CustomImageButton.xaml</DependentUpon>
+    <Compile Include="Controls\ZoomNaviButton.xaml.cs">
+      <DependentUpon>ZoomNaviButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\CustomImageRenderer.cs" />
+    <Compile Include="Controls\ZoomNaviButtonRenderer.cs" />
     <Compile Include="Controls\MediaHubButton.xaml.cs">
       <DependentUpon>MediaHubButton.xaml</DependentUpon>
     </Compile>
@@ -287,7 +287,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Controls\CustomImageButton.xaml">
+    <EmbeddedResource Include="Controls\ZoomNaviButton.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
-- 
2.7.4


From 400811e0695b706a9ab4ec5de31478c5b9460dcd Mon Sep 17 00:00:00 2001
From: jjie <jjie.choi@samsung.com>
Date: Wed, 28 Jun 2017 15:32:57 +0900
Subject: [PATCH 12/16] Implment mediahub musictab list GUI

Change-Id: Ie82580a2d01ced295ddfe333f0cbcde6ab20d3b9
Signed-off-by: jjie <jjie.choi@samsung.com>
---
 .../TVMediaHub.Tizen/Views/MusicGroup.xaml.cs      |  14 +++++----
 TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml   |  35 ++++++++++-----------
 .../TVMediaHub.Tizen/Views/MusicItem.xaml.cs       |  30 +++++++++++++-----
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml    |   2 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs |   2 ++
 .../res/img_music_nocover_focused.png              | Bin 0 -> 5492 bytes
 6 files changed, 49 insertions(+), 34 deletions(-)
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/res/img_music_nocover_focused.png

diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
index 34a465f..307f1b5 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
@@ -64,14 +64,16 @@ namespace TVMediaHub.Tizen.Views
         {
             GroupTitle.FontSize = Utils.SizeUtils.GetFontSize(28);
             GroupTitle.HeightRequest = Utils.SizeUtils.GetHeightSize(50);
-            GroupTitle.Margin = new Thickness(SizeUtils.GetWidthSize(12), 0, 0, 0);
+            GroupTitle.Margin = new Thickness(SizeUtils.GetWidthSize(60), 0, 0, 0);
 
             TitleFocusArea.WidthRequest = SizeUtils.GetWidthSize(180);
-            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(134) });
-            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(134) });
-            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(134) });
-            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(134) });
-            GroupContentArea.RowSpacing = SizeUtils.GetHeightSize(2);
+            GroupContentArea.RowSpacing = SizeUtils.GetHeightSize(-134);
+            GroupContentArea.ColumnSpacing = SizeUtils.GetWidthSize(-136);
+            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(270) });
+            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(270) });
+            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(270) });
+            GroupContentArea.RowDefinitions.Add(new RowDefinition { Height = SizeUtils.GetHeightSize(270) });
+            GroupContentArea.Margin = new Thickness(SizeUtils.GetWidthSize(-64), SizeUtils.GetHeightSize(-64), SizeUtils.GetWidthSize(-64), SizeUtils.GetHeightSize(-64));
         }
 
         /// <summary>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
index c74e79f..1c262e0 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
@@ -5,29 +5,26 @@
                 xmlns:Utils="clr-namespace:TVMediaHub.Tizen.Utils"
                 xmlns:Views="clr-namespace:TVMediaHub.Tizen.Views"
                 MusicInfo="{Binding Information}">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="3*" />
-            <RowDefinition Height="2*" />
-            <RowDefinition Height="2*" />
-        </Grid.RowDefinitions>
-        <Image x:Name="AlbumCover"
-               Grid.Row="0"
-               Grid.RowSpan="3"
-               Grid.Column="0"/>
+
+    <StackLayout Orientation="Vertical" x:Name="TextArea" BackgroundColor="#171717" Spacing="0"
+                 RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.2518}"
+                 RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.2821}">
         <Label x:Name="SongTitle"
-               Grid.Row="0"
-               Grid.Column="1"
+               FontFamily="BreezeSans"
                LineBreakMode="TailTruncation"/>
         <Label x:Name="Artist"
-               Grid.Row="1"
-               Grid.Column="1"
-               LineBreakMode="TailTruncation"/>
+               FontFamily="BreezeSans"
+               LineBreakMode="TailTruncation"
+               Opacity="0.6"/>
         <Label x:Name="AlbumTitle"
-               Grid.Row="2"
-               Grid.Column="1"
-               LineBreakMode="TailTruncation"/>
-    </Grid>
+               FontFamily="BreezeSans"
+               LineBreakMode="TailTruncation"
+               Opacity="0.6"/>
+    </StackLayout>
+    <Image x:Name="AlbumCover"
+           RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.2518}"
+           RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.0951}"
+           Source="img_music_nocover_focused.png"/>
     <Button x:Name="FocusArea"
             RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
             RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
index 0285c9e..1567b87 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
@@ -21,6 +21,7 @@ using TVMediaHub.Tizen.DataModels;
 using TVMediaHub.Tizen.Utils;
 using TVMediaHub.Tizen.ViewModels;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 using Xamarin.Forms.Xaml;
 
 namespace TVMediaHub.Tizen.Views
@@ -53,6 +54,8 @@ namespace TVMediaHub.Tizen.Views
             }
         }
 
+
+
         /// <summary>
         /// A constructor
         /// Initializes the size of the items that are used in this class
@@ -69,16 +72,27 @@ namespace TVMediaHub.Tizen.Views
         /// </summary>
         private void InitializeSize()
         {
-            WidthRequest = SizeUtils.GetWidthSize(400);
-            HeightRequest = SizeUtils.GetHeightSize(134);
+            WidthRequest = SizeUtils.GetWidthSize(716);
+            HeightRequest = SizeUtils.GetHeightSize(270);
             AlbumCover.WidthRequest = SizeUtils.GetWidthSize(134);
             AlbumCover.HeightRequest = SizeUtils.GetHeightSize(134);
-            SongTitle.WidthRequest = SizeUtils.GetWidthSize(266);
-            SongTitle.FontSize = SizeUtils.GetFontSize(20);
-            Artist.WidthRequest = SizeUtils.GetWidthSize(266);
-            Artist.FontSize = SizeUtils.GetFontSize(17);
-            AlbumTitle.WidthRequest = SizeUtils.GetWidthSize(266);
-            AlbumTitle.FontSize = SizeUtils.GetFontSize(17);
+            TextArea.WidthRequest = SizeUtils.GetWidthSize(446);
+            TextArea.HeightRequest = SizeUtils.GetHeightSize(134);
+            SongTitle.WidthRequest = SizeUtils.GetWidthSize(382);
+            SongTitle.HeightRequest = SizeUtils.GetHeightSize(32);
+            SongTitle.FontSize = SizeUtils.GetFontSize(28);
+            SongTitle.Margin = new Thickness(SizeUtils.GetWidthSize(32), SizeUtils.GetHeightSize(18), SizeUtils.GetWidthSize(32), 0);
+            SongTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            Artist.WidthRequest = SizeUtils.GetWidthSize(382);
+            Artist.HeightRequest = SizeUtils.GetHeightSize(32);
+            Artist.Margin = new Thickness(SizeUtils.GetWidthSize(32), SizeUtils.GetHeightSize(12), SizeUtils.GetWidthSize(32), 0);
+            Artist.FontSize = SizeUtils.GetFontSize(28);
+            Artist.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            AlbumTitle.WidthRequest = SizeUtils.GetWidthSize(382);
+            AlbumTitle.HeightRequest = SizeUtils.GetHeightSize(28);
+            AlbumTitle.Margin = new Thickness(SizeUtils.GetWidthSize(32), SizeUtils.GetHeightSize(4), SizeUtils.GetWidthSize(32), 0);
+            AlbumTitle.FontSize = SizeUtils.GetFontSize(24);
+            AlbumTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Light);
         }
 
         /// <summary>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
index 7a13d16..09e1a6c 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
@@ -32,7 +32,7 @@
                            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.0}">
         </Views:MusicPlayer>
         <ScrollView x:Name="MusicTabScrollView"
-                    RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.855}"
+                    RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.7}"
                     RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.3}"
                     Orientation="Horizontal" IsVisible="False">
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
index 918b62e..7c5956e 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
@@ -108,6 +108,8 @@ namespace TVMediaHub.Tizen.Views
             ImgNoContents.WidthRequest = SizeUtils.GetWidthSize(68);
             LabelNoContents.HeightRequest = SizeUtils.GetHeightSize(32);
             LabelNoContents.FontSize = SizeUtils.GetFontSize(28);
+            MusicContentView.Padding = new Thickness(0, SizeUtils.GetHeightSize(74));
+            MusicContentView.Spacing = SizeUtils.GetWidthSize(60);
         }
 
         /// <summary>
diff --git a/TVMediaHub/TVMediaHub.Tizen/res/img_music_nocover_focused.png b/TVMediaHub/TVMediaHub.Tizen/res/img_music_nocover_focused.png
new file mode 100644
index 0000000000000000000000000000000000000000..901ea5f3455185d5d982c31d33a18e6726bc0806
GIT binary patch
literal 5492
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
J)ZFX*{{Y+*z4ZV9

literal 0
HcmV?d00001

-- 
2.7.4


From 9098db1c4d5c9e2a5aa25d3742167c773e178f3e Mon Sep 17 00:00:00 2001
From: Hyerim Kim <rimi.kim@samsung.com>
Date: Thu, 29 Jun 2017 17:28:24 +0900
Subject: [PATCH 13/16] Modifies Music tab to get the contents according to
 sources

Change-Id: I5ac54c21d52c4df8c29a116a8b019a85fe489191
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>
---
 .../ViewModels/MusicTabViewModel.cs                | 66 ++++++++++++++++++++--
 .../TVMediaHub.Tizen/Views/MusicItem.xaml.cs       |  3 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml    |  1 +
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs | 20 ++++++-
 4 files changed, 83 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs

diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
index 29298a4..215ce89 100755
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicTabViewModel.cs
@@ -37,6 +37,11 @@ namespace TVMediaHub.Tizen.ViewModels
         public ObservableCollection<GroupItem> MusicList { get; set; }
 
         /// <summary>
+        /// Gets or sets the SourceList
+        /// </summary>
+        public IEnumerable<string> SourceList { get; set; }
+
+        /// <summary>
         /// Gets or sets the SortOption list
         /// </summary>
         public IEnumerable<string> SortOptions { get; set; }
@@ -62,6 +67,11 @@ namespace TVMediaHub.Tizen.ViewModels
         public ICommand GetInformationsCommand { get; set; }
 
         /// <summary>
+        /// A command for changing Source
+        /// </summary>
+        public ICommand ChangeSourceCommand { get; set; }
+
+        /// <summary>
         /// The information of the current music
         /// </summary>
         public MediaInformationEx CurrentMusic { get; set; }
@@ -72,6 +82,11 @@ namespace TVMediaHub.Tizen.ViewModels
         private SortOption option = SortOption.Title;
 
         /// <summary>
+        /// A storage id
+        /// </summary>
+        private string storageId = null;
+
+        /// <summary>
         /// An event that is occurred when property of ViewModel is changed
         /// </summary>
         public event PropertyChangedEventHandler PropertyChanged;
@@ -95,13 +110,14 @@ namespace TVMediaHub.Tizen.ViewModels
         public MusicTabViewModel()
         {
             MusicList = new ObservableCollection<GroupItem>();
+            sourcePairList = new Dictionary<string, string>();
             InitializeFooterItemsSource();
             InitializeCommands();
 
             OnPropertyChanged("MusicList");
-            MediaHubImpl.GetInstance.MusicProviderInstance.SetContentUpdatedEventListener((s, e) =>
+            MediaHubImpl.GetInstance.MusicProviderInstance.SetContentUpdatedEventListener((sender, arg) =>
             {
-                DbgPort.D("Content updated");
+                AddSourceListItem();
             });
         }
 
@@ -109,10 +125,10 @@ namespace TVMediaHub.Tizen.ViewModels
         /// A method for reading music contents through MusicProvider and updating MusicList
         /// </summary>
         /// <param name="option">A current sort option</param>
-        private async void ReadMusicList(SortOption option)
+        private async void ReadMusicList(SortOption option, string storageID = null)
         {
             MusicList.Clear();
-            IEnumerable<GroupItem> templist = await MediaHubImpl.GetInstance.MusicProviderInstance.ReadAsync(option);
+            IEnumerable<GroupItem> templist = await MediaHubImpl.GetInstance.MusicProviderInstance.ReadAsync(option, storageID);
             foreach (var group in templist)
             {
                 await MediaHubImpl.GetInstance.MusicProviderInstance.CheckThumbnail(group.Contents);
@@ -129,6 +145,8 @@ namespace TVMediaHub.Tizen.ViewModels
         /// </summary>
         private void InitializeFooterItemsSource()
         {
+            AddSourceListItem();
+
             var list = new List<string>
             {
                 "SONG",
@@ -142,7 +160,7 @@ namespace TVMediaHub.Tizen.ViewModels
 
             list = new List<string>
             {
-                "DETAIL INFO",
+                "       DETAIL INFO       ",
                 "DELETE"
             };
 
@@ -151,6 +169,30 @@ namespace TVMediaHub.Tizen.ViewModels
         }
 
         /// <summary>
+        /// A method for making the source list
+        /// </summary>
+        private void AddSourceListItem()
+        {
+            sourcePairList.Clear();
+            List<string> tempList = new List<string>();
+
+            sourcePairList.Add("ALL SOURCE", null);
+            sourcePairList.Add("DEVICE", "media");
+
+            tempList.Add("ALL SOURCE");
+            tempList.Add("DEVICE");
+
+            foreach (var item in MediaHubImpl.GetInstance.StorageProviderInstance.StoragePairList)
+            {
+                sourcePairList.Add(item.Value, item.Key);
+                tempList.Add(item.Value);
+            }
+
+            SourceList = tempList;
+            OnPropertyChanged("SourceList");
+        }
+
+        /// <summary>
         /// A method for initializing commands that are used in Image tab
         /// </summary>
         private void InitializeCommands()
@@ -187,6 +229,20 @@ namespace TVMediaHub.Tizen.ViewModels
                 }, "");
             });
 
+            ChangeSourceCommand = new Command<string>((name) =>
+            {
+                if (name == null)
+                {
+                    return;
+                }
+
+                storageId = sourcePairList[name];
+                SynchronizationContext.Current.Post((o) =>
+                {
+                    ReadMusicList(option, storageId);
+                }, "");
+            });
+
             OnPropertyChanged("ChangeSortOptionCommand");
         }
 
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
old mode 100644
new mode 100755
index 1567b87..abf663e
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
@@ -137,7 +137,8 @@ namespace TVMediaHub.Tizen.Views
             if (e.PropertyName.Equals("MusicInfo"))
             {
                 AudioInformation info = MusicInfo.MediaContentInformation as AudioInformation;
-                AlbumCover.Source = (info.ThumbnailPath.Length != 0) ? info.ThumbnailPath : "img_media_no_contents.png";
+                AlbumCover.Source = !(string.IsNullOrEmpty(info.ThumbnailPath)) ? info.ThumbnailPath : "img_media_no_contents.png";
+
                 SongTitle.Text = info.Title;
                 Artist.Text = info.Artist;
                 AlbumTitle.Text = info.Album;
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
index 09e1a6c..de3b73f 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
@@ -7,6 +7,7 @@
                   Title="Music"
                   ChangeSortOptionCommand="{Binding ChangeSortOptionCommand}"
                   GetInformationsCommand="{Binding GetInformationsCommand}"
+                  ChangeSourceCommand="{Binding ChangeSourceCommand}"
                   ItemsSource="{Binding MusicList}">
     <!-- TODO : Fix to Guide  -->
 
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
index 7c5956e..c89ba88 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
@@ -84,6 +84,20 @@ namespace TVMediaHub.Tizen.Views
         }
 
         /// <summary>
+        /// Identifies the ChangeSourceCommand bindable property
+        /// </summary>
+        public static readonly BindableProperty ChangeSourceCommandProperty = BindableProperty.Create("ChangeSourceCommand", typeof(ICommand), typeof(MusicTab), default(ICommand));
+
+        /// <summary>
+        /// Gets or sets ChangeSourceCommand Command
+        /// </summary>
+        public ICommand ChangeSourceCommand
+        {
+            get { return (ICommand)GetValue(ChangeSourceCommandProperty); }
+            set { SetValue(ChangeSourceCommandProperty, value); }
+        }
+
+        /// <summary>
         /// A constructor
         /// Initializes the size of the items that are used in Music tab
         /// </summary>
@@ -208,7 +222,11 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A SelectedItemChanged event's argument</param>
         private void OnSourceChanged(object sender, SelectedItemChangedEventArgs e)
         {
-            // TODO : Source Change
+            String storageName = e.SelectedItem as String;
+
+            //BottomButtonList.Clear();
+            ChangeSourceCommand?.Execute(storageName);
+            //SetFooterFocusChain(ImageTabScrollView.ScrollX);
         }
 
         /// <summary>
-- 
2.7.4


From f0b854e90857c29f8b83a6f6fbbd4e2e641a5c1f Mon Sep 17 00:00:00 2001
From: jjie <jjie.choi@samsung.com>
Date: Fri, 30 Jun 2017 12:55:20 +0900
Subject: [PATCH 14/16] Implement mediahub music list gui

Change-Id: Id966973933b2334ae481eacdc2aa1d88fe90b768
Signed-off-by: jjie <jjie.choi@samsung.com>
---
 TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml  |   6 +-
 .../TVMediaHub.Tizen/Views/MusicGroup.xaml.cs      |   7 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml   |  15 ++-
 .../TVMediaHub.Tizen/Views/MusicItem.xaml.cs       | 130 ++++++++++++++++++---
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml    |   6 +-
 5 files changed, 132 insertions(+), 32 deletions(-)

diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
index 41301b1..1b9dbad 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
@@ -4,13 +4,13 @@
                 x:Class="TVMediaHub.Tizen.Views.MusicGroup"
                 ItemsSource="{Binding Contents}">
     <Button x:Name="TitleFocusArea" Opacity ="0"
-            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.085}"/>
+            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.0737}"/>
 
     <Label x:Name="GroupTitle" Text="{Binding Title}"
-           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.085}"/>
+           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.0737}"/>
 
     <Grid x:Name="GroupContentArea"
-          RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.915}"
+          RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.926}"
           RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.085}">
     </Grid>
 </RelativeLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
index 307f1b5..2056a21 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml.cs
@@ -63,8 +63,7 @@ namespace TVMediaHub.Tizen.Views
         private void InitializeSize()
         {
             GroupTitle.FontSize = Utils.SizeUtils.GetFontSize(28);
-            GroupTitle.HeightRequest = Utils.SizeUtils.GetHeightSize(50);
-            GroupTitle.Margin = new Thickness(SizeUtils.GetWidthSize(60), 0, 0, 0);
+            GroupTitle.Margin = new Thickness(SizeUtils.GetWidthSize(4), 0, 0, 0);
 
             TitleFocusArea.WidthRequest = SizeUtils.GetWidthSize(180);
             GroupContentArea.RowSpacing = SizeUtils.GetHeightSize(-134);
@@ -90,6 +89,10 @@ namespace TVMediaHub.Tizen.Views
                 {
                     var itemView = new MusicItem();
                     itemView.BindingContext = item;
+                    itemView.OnFocusedEventHandler += (se, ev) =>
+                    {
+                        GroupContentArea.RaiseChild(itemView);
+                    };
                     GroupContentArea.Children.Add(itemView, index / 4, index % 4);
                     index++;
                 }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
index 1c262e0..077d2da 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml
@@ -6,6 +6,11 @@
                 xmlns:Views="clr-namespace:TVMediaHub.Tizen.Views"
                 MusicInfo="{Binding Information}">
 
+    <Utils:NinePatch x:Name="Shadow"
+                     Source=""
+                     VerticalOptions="CenterAndExpand"
+                     HorizontalOptions="CenterAndExpand"
+                     Aspect="Fill"/>
     <StackLayout Orientation="Vertical" x:Name="TextArea" BackgroundColor="#171717" Spacing="0"
                  RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.2518}"
                  RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.2821}">
@@ -19,17 +24,17 @@
         <Label x:Name="AlbumTitle"
                FontFamily="BreezeSans"
                LineBreakMode="TailTruncation"
-               Opacity="0.6"/>
+               Opacity="0.5"/>
     </StackLayout>
     <Image x:Name="AlbumCover"
            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.2518}"
            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.0951}"
            Source="img_music_nocover_focused.png"/>
     <Button x:Name="FocusArea"
-            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
-            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
-            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0}"
-            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0}"
+            RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.496}"
+            RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.81}"
+            RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.2518}"
+            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.0951}"
             Opacity="0"
             Clicked="OnItemClicked"
             Focused="OnItemFocused"
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
index abf663e..92b2cad 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicItem.xaml.cs
@@ -17,6 +17,7 @@
 using System;
 using System.ComponentModel;
 using Tizen.Content.MediaContent;
+using Tizen.Xamarin.Forms.Extension;
 using TVMediaHub.Tizen.DataModels;
 using TVMediaHub.Tizen.Utils;
 using TVMediaHub.Tizen.ViewModels;
@@ -54,7 +55,24 @@ namespace TVMediaHub.Tizen.Views
             }
         }
 
+        /// <summary>
+        /// An EventHandler for focus event of the item
+        /// </summary>
+        public EventHandler OnFocusedEventHandler;
+        /// <summary>
+        /// An EventHandler for unfocus event of the item
+        /// </summary>
+        public EventHandler OnUnfocusedEventHandler;
+
+        /// <summary>
+        /// Bounds for TextArea when item is unfocused
+        /// </summary>
+        private Rectangle TextAreaNormalBounds;
 
+        /// <summary>
+        /// Bounds for TextArea when item is focused
+        /// </summary>
+        private Rectangle TextAreaFocusedBounds;
 
         /// <summary>
         /// A constructor
@@ -64,35 +82,69 @@ namespace TVMediaHub.Tizen.Views
         {
             InitializeComponent();
             InitializeSize();
+            InitializeLabel();
             PropertyChanged += MusicItemPropertyChanged;
         }
 
         /// <summary>
+        /// A method for initializing font and slide effect
+        /// </summary>
+        public void InitializeLabel()
+        {
+            SongTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            Artist.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            AlbumTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Light);
+
+            SlideEffect.SetSlideDuration(SongTitle, 15000);
+            SlideEffect.SetSlideMode(SongTitle, SlideMode.Auto);
+
+            SlideEffect.SetSlideDuration(Artist, 15000);
+            SlideEffect.SetSlideMode(Artist, SlideMode.Auto);
+
+            SlideEffect.SetSlideDuration(AlbumTitle, 15000);
+            SlideEffect.SetSlideMode(AlbumTitle, SlideMode.Auto);
+        }
+
+        /// <summary>
         /// A method for initializing size of the items that are used in this class
         /// </summary>
         private void InitializeSize()
         {
+            int h28 = SizeUtils.GetHeightSize(28);
+            int h32 = SizeUtils.GetHeightSize(32);
+            int w32 = SizeUtils.GetWidthSize(32);
+            int h134 = SizeUtils.GetHeightSize(134);
+            int w134 = SizeUtils.GetWidthSize(134);
+            int w382 = SizeUtils.GetWidthSize(382);
+            int w446 = SizeUtils.GetWidthSize(446);
+
             WidthRequest = SizeUtils.GetWidthSize(716);
             HeightRequest = SizeUtils.GetHeightSize(270);
-            AlbumCover.WidthRequest = SizeUtils.GetWidthSize(134);
-            AlbumCover.HeightRequest = SizeUtils.GetHeightSize(134);
-            TextArea.WidthRequest = SizeUtils.GetWidthSize(446);
-            TextArea.HeightRequest = SizeUtils.GetHeightSize(134);
-            SongTitle.WidthRequest = SizeUtils.GetWidthSize(382);
-            SongTitle.HeightRequest = SizeUtils.GetHeightSize(32);
+
+            TextAreaNormalBounds = new Rectangle(SizeUtils.GetWidthSize(202), SizeUtils.GetHeightSize(68), w446, SizeUtils.GetHeightSize(134));
+            TextAreaFocusedBounds = new Rectangle(SizeUtils.GetWidthSize(206), SizeUtils.GetHeightSize(64), w446, SizeUtils.GetHeightSize(142));
+
+            AlbumCover.WidthRequest = w134;
+            AlbumCover.HeightRequest = h134;
+
+            TextArea.WidthRequest = w446;
+            TextArea.HeightRequest = h134;
+
+            SongTitle.WidthRequest = w382;
+            SongTitle.HeightRequest = h32;
             SongTitle.FontSize = SizeUtils.GetFontSize(28);
-            SongTitle.Margin = new Thickness(SizeUtils.GetWidthSize(32), SizeUtils.GetHeightSize(18), SizeUtils.GetWidthSize(32), 0);
-            SongTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
-            Artist.WidthRequest = SizeUtils.GetWidthSize(382);
-            Artist.HeightRequest = SizeUtils.GetHeightSize(32);
-            Artist.Margin = new Thickness(SizeUtils.GetWidthSize(32), SizeUtils.GetHeightSize(12), SizeUtils.GetWidthSize(32), 0);
-            Artist.FontSize = SizeUtils.GetFontSize(28);
-            Artist.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
-            AlbumTitle.WidthRequest = SizeUtils.GetWidthSize(382);
-            AlbumTitle.HeightRequest = SizeUtils.GetHeightSize(28);
-            AlbumTitle.Margin = new Thickness(SizeUtils.GetWidthSize(32), SizeUtils.GetHeightSize(4), SizeUtils.GetWidthSize(32), 0);
+            SongTitle.Margin = new Thickness(w32, SizeUtils.GetHeightSize(18), w32, 0);
+
+            Artist.WidthRequest = w382;
+            Artist.HeightRequest = h28;
+            Artist.Margin = new Thickness(w32, SizeUtils.GetHeightSize(12), w32, 0);
+            Artist.FontSize = SizeUtils.GetFontSize(24);
+
+            AlbumTitle.WidthRequest = w382;
+            AlbumTitle.HeightRequest = h28;
+            AlbumTitle.Margin = new Thickness(w32, SizeUtils.GetHeightSize(4), w32, 0);
             AlbumTitle.FontSize = SizeUtils.GetFontSize(24);
-            AlbumTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Light);
+
         }
 
         /// <summary>
@@ -114,7 +166,28 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A Focus event's argument</param>
         private void OnItemFocused(object sender, FocusEventArgs e)
         {
-            DbgPort.D("MusicItem is focused : " + (MusicInfo.MediaContentInformation as AudioInformation).Title);
+            Easing easing = new Easing(EasingFunction.EasyIn1);
+            TextArea.LayoutTo(TextAreaFocusedBounds, 300, easing);
+
+            AlbumCover.ScaleTo(1.0597, 300, easing);
+            TextArea.BackgroundColor = Color.FromHex("ffffff");
+
+            SongTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            SongTitle.TextColor = Color.FromHex("000000");
+            SlideEffect.SetHasSlide(SongTitle, true);
+
+
+            Artist.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            Artist.Opacity = 0.8;
+            Artist.TextColor = Color.FromHex("000000");
+            SlideEffect.SetHasSlide(Artist, true);
+
+            AlbumTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            AlbumTitle.Opacity = 0.7;
+            AlbumTitle.TextColor = Color.FromHex("000000");
+            SlideEffect.SetHasSlide(AlbumTitle, true);
+
+            OnFocusedEventHandler?.Invoke(sender, e);
         }
 
         /// <summary>
@@ -124,7 +197,25 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A Focus event's argument</param>
         private void OnItemUnfocused(object sender, FocusEventArgs e)
         {
-            DbgPort.D("MusicItem is unfocused : " + (MusicInfo.MediaContentInformation as AudioInformation).Title);
+            Easing easing = new Easing(EasingFunction.EasyIn2);
+            TextArea.LayoutTo(TextAreaNormalBounds, 300, easing);
+
+            AlbumCover.ScaleTo(1.0, 300, easing);
+            TextArea.BackgroundColor = Color.FromHex("171717");
+
+            SongTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            SongTitle.TextColor = Color.FromHex("ffffff");
+            SlideEffect.SetHasSlide(SongTitle, false);
+
+            Artist.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            Artist.Opacity = 0.6;
+            Artist.TextColor = Color.FromHex("ffffff");
+            SlideEffect.SetHasSlide(Artist, false);
+
+            AlbumTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Light);
+            AlbumTitle.Opacity = 0.5;
+            AlbumTitle.TextColor = Color.FromHex("ffffff");
+            SlideEffect.SetHasSlide(AlbumTitle, false);
         }
 
         /// <summary>
@@ -144,5 +235,6 @@ namespace TVMediaHub.Tizen.Views
                 AlbumTitle.Text = info.Album;
             }
         }
+
     }
 }
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
index de3b73f..445a45d 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
@@ -33,9 +33,9 @@
                            RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.0}">
         </Views:MusicPlayer>
         <ScrollView x:Name="MusicTabScrollView"
-                    RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
-                    RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.7}"
-                    RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.3}"
+                    RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.8545}"
+                    RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.7386}"
+                    RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.2614}"
                     Orientation="Horizontal" IsVisible="False">
             <StackLayout x:Name="MusicContentView"
                          Orientation="Horizontal"
-- 
2.7.4


From 19402a1cc039f409761be9957a5bf212583bd546 Mon Sep 17 00:00:00 2001
From: hjjang <heonjae.jang@samsung.com>
Date: Mon, 3 Jul 2017 17:57:54 +0900
Subject: [PATCH 15/16] Implement mediahub music player gui

Change-Id: If969abca91b1759ffcbb16203c0df6908b306c05
Signed-off-by: hjjang <heonjae.jang@samsung.com>
---
 .../TVMediaHub.Tizen/Models/MusicPlayerModel.cs    |  36 ++++++++-
 .../TVMediaHub.Tizen/TVMediaHub.Tizen.csproj       |   5 +-
 .../ViewModels/MusicPlayerViewModel.cs             |  17 +++++
 TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml  |   4 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml |  32 +++++---
 .../TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs     |  82 ++++++++++++++++++++-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml    |  56 ++++++++------
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs |   7 +-
 .../TVMediaHub.Tizen/res/btn_music_info_pause.png  | Bin 0 -> 2712 bytes
 .../TVMediaHub.Tizen/res/btn_music_info_play.png   | Bin 0 -> 3555 bytes
 .../res/img_music_list_focused_shadow.9.png        | Bin 0 -> 8225 bytes
 11 files changed, 192 insertions(+), 47 deletions(-)
 mode change 100755 => 100644 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_pause.png
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_play.png
 create mode 100644 TVMediaHub/TVMediaHub.Tizen/res/img_music_list_focused_shadow.9.png

diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs b/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs
index 74c1294..b38b31e 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs
@@ -32,6 +32,7 @@ namespace TVMediaHub.Tizen.Models
         public string Title;
         public string Artist;
         public string AlbumCover;
+        public string AlbumName;
     }
 
     /// <summary>
@@ -99,7 +100,7 @@ namespace TVMediaHub.Tizen.Models
                     currentMusic = value;
 
                     /// 1. Stop the player
-                    if (playerInstance.State == PlayerState.Playing)
+                    if (playerInstance.State == PlayerState.Playing || playerInstance.State == PlayerState.Paused)
                     {
                         StopPlayer();
                     }
@@ -113,6 +114,7 @@ namespace TVMediaHub.Tizen.Models
                         Title = (currentMusic.MediaContentInformation as AudioInformation).Title,
                         Artist = (currentMusic.MediaContentInformation as AudioInformation).Artist,
                         AlbumCover = ((currentMusic.MediaContentInformation as AudioInformation).ThumbnailPath.Length != 0) ? (currentMusic.MediaContentInformation as AudioInformation).ThumbnailPath : "img_media_no_contents.png",
+                        AlbumName = (currentMusic.MediaContentInformation as AudioInformation).Album
                     });
 
                     /// 4. Update the progressbar of the current music
@@ -151,7 +153,6 @@ namespace TVMediaHub.Tizen.Models
         private void InitializePlayer()
         {
             playerInstance = new Player();
-
             playerInstance.PlaybackCompleted += ((s, e) =>
             {
                 StopPlayer();
@@ -222,6 +223,37 @@ namespace TVMediaHub.Tizen.Models
         }
 
         /// <summary>
+        /// Toggles pause and play the current music
+        /// </summary>
+        public void TogglePausePlay()
+        {
+            if (playerInstance.State == PlayerState.Playing)
+            {
+                try
+                {
+                    playerInstance.Pause();
+                }
+                catch (Exception e)
+                {
+                    DbgPort.E("Error : " + e.Message);
+                }
+                StopProgressbarTimer();
+            }
+            else if (playerInstance.State == PlayerState.Paused)
+            {
+                try
+                {
+                    playerInstance.Start();
+                }
+                catch (Exception e)
+                {
+                    DbgPort.E("Error : " + e.Message);
+                }
+                StartProgressbarTimer();
+            }
+        }
+
+        /// <summary>
         /// Stops the current music
         /// </summary>
         public void StopPlayer()
diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
index 3f8a617..edff850 100755
--- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
+++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
@@ -184,6 +184,8 @@
     <Content Include="res\btn_media_select_pre.9.png" />
     <Content Include="res\btn_media_unselect_check_bk.png" />
     <Content Include="res\btn_media_unselect_check_wh.png" />
+    <Content Include="res\btn_music_info_pause.png" />
+    <Content Include="res\btn_music_info_play.png" />
     <Content Include="res\btn_viewer_control_focused.png" />
     <Content Include="res\btn_viewer_control_forward_normal.png" />
     <Content Include="res\btn_viewer_control_forward_pressed.png" />
@@ -228,6 +230,7 @@
     <Content Include="res\img_gradient_topbottom.9.png" />
     <Content Include="res\img_media_no_contents.png" />
     <Content Include="res\img_movie_unavailable.png" />
+    <Content Include="res\img_music_list_focused_shadow.9.png" />
     <Content Include="res\img_photozoom_gradient.9.png" />
     <Content Include="res\img_stroke.9.png" />
     <Content Include="res\img_stroke2.9.png" />
@@ -365,4 +368,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs
index b4d39d9..ee9d2d6 100644
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs
@@ -16,6 +16,7 @@
 
 using System.ComponentModel;
 using TVMediaHub.Tizen.Models;
+using Xamarin.Forms;
 
 namespace TVMediaHub.Tizen.ViewModels
 {
@@ -40,10 +41,17 @@ namespace TVMediaHub.Tizen.ViewModels
         public string AlbumArtist { get; private set; }
 
         /// <summary>
+        /// The album name to be shown
+        /// </summary>
+        public string AlbumName { get; private set; }
+
+        /// <summary>
         /// The album cover to be shown
         /// </summary>
         public string AlbumCover { get; private set; }
 
+        public Command MusicPlayerButtonClickCommand { get; private set; }
+
         /// <summary>
         /// An event that is occurred when property of ViewModel is changed
         /// </summary>
@@ -71,6 +79,12 @@ namespace TVMediaHub.Tizen.ViewModels
             AlbumTitle = "Title";
             AlbumArtist = "Artist";
             AlbumCover = "img_media_no_contents.png";
+            AlbumName = "Album";
+
+            MusicPlayerButtonClickCommand = new Command(() =>
+            {
+                MusicPlayerModel.Instance.TogglePausePlay();
+            });
 
             MusicPlayerModel.Instance.SetCurrentMusicInfoListener((e, args) =>
             {
@@ -87,6 +101,9 @@ namespace TVMediaHub.Tizen.ViewModels
 
                 AlbumCover = args.AlbumCover;
                 OnPropertyChanged("AlbumCover");
+
+                AlbumName = args.AlbumName;
+                OnPropertyChanged("AlbumName");
             });
 
             MusicPlayerModel.Instance.SetCurrentMusicProgressListener((e, arg) =>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
index 1b9dbad..34277cc 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
@@ -11,6 +11,6 @@
 
     <Grid x:Name="GroupContentArea"
           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.926}"
-          RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.085}">
-    </Grid>
+          RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.0737}">
+        </Grid>
 </RelativeLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml
index 3667788..ca8f177 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<StackLayout xmlns="http://xamarin.com/schemas/2014/forms"
-                  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                  x:Class="TVMediaHub.Tizen.Views.MusicPlayer">
+<RelativeLayout xmlns="http://xamarin.com/schemas/2014/forms"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                xmlns:Utils="clr-namespace:TVMediaHub.Tizen.Utils"
+                x:Class="TVMediaHub.Tizen.Views.MusicPlayer">
+    <Utils:NinePatch x:Name="MusicPlayerShadowImage"
+           Source="img_music_list_focused_shadow.9.png" />    
     <Image x:Name="MusicPlayerAlbumArt"
-           Source="{Binding AlbumCover}"
-           WidthRequest="300"
-           HeightRequest="300"
-           HorizontalOptions="Center"/>
+           Source="{Binding AlbumCover}" />
+    <Image x:Name="MusicPlayerPausePlayButton"
+           Source="btn_music_info_play.png" />
+    <Button x:Name="MusicPlayerFocusArea"
+            Command="{Binding MusicPlayerButtonClickCommand}"
+            Focused="MusicPlayerFocusAreaFocused"
+            Unfocused="MusicPlayerFocusAreaUnfocused"
+            Opacity="0"/>
     <Label x:Name="MusicPlayerTitle"
            Text="{Binding AlbumTitle}"
-           HorizontalOptions="Center"/>
+           LineBreakMode="TailTruncation" />
     <Label x:Name="MusicPlayerArtist"
            Text="{Binding AlbumArtist}"
-           HorizontalOptions="Center"/>
-    <ProgressBar x:Name="MusicPlayerProgressbar"
-                 Progress="{Binding ProgressBarPercentage}"/>
-</StackLayout>
\ No newline at end of file
+           LineBreakMode="TailTruncation" />
+    <Label x:Name="MusicPlayerAlbum"
+           Text="{Binding AlbumName}"
+           LineBreakMode="TailTruncation" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs
index 008a402..8c20801 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs
@@ -14,6 +14,9 @@
 * limitations under the License.
 */
 
+using System;
+using Tizen.Xamarin.Forms.Extension;
+using TVMediaHub.Tizen.Utils;
 using TVMediaHub.Tizen.ViewModels;
 using Xamarin.Forms;
 
@@ -22,16 +25,91 @@ namespace TVMediaHub.Tizen.Views
     /// <summary>
     /// A custom ContentPage for displaying the music player
     /// </summary>
-    public partial class MusicPlayer : StackLayout
+    public partial class MusicPlayer : RelativeLayout
     {
+        private bool IsInitailized;
+        private Rectangle ShadowImageFocusedBounds;
+        private Rectangle ShadowImageNormalBounds;
+
+        private Rectangle AlbumImageFocusedBounds;
+        private Rectangle AlbumImageNormalBounds;
+
+        private Rectangle PausePlayButtonBounds;
+
+        private Rectangle TitleBounds;
+        private Rectangle ArtistBounds;
+        private Rectangle AlbumNameBounds;
+
         /// <summary>
         /// A constructor
         /// </summary>
         public MusicPlayer()
         {
             BindingContext = MusicPlayerViewModelLocator.ViewModel;
-
+            IsInitailized = false;
             InitializeComponent();
+            InitializeSize();
+        }
+
+        private void MusicPlayerFocusAreaFocused(object sender, FocusEventArgs e)
+        {
+            MusicPlayerShadowImage.LayoutTo(ShadowImageFocusedBounds);
+            MusicPlayerAlbumArt.LayoutTo(AlbumImageFocusedBounds);
+        }
+
+        private void MusicPlayerFocusAreaUnfocused(object sender, FocusEventArgs e)
+        {
+            MusicPlayerShadowImage.LayoutTo(ShadowImageNormalBounds);
+            MusicPlayerAlbumArt.LayoutTo(AlbumImageNormalBounds);
+        }
+
+        private void InitializeSize()
+        {
+            WidthRequest = SizeUtils.GetWidthSize(546);
+            HeightRequest = SizeUtils.GetHeightSize(546);
+            Margin = new Thickness(SizeUtils.GetWidthSize(-14), SizeUtils.GetHeightSize(-14), 0, 0);
+
+
+            MusicPlayerShadowImage.BorderTop = SizeUtils.GetHeightSize(67);
+            MusicPlayerShadowImage.BorderBottom = SizeUtils.GetHeightSize(67);
+            MusicPlayerShadowImage.BorderLeft = SizeUtils.GetWidthSize(67);
+            MusicPlayerShadowImage.BorderRight = SizeUtils.GetWidthSize(67);
+
+            ShadowImageFocusedBounds = new Rectangle(0, 0, SizeUtils.GetWidthSize(546), SizeUtils.GetHeightSize(546));
+            ShadowImageNormalBounds = new Rectangle(SizeUtils.GetWidthSize(6), SizeUtils.GetHeightSize(6), SizeUtils.GetWidthSize(532), SizeUtils.GetHeightSize(532));
+
+            AlbumImageFocusedBounds = new Rectangle(SizeUtils.GetWidthSize(64), SizeUtils.GetHeightSize(64), SizeUtils.GetWidthSize(418), SizeUtils.GetHeightSize(418));
+            AlbumImageNormalBounds = new Rectangle(SizeUtils.GetWidthSize(70), SizeUtils.GetHeightSize(70), SizeUtils.GetWidthSize(406), SizeUtils.GetHeightSize(406));
+
+            PausePlayButtonBounds = new Rectangle(SizeUtils.GetWidthSize(223), SizeUtils.GetHeightSize(223), SizeUtils.GetWidthSize(100), SizeUtils.GetHeightSize(100));
+
+            TitleBounds = new Rectangle(SizeUtils.GetWidthSize(72), SizeUtils.GetHeightSize(498), SizeUtils.GetWidthSize(406), SizeUtils.GetHeightSize(32));
+            ArtistBounds = new Rectangle(SizeUtils.GetWidthSize(72), SizeUtils.GetHeightSize(542), SizeUtils.GetWidthSize(418), SizeUtils.GetHeightSize(28));
+            AlbumNameBounds = new Rectangle(SizeUtils.GetWidthSize(72), SizeUtils.GetHeightSize(572), SizeUtils.GetWidthSize(418), SizeUtils.GetHeightSize(28));
+
+            MusicPlayerTitle.FontSize = SizeUtils.GetFontSize(28);
+
+            MusicPlayerArtist.FontSize = SizeUtils.GetFontSize(24);
+            MusicPlayerArtist.Opacity = 0.5;
+
+            MusicPlayerAlbum.FontSize = SizeUtils.GetFontSize(24);
+            MusicPlayerAlbum.Opacity = 0.25;
+        }
+
+        protected override void LayoutChildren(double x, double y, double width, double height)
+        {
+            if (IsInitailized == false)
+            {
+                base.LayoutChildren(x, y, width, height);
+                MusicPlayerAlbumArt.Layout(AlbumImageNormalBounds);
+                MusicPlayerTitle.Layout(TitleBounds);
+                MusicPlayerArtist.Layout(ArtistBounds);
+                MusicPlayerAlbum.Layout(AlbumNameBounds);
+                MusicPlayerShadowImage.Layout(ShadowImageNormalBounds);
+                MusicPlayerPausePlayButton.Layout(PausePlayButtonBounds);
+                MusicPlayerFocusArea.Layout(PausePlayButtonBounds);
+                IsInitailized = true;
+            }
         }
     }
 }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
old mode 100755
new mode 100644
index 445a45d..c1fdee6
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
@@ -15,38 +15,48 @@
                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
         <RelativeLayout RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                         RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
-            <Views:FooterDeleteStatus x:Name="FooterDelete" IsVisible="False"
+            <Views:FooterDeleteStatus x:Name="FooterDelete"
+                                      IsVisible="False"
                                       RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                                       RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
-                                      SelectedCount="{Binding SelectedCount}"/>
-            <Views:FooterNormalStatus x:Name="FooterNormal"  IsVisible="True"
+                                      SelectedCount="{Binding SelectedCount}" />
+            <Views:FooterNormalStatus x:Name="FooterNormal"
+                                      IsVisible="True"
                                       IsFooterEnabled="True"
                                       RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                                       RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
                                       SourceList="{Binding SourceList}"
                                       SortOptions="{Binding SortOptions}"
-                                      OptionList="{Binding OptionList}"/>
+                                      OptionList="{Binding OptionList}" />
         </RelativeLayout>
-        <Views:MusicPlayer x:Name="MusicPlayer"
-                           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.855}"
-                           RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.3}"
-                           RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.0}">
-        </Views:MusicPlayer>
-        <ScrollView x:Name="MusicTabScrollView"
-                    RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.8545}"
-                    RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.7386}"
-                    RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.2614}"
-                    Orientation="Horizontal" IsVisible="False">
-            <StackLayout x:Name="MusicContentView"
-                         Orientation="Horizontal"
-                         HorizontalOptions="Start"
-                         RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.1}">
-            </StackLayout>
-        </ScrollView>
-        <StackLayout x:Name="MusicNoContents" Orientation="Vertical" IsVisible="True"
+        
+        <StackLayout x:Name="MusicTabContents"
+                     RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.855}"
+                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
+                     Orientation="Horizontal">
+            <Views:MusicPlayer x:Name="MusicPlayer" />            
+            <ScrollView x:Name="MusicTabScrollView"
+                        Orientation="Horizontal"
+                        IsVisible="False">
+                <StackLayout x:Name="MusicContentView"
+                             Orientation="Horizontal"
+                             HorizontalOptions="Start"
+                             RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.1}">
+                </StackLayout>
+            </ScrollView>
+        </StackLayout>
+
+        <StackLayout x:Name="MusicNoContents"
+                     Orientation="Vertical"
+                     IsVisible="True"
                      RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
-            <Image x:Name="ImgNoContents" Source="img_media_no_contents.png" HorizontalOptions="Center"/>
-            <Label x:Name="LabelNoContents" Text="No content" FontFamily="BreezeSans" HorizontalOptions="Center"/>
+            <Image x:Name="ImgNoContents"
+                   Source="img_media_no_contents.png"
+                   HorizontalOptions="Center" />
+            <Label x:Name="LabelNoContents"
+                   Text="No content"
+                   FontFamily="BreezeSans"
+                   HorizontalOptions="Center" />
         </StackLayout>
     </RelativeLayout>
 </mh:ContentPageEx>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
index c89ba88..7b3d946 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-using System;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Threading;
 using System.Windows.Input;
 using TVMediaHub.Tizen.Controls;
 using TVMediaHub.Tizen.DataModels;
@@ -122,8 +119,8 @@ namespace TVMediaHub.Tizen.Views
             ImgNoContents.WidthRequest = SizeUtils.GetWidthSize(68);
             LabelNoContents.HeightRequest = SizeUtils.GetHeightSize(32);
             LabelNoContents.FontSize = SizeUtils.GetFontSize(28);
-            MusicContentView.Padding = new Thickness(0, SizeUtils.GetHeightSize(74));
             MusicContentView.Spacing = SizeUtils.GetWidthSize(60);
+            MusicTabContents.Padding = new Thickness(0, SizeUtils.GetHeightSize(74), 0, 0);
         }
 
         /// <summary>
@@ -222,7 +219,7 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A SelectedItemChanged event's argument</param>
         private void OnSourceChanged(object sender, SelectedItemChangedEventArgs e)
         {
-            String storageName = e.SelectedItem as String;
+            string storageName = e.SelectedItem as string;
 
             //BottomButtonList.Clear();
             ChangeSourceCommand?.Execute(storageName);
diff --git a/TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_pause.png b/TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..f73f5c8186c19ebe85930afac77ca9773425a340
GIT binary patch
literal 2712
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

literal 0
HcmV?d00001

diff --git a/TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_play.png b/TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_play.png
new file mode 100644
index 0000000000000000000000000000000000000000..93800813cdf68ad2f912093a912031bee41dcdad
GIT binary patch
literal 3555
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
JqkSmn{{VB|7asrs

literal 0
HcmV?d00001

diff --git a/TVMediaHub/TVMediaHub.Tizen/res/img_music_list_focused_shadow.9.png b/TVMediaHub/TVMediaHub.Tizen/res/img_music_list_focused_shadow.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..93ba39d4aa180d2d83ad96e166de3a08611f5345
GIT binary patch
literal 8225
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

literal 0
HcmV?d00001

-- 
2.7.4


From 376c6ccbeb75017993eb8e85067a5780e969558e Mon Sep 17 00:00:00 2001
From: hjjang <heonjae.jang@samsung.com>
Date: Mon, 3 Jul 2017 18:06:54 +0900
Subject: [PATCH 16/16] Revert "Implement mediahub music player gui"

This reverts commit 19402a1cc039f409761be9957a5bf212583bd546.

Change-Id: I3cb96acfec96f83fb4c6014e5685c949b5f4ba90
---
 .../TVMediaHub.Tizen/Models/MusicPlayerModel.cs    |  36 +--------
 .../TVMediaHub.Tizen/TVMediaHub.Tizen.csproj       |   5 +-
 .../ViewModels/MusicPlayerViewModel.cs             |  17 -----
 TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml  |   4 +-
 TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml |  32 +++-----
 .../TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs     |  82 +--------------------
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml    |  56 ++++++--------
 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs |   7 +-
 .../TVMediaHub.Tizen/res/btn_music_info_pause.png  | Bin 2712 -> 0 bytes
 .../TVMediaHub.Tizen/res/btn_music_info_play.png   | Bin 3555 -> 0 bytes
 .../res/img_music_list_focused_shadow.9.png        | Bin 8225 -> 0 bytes
 11 files changed, 47 insertions(+), 192 deletions(-)
 mode change 100644 => 100755 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
 delete mode 100644 TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_pause.png
 delete mode 100644 TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_play.png
 delete mode 100644 TVMediaHub/TVMediaHub.Tizen/res/img_music_list_focused_shadow.9.png

diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs b/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs
index b38b31e..74c1294 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs
@@ -32,7 +32,6 @@ namespace TVMediaHub.Tizen.Models
         public string Title;
         public string Artist;
         public string AlbumCover;
-        public string AlbumName;
     }
 
     /// <summary>
@@ -100,7 +99,7 @@ namespace TVMediaHub.Tizen.Models
                     currentMusic = value;
 
                     /// 1. Stop the player
-                    if (playerInstance.State == PlayerState.Playing || playerInstance.State == PlayerState.Paused)
+                    if (playerInstance.State == PlayerState.Playing)
                     {
                         StopPlayer();
                     }
@@ -114,7 +113,6 @@ namespace TVMediaHub.Tizen.Models
                         Title = (currentMusic.MediaContentInformation as AudioInformation).Title,
                         Artist = (currentMusic.MediaContentInformation as AudioInformation).Artist,
                         AlbumCover = ((currentMusic.MediaContentInformation as AudioInformation).ThumbnailPath.Length != 0) ? (currentMusic.MediaContentInformation as AudioInformation).ThumbnailPath : "img_media_no_contents.png",
-                        AlbumName = (currentMusic.MediaContentInformation as AudioInformation).Album
                     });
 
                     /// 4. Update the progressbar of the current music
@@ -153,6 +151,7 @@ namespace TVMediaHub.Tizen.Models
         private void InitializePlayer()
         {
             playerInstance = new Player();
+
             playerInstance.PlaybackCompleted += ((s, e) =>
             {
                 StopPlayer();
@@ -223,37 +222,6 @@ namespace TVMediaHub.Tizen.Models
         }
 
         /// <summary>
-        /// Toggles pause and play the current music
-        /// </summary>
-        public void TogglePausePlay()
-        {
-            if (playerInstance.State == PlayerState.Playing)
-            {
-                try
-                {
-                    playerInstance.Pause();
-                }
-                catch (Exception e)
-                {
-                    DbgPort.E("Error : " + e.Message);
-                }
-                StopProgressbarTimer();
-            }
-            else if (playerInstance.State == PlayerState.Paused)
-            {
-                try
-                {
-                    playerInstance.Start();
-                }
-                catch (Exception e)
-                {
-                    DbgPort.E("Error : " + e.Message);
-                }
-                StartProgressbarTimer();
-            }
-        }
-
-        /// <summary>
         /// Stops the current music
         /// </summary>
         public void StopPlayer()
diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
index edff850..3f8a617 100755
--- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
+++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj
@@ -184,8 +184,6 @@
     <Content Include="res\btn_media_select_pre.9.png" />
     <Content Include="res\btn_media_unselect_check_bk.png" />
     <Content Include="res\btn_media_unselect_check_wh.png" />
-    <Content Include="res\btn_music_info_pause.png" />
-    <Content Include="res\btn_music_info_play.png" />
     <Content Include="res\btn_viewer_control_focused.png" />
     <Content Include="res\btn_viewer_control_forward_normal.png" />
     <Content Include="res\btn_viewer_control_forward_pressed.png" />
@@ -230,7 +228,6 @@
     <Content Include="res\img_gradient_topbottom.9.png" />
     <Content Include="res\img_media_no_contents.png" />
     <Content Include="res\img_movie_unavailable.png" />
-    <Content Include="res\img_music_list_focused_shadow.9.png" />
     <Content Include="res\img_photozoom_gradient.9.png" />
     <Content Include="res\img_stroke.9.png" />
     <Content Include="res\img_stroke2.9.png" />
@@ -368,4 +365,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs
index ee9d2d6..b4d39d9 100644
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs
@@ -16,7 +16,6 @@
 
 using System.ComponentModel;
 using TVMediaHub.Tizen.Models;
-using Xamarin.Forms;
 
 namespace TVMediaHub.Tizen.ViewModels
 {
@@ -41,17 +40,10 @@ namespace TVMediaHub.Tizen.ViewModels
         public string AlbumArtist { get; private set; }
 
         /// <summary>
-        /// The album name to be shown
-        /// </summary>
-        public string AlbumName { get; private set; }
-
-        /// <summary>
         /// The album cover to be shown
         /// </summary>
         public string AlbumCover { get; private set; }
 
-        public Command MusicPlayerButtonClickCommand { get; private set; }
-
         /// <summary>
         /// An event that is occurred when property of ViewModel is changed
         /// </summary>
@@ -79,12 +71,6 @@ namespace TVMediaHub.Tizen.ViewModels
             AlbumTitle = "Title";
             AlbumArtist = "Artist";
             AlbumCover = "img_media_no_contents.png";
-            AlbumName = "Album";
-
-            MusicPlayerButtonClickCommand = new Command(() =>
-            {
-                MusicPlayerModel.Instance.TogglePausePlay();
-            });
 
             MusicPlayerModel.Instance.SetCurrentMusicInfoListener((e, args) =>
             {
@@ -101,9 +87,6 @@ namespace TVMediaHub.Tizen.ViewModels
 
                 AlbumCover = args.AlbumCover;
                 OnPropertyChanged("AlbumCover");
-
-                AlbumName = args.AlbumName;
-                OnPropertyChanged("AlbumName");
             });
 
             MusicPlayerModel.Instance.SetCurrentMusicProgressListener((e, arg) =>
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
index 34277cc..1b9dbad 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml
@@ -11,6 +11,6 @@
 
     <Grid x:Name="GroupContentArea"
           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.926}"
-          RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.0737}">
-        </Grid>
+          RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.085}">
+    </Grid>
 </RelativeLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml
index ca8f177..3667788 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml
@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<RelativeLayout xmlns="http://xamarin.com/schemas/2014/forms"
-                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                xmlns:Utils="clr-namespace:TVMediaHub.Tizen.Utils"
-                x:Class="TVMediaHub.Tizen.Views.MusicPlayer">
-    <Utils:NinePatch x:Name="MusicPlayerShadowImage"
-           Source="img_music_list_focused_shadow.9.png" />    
+<StackLayout xmlns="http://xamarin.com/schemas/2014/forms"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                  x:Class="TVMediaHub.Tizen.Views.MusicPlayer">
     <Image x:Name="MusicPlayerAlbumArt"
-           Source="{Binding AlbumCover}" />
-    <Image x:Name="MusicPlayerPausePlayButton"
-           Source="btn_music_info_play.png" />
-    <Button x:Name="MusicPlayerFocusArea"
-            Command="{Binding MusicPlayerButtonClickCommand}"
-            Focused="MusicPlayerFocusAreaFocused"
-            Unfocused="MusicPlayerFocusAreaUnfocused"
-            Opacity="0"/>
+           Source="{Binding AlbumCover}"
+           WidthRequest="300"
+           HeightRequest="300"
+           HorizontalOptions="Center"/>
     <Label x:Name="MusicPlayerTitle"
            Text="{Binding AlbumTitle}"
-           LineBreakMode="TailTruncation" />
+           HorizontalOptions="Center"/>
     <Label x:Name="MusicPlayerArtist"
            Text="{Binding AlbumArtist}"
-           LineBreakMode="TailTruncation" />
-    <Label x:Name="MusicPlayerAlbum"
-           Text="{Binding AlbumName}"
-           LineBreakMode="TailTruncation" />
-</RelativeLayout>
\ No newline at end of file
+           HorizontalOptions="Center"/>
+    <ProgressBar x:Name="MusicPlayerProgressbar"
+                 Progress="{Binding ProgressBarPercentage}"/>
+</StackLayout>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs
index 8c20801..008a402 100644
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs
@@ -14,9 +14,6 @@
 * limitations under the License.
 */
 
-using System;
-using Tizen.Xamarin.Forms.Extension;
-using TVMediaHub.Tizen.Utils;
 using TVMediaHub.Tizen.ViewModels;
 using Xamarin.Forms;
 
@@ -25,91 +22,16 @@ namespace TVMediaHub.Tizen.Views
     /// <summary>
     /// A custom ContentPage for displaying the music player
     /// </summary>
-    public partial class MusicPlayer : RelativeLayout
+    public partial class MusicPlayer : StackLayout
     {
-        private bool IsInitailized;
-        private Rectangle ShadowImageFocusedBounds;
-        private Rectangle ShadowImageNormalBounds;
-
-        private Rectangle AlbumImageFocusedBounds;
-        private Rectangle AlbumImageNormalBounds;
-
-        private Rectangle PausePlayButtonBounds;
-
-        private Rectangle TitleBounds;
-        private Rectangle ArtistBounds;
-        private Rectangle AlbumNameBounds;
-
         /// <summary>
         /// A constructor
         /// </summary>
         public MusicPlayer()
         {
             BindingContext = MusicPlayerViewModelLocator.ViewModel;
-            IsInitailized = false;
-            InitializeComponent();
-            InitializeSize();
-        }
-
-        private void MusicPlayerFocusAreaFocused(object sender, FocusEventArgs e)
-        {
-            MusicPlayerShadowImage.LayoutTo(ShadowImageFocusedBounds);
-            MusicPlayerAlbumArt.LayoutTo(AlbumImageFocusedBounds);
-        }
-
-        private void MusicPlayerFocusAreaUnfocused(object sender, FocusEventArgs e)
-        {
-            MusicPlayerShadowImage.LayoutTo(ShadowImageNormalBounds);
-            MusicPlayerAlbumArt.LayoutTo(AlbumImageNormalBounds);
-        }
-
-        private void InitializeSize()
-        {
-            WidthRequest = SizeUtils.GetWidthSize(546);
-            HeightRequest = SizeUtils.GetHeightSize(546);
-            Margin = new Thickness(SizeUtils.GetWidthSize(-14), SizeUtils.GetHeightSize(-14), 0, 0);
-
-
-            MusicPlayerShadowImage.BorderTop = SizeUtils.GetHeightSize(67);
-            MusicPlayerShadowImage.BorderBottom = SizeUtils.GetHeightSize(67);
-            MusicPlayerShadowImage.BorderLeft = SizeUtils.GetWidthSize(67);
-            MusicPlayerShadowImage.BorderRight = SizeUtils.GetWidthSize(67);
-
-            ShadowImageFocusedBounds = new Rectangle(0, 0, SizeUtils.GetWidthSize(546), SizeUtils.GetHeightSize(546));
-            ShadowImageNormalBounds = new Rectangle(SizeUtils.GetWidthSize(6), SizeUtils.GetHeightSize(6), SizeUtils.GetWidthSize(532), SizeUtils.GetHeightSize(532));
-
-            AlbumImageFocusedBounds = new Rectangle(SizeUtils.GetWidthSize(64), SizeUtils.GetHeightSize(64), SizeUtils.GetWidthSize(418), SizeUtils.GetHeightSize(418));
-            AlbumImageNormalBounds = new Rectangle(SizeUtils.GetWidthSize(70), SizeUtils.GetHeightSize(70), SizeUtils.GetWidthSize(406), SizeUtils.GetHeightSize(406));
-
-            PausePlayButtonBounds = new Rectangle(SizeUtils.GetWidthSize(223), SizeUtils.GetHeightSize(223), SizeUtils.GetWidthSize(100), SizeUtils.GetHeightSize(100));
-
-            TitleBounds = new Rectangle(SizeUtils.GetWidthSize(72), SizeUtils.GetHeightSize(498), SizeUtils.GetWidthSize(406), SizeUtils.GetHeightSize(32));
-            ArtistBounds = new Rectangle(SizeUtils.GetWidthSize(72), SizeUtils.GetHeightSize(542), SizeUtils.GetWidthSize(418), SizeUtils.GetHeightSize(28));
-            AlbumNameBounds = new Rectangle(SizeUtils.GetWidthSize(72), SizeUtils.GetHeightSize(572), SizeUtils.GetWidthSize(418), SizeUtils.GetHeightSize(28));
 
-            MusicPlayerTitle.FontSize = SizeUtils.GetFontSize(28);
-
-            MusicPlayerArtist.FontSize = SizeUtils.GetFontSize(24);
-            MusicPlayerArtist.Opacity = 0.5;
-
-            MusicPlayerAlbum.FontSize = SizeUtils.GetFontSize(24);
-            MusicPlayerAlbum.Opacity = 0.25;
-        }
-
-        protected override void LayoutChildren(double x, double y, double width, double height)
-        {
-            if (IsInitailized == false)
-            {
-                base.LayoutChildren(x, y, width, height);
-                MusicPlayerAlbumArt.Layout(AlbumImageNormalBounds);
-                MusicPlayerTitle.Layout(TitleBounds);
-                MusicPlayerArtist.Layout(ArtistBounds);
-                MusicPlayerAlbum.Layout(AlbumNameBounds);
-                MusicPlayerShadowImage.Layout(ShadowImageNormalBounds);
-                MusicPlayerPausePlayButton.Layout(PausePlayButtonBounds);
-                MusicPlayerFocusArea.Layout(PausePlayButtonBounds);
-                IsInitailized = true;
-            }
+            InitializeComponent();
         }
     }
 }
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
old mode 100644
new mode 100755
index c1fdee6..445a45d
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
@@ -15,48 +15,38 @@
                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
         <RelativeLayout RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                         RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
-            <Views:FooterDeleteStatus x:Name="FooterDelete"
-                                      IsVisible="False"
+            <Views:FooterDeleteStatus x:Name="FooterDelete" IsVisible="False"
                                       RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                                       RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
-                                      SelectedCount="{Binding SelectedCount}" />
-            <Views:FooterNormalStatus x:Name="FooterNormal"
-                                      IsVisible="True"
+                                      SelectedCount="{Binding SelectedCount}"/>
+            <Views:FooterNormalStatus x:Name="FooterNormal"  IsVisible="True"
                                       IsFooterEnabled="True"
                                       RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}"
                                       RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
                                       SourceList="{Binding SourceList}"
                                       SortOptions="{Binding SortOptions}"
-                                      OptionList="{Binding OptionList}" />
+                                      OptionList="{Binding OptionList}"/>
         </RelativeLayout>
-        
-        <StackLayout x:Name="MusicTabContents"
-                     RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.855}"
-                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
-                     Orientation="Horizontal">
-            <Views:MusicPlayer x:Name="MusicPlayer" />            
-            <ScrollView x:Name="MusicTabScrollView"
-                        Orientation="Horizontal"
-                        IsVisible="False">
-                <StackLayout x:Name="MusicContentView"
-                             Orientation="Horizontal"
-                             HorizontalOptions="Start"
-                             RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.1}">
-                </StackLayout>
-            </ScrollView>
-        </StackLayout>
-
-        <StackLayout x:Name="MusicNoContents"
-                     Orientation="Vertical"
-                     IsVisible="True"
+        <Views:MusicPlayer x:Name="MusicPlayer"
+                           RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.855}"
+                           RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.3}"
+                           RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.0}">
+        </Views:MusicPlayer>
+        <ScrollView x:Name="MusicTabScrollView"
+                    RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.8545}"
+                    RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.7386}"
+                    RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.2614}"
+                    Orientation="Horizontal" IsVisible="False">
+            <StackLayout x:Name="MusicContentView"
+                         Orientation="Horizontal"
+                         HorizontalOptions="Start"
+                         RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.1}">
+            </StackLayout>
+        </ScrollView>
+        <StackLayout x:Name="MusicNoContents" Orientation="Vertical" IsVisible="True"
                      RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}">
-            <Image x:Name="ImgNoContents"
-                   Source="img_media_no_contents.png"
-                   HorizontalOptions="Center" />
-            <Label x:Name="LabelNoContents"
-                   Text="No content"
-                   FontFamily="BreezeSans"
-                   HorizontalOptions="Center" />
+            <Image x:Name="ImgNoContents" Source="img_media_no_contents.png" HorizontalOptions="Center"/>
+            <Label x:Name="LabelNoContents" Text="No content" FontFamily="BreezeSans" HorizontalOptions="Center"/>
         </StackLayout>
     </RelativeLayout>
 </mh:ContentPageEx>
\ No newline at end of file
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
index 7b3d946..c89ba88 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
+using System;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Threading;
 using System.Windows.Input;
 using TVMediaHub.Tizen.Controls;
 using TVMediaHub.Tizen.DataModels;
@@ -119,8 +122,8 @@ namespace TVMediaHub.Tizen.Views
             ImgNoContents.WidthRequest = SizeUtils.GetWidthSize(68);
             LabelNoContents.HeightRequest = SizeUtils.GetHeightSize(32);
             LabelNoContents.FontSize = SizeUtils.GetFontSize(28);
+            MusicContentView.Padding = new Thickness(0, SizeUtils.GetHeightSize(74));
             MusicContentView.Spacing = SizeUtils.GetWidthSize(60);
-            MusicTabContents.Padding = new Thickness(0, SizeUtils.GetHeightSize(74), 0, 0);
         }
 
         /// <summary>
@@ -219,7 +222,7 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A SelectedItemChanged event's argument</param>
         private void OnSourceChanged(object sender, SelectedItemChangedEventArgs e)
         {
-            string storageName = e.SelectedItem as string;
+            String storageName = e.SelectedItem as String;
 
             //BottomButtonList.Clear();
             ChangeSourceCommand?.Execute(storageName);
diff --git a/TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_pause.png b/TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_pause.png
deleted file mode 100644
index f73f5c8186c19ebe85930afac77ca9773425a340..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2712
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

diff --git a/TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_play.png b/TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_play.png
deleted file mode 100644
index 93800813cdf68ad2f912093a912031bee41dcdad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3555
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
JqkSmn{{VB|7asrs

diff --git a/TVMediaHub/TVMediaHub.Tizen/res/img_music_list_focused_shadow.9.png b/TVMediaHub/TVMediaHub.Tizen/res/img_music_list_focused_shadow.9.png
deleted file mode 100644
index 93ba39d4aa180d2d83ad96e166de3a08611f5345..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8225
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

-- 
2.7.4